ovh/the-bastion
1
1
Fork 0
mirror of https://github.com/ovh/the-bastion.git synced 2025-01-01 13:01:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

chore: perlcritic/perltidy passes

Browse source
This commit is contained in:
Stéphane Lesimple 2020-12-16 12:53:47 +00:00
parent ea6867a614
commit 163a3fd726
No known key found for this signature in database
GPG key ID: 4B4A3289E9D35658
2 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
doc/sphinx/build-bastion-conf-help.pl
View file

@ -12,25 +12,26 @@ my @orderedsections;
sub dumpdoc {
if (!%h) {
; # nothing to do
; # nothing to do
}
elsif (defined $h{param} && defined $h{default} && defined $h{desc} && defined $h{type}) {
die "attempting to dump data but section=$section" if !$section;
push @{ $sections{$section} }, $h{param};
push @{$sections{$section}}, $h{param};
push @out, ".. _bastion_conf_$h{param}:\n";
push @out, "\n";
push @out, "$h{param}\n";
my $len = length($h{param});
push @out, "*"x$len."\n\n";
push @out, "*" x $len . "\n\n";
push @out, ":Type: ``$h{type}``\n\n";
push @out, ":Default: ``$h{default}``\n\n";
push @out, ":Example: ``$h{example}``\n\n" if $h{example};
push @out, "$h{desc}\n\n";
}
else {
die "something is missing: ".($h{param}?"":"param ").($h{default}?"":"default ").($h{desc}?"":"desc ").($h{type}?"":"type")."\n";
die "something is missing: " . ($h{param} ? "" : "param ") . ($h{default} ? "" : "default ") . ($h{desc} ? "" : "desc ") . ($h{type} ? "" : "type") . "\n";
}
%h = ();
return;
}
my $state = '';
@ -39,8 +40,8 @@ while (<>) {
next if /^\s*$/;
if (m{^# ([a-zA-Z0-9_]+) \((.+)\)}) {
$h{param} = $1;
$h{type} = $2;
$state = 'name';
$h{type} = $2;
$state = 'name';
}
elsif (m{^#\s+DESC:\s+(.+)$}) {
$h{desc} = $1;
@ -64,10 +65,10 @@ while (<>) {
elsif (m{^# > (.+)$}) {
if (%h or $state) { die "new section '$1' but we have pending data"; }
$section = $1;
$state = 'section';
$state = 'section';
push @orderedsections, $section;
push @out, "$1\n";
push @out, "-"x(length($1))."\n\n";
push @out, "$1\n";
push @out, "-" x (length($1)) . "\n\n";
}
elsif (m{^# >> (.+)$} and $state eq 'section' and $section) {
$sectiondesc{$section} = $1;
@ -78,7 +79,7 @@ while (<>) {
}
dumpdoc();
print <<EOF
print <<'EOF'
======================
bastion.conf reference
======================
@ -94,24 +95,23 @@ Option List
===========
EOF
;
;
foreach my $section (@orderedsections) {
die "no description for section $section" if !$sectiondesc{$section};
print "\n$section\n";
print "-"x(length($section))."\n\n";
print $sectiondesc{$section}."\n\n";
foreach (@{ $sections{$section} }) {
print "-" x (length($section)) . "\n\n";
print $sectiondesc{$section} . "\n\n";
foreach (@{$sections{$section}}) {
print "- :ref:`bastion_conf_$_`\n";
}
}
print <<EOF
print <<'EOF'
Option Reference
================
EOF
;
;
print join("", @out);

6
lib/perl/OVH/Bastion/configuration.inc
View file

@ -250,7 +250,7 @@ sub load_configuration {
}
# if set to "no", "false" or "disabled", be nice and cast to false (because a string is true, otherwise)
elsif (grep { lc($C->{$o}) eq lc($_) } qw{ no false disabled }) {
elsif (grep { lc($C->{$o}) eq lc } qw{ no false disabled }) {
push @errors, "Configuration error: found value '" . $C->{$o} . "' for option '$o', but it's supposed to be a boolean, assuming false";
$C->{$o} = 0;
}
@ -294,7 +294,9 @@ sub load_configuration {
# 5/6) Arrays whose values should match a specific regex.
foreach my $o (
{name => 'allowedIngressSshAlgorithms', default => [qw{ rsa ecdsa ed25519 }], validre => qr/^(rsa|ecdsa|ed25519)$/},
## no critic(RegularExpressions::ProhibitFixedStringMatches)
{name => 'allowedIngressSshAlgorithms', default => [qw{ rsa ecdsa ed25519 }], validre => qr/^(rsa|ecdsa|ed25519)$/},
## no critic(RegularExpressions::ProhibitFixedStringMatches)
{name => 'allowedEgressSshAlgorithms', default => [qw{ rsa ecdsa ed25519 }], validre => qr/^(rsa|ecdsa|ed25519)$/},
{name => 'accountCreateSupplementaryGroups', default => [], validre => qr/^(.*)$/},
{name => 'accountCreateDefaultPersonalAccesses', default => [], validre => qr/^(.*)$/},