deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

puppet wants to send in keys with comment lines

Browse source
This commit is contained in:
Sitaram Chamarty 2011-11-08 11:23:25 +05:30
parent b4f96e0a47
commit 5858ecb56e
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gitolite.pm
View file

@ -1077,6 +1077,7 @@ sub setup_authkeys
local $/ = undef; local $/ = undef;
local @ARGV = ($pubkey); local @ARGV = ($pubkey);
$pubkey_content = <>; $pubkey_content = <>;
$pubkey_content =~ s/^\s*#.*\n//gm;
} }
$pubkey_content =~ s/\s*$/\n/; $pubkey_content =~ s/\s*$/\n/;
# don't trust files with multiple lines (i.e., something after a newline) # don't trust files with multiple lines (i.e., something after a newline)

2
src/sshkeys-lint
View file

@ -38,7 +38,7 @@ print "\n";
my @pubkeys = sort glob("*.pub"); my @pubkeys = sort glob("*.pub");
die "no *.pub files here\n" unless @pubkeys; die "no *.pub files here\n" unless @pubkeys;
for my $pub (@pubkeys) { for my $pub (@pubkeys) {
my @lines = filelines($pub); my @lines = grep { ! /^\s*#/ } filelines($pub);
die "$pub has more than one line\n" if @lines > 1; die "$pub has more than one line\n" if @lines > 1;
die "$pub does not start with ssh-rsa or ssh-dss\n" unless $lines[0] =~ /^(?:ssh-rsa|ssh-dss) (\S+)/; die "$pub does not start with ssh-rsa or ssh-dss\n" unless $lines[0] =~ /^(?:ssh-rsa|ssh-dss) (\S+)/;
my $key = $1; my $key = $1;