romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-14 22:51:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

genserv.pl: make external calls safe

Browse source 
By passing command-line as separate arguments instead of using a single
string. This needs skipping the shell, so rework redirections to use
Perl `open3()`.

Also explored to use `-out` to avoid redirections, but it makes the
command-line incompatible with some OpenSSL implementations/versions
(e.g. on default macOS), and would still need a solution for
`2>/dev/null`.

Ref: https://perldoc.perl.org/IPC::Open3

Closes #20971
This commit is contained in:
Viktor Szakats 2026-03-18 01:39:18 +01:00
parent 8f0e0f9dc7
commit 806fd7a0e1
No known key found for this signature in database
1 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

52
tests/certs/genserv.pl
View file

@ -28,6 +28,8 @@ use warnings;
use File::Basename; use File::Basename;
use File::Spec; use File::Spec;
use IPC::Open3;
use Symbol 'gensym';
sub opensslfail { sub opensslfail {
die "Missing or broken 'openssl' tool. openssl 1.0.2+ is required. ". die "Missing or broken 'openssl' tool. openssl 1.0.2+ is required. ".
@ -42,12 +44,22 @@ if(-f '/usr/local/ssl/bin/openssl') {
my $SRCDIR = dirname(__FILE__); my $SRCDIR = dirname(__FILE__);
my $fh; my $fh;
my $dev_null = File::Spec->devnull();
my $KEYSIZE = 'prime256v1'; my $KEYSIZE = 'prime256v1';
my $DURATION; my $DURATION;
my $PREFIX; my $PREFIX;
sub redir {
my $outfn = shift if($_[0] =~ /^>/);
my $hideerr = shift if($_[0] =~ /^2>/);
open(my $outfd, $outfn) || die if($outfn);
my $pid = open3(my $in, my $out, my $err = gensym, @_);
if(!$hideerr) { while(<$err>) { print STDERR $_; }; }
if($outfn) { while(<$out>) { print $outfd $_; }; close($outfd); }
else { while(<$out>) { print $_; }; }
waitpid($pid, 0);
}
my $CAPREFIX = shift @ARGV; my $CAPREFIX = shift @ARGV;
if(!$CAPREFIX) { if(!$CAPREFIX) {
print "Usage: genserv.pl <caprefix> [<prefix> ...]\n"; print "Usage: genserv.pl <caprefix> [<prefix> ...]\n";
@ -77,16 +89,16 @@ if(!$CAPREFIX) {
$PREFIX = $CAPREFIX; $PREFIX = $CAPREFIX;
$DURATION = 6000; $DURATION = 6000;
if(system("$OPENSSL genpkey -algorithm EC -pkeyopt ec_paramgen_curve:$KEYSIZE -pkeyopt ec_param_enc:named_curve " . if(system($OPENSSL, ('genpkey', '-algorithm', 'EC', '-pkeyopt', "ec_paramgen_curve:$KEYSIZE", '-pkeyopt', 'ec_param_enc:named_curve',
"-out $PREFIX-ca.key -pass pass:secret") != 0) { '-out', "$PREFIX-ca.key", '-pass', 'pass:secret')) != 0) {
opensslfail(); opensslfail();
} }
system("$OPENSSL req -config $SRCDIR/$PREFIX-ca.prm -new -key $PREFIX-ca.key -out $PREFIX-ca.csr -passin pass:secret 2>$dev_null"); redir('2>', $OPENSSL, ('req', '-config', "$SRCDIR/$PREFIX-ca.prm", '-new', '-key', "$PREFIX-ca.key", '-out', "$PREFIX-ca.csr", '-passin', 'pass:secret'));
system("$OPENSSL x509 -sha256 -extfile $SRCDIR/$PREFIX-ca.prm -days $DURATION " . system($OPENSSL, ('x509', '-sha256', '-extfile', "$SRCDIR/$PREFIX-ca.prm", '-days', $DURATION,
"-req -signkey $PREFIX-ca.key -in $PREFIX-ca.csr -out $PREFIX-ca.raw-cacert"); '-req', '-signkey', "$PREFIX-ca.key", '-in', "$PREFIX-ca.csr", '-out', "$PREFIX-ca.raw-cacert"));
system("$OPENSSL x509 -in $PREFIX-ca.raw-cacert -text -nameopt multiline > $PREFIX-ca.cacert"); redir(">$PREFIX-ca.cacert", $OPENSSL, ('x509', '-in', "$PREFIX-ca.raw-cacert", '-text', '-nameopt', 'multiline'));
system("$OPENSSL x509 -in $PREFIX-ca.cacert -outform der -out $PREFIX-ca.der"); system($OPENSSL, ('x509', '-in', "$PREFIX-ca.cacert", '-outform', 'der', '-out', "$PREFIX-ca.der"));
system("$OPENSSL x509 -in $PREFIX-ca.cacert -text -nameopt multiline > $PREFIX-ca.crt"); redir(">$PREFIX-ca.crt", $OPENSSL, ('x509', '-in', "$PREFIX-ca.cacert", '-text', '-nameopt', 'multiline'));
print "CA root generated: $PREFIX $DURATION days $KEYSIZE\n"; print "CA root generated: $PREFIX $DURATION days $KEYSIZE\n";
} }
@ -100,26 +112,26 @@ while(@ARGV) {
$PREFIX =~ s/\.prm$//; $PREFIX =~ s/\.prm$//;
# pseudo-secrets # pseudo-secrets
system("$OPENSSL genpkey -algorithm EC -pkeyopt ec_paramgen_curve:$KEYSIZE -pkeyopt ec_param_enc:named_curve " . system($OPENSSL, ('genpkey', '-algorithm', 'EC', '-pkeyopt', "ec_paramgen_curve:$KEYSIZE", '-pkeyopt', 'ec_param_enc:named_curve',
"-out $PREFIX.keyenc -pass pass:secret"); '-out', "$PREFIX.keyenc", '-pass', 'pass:secret'));
system("$OPENSSL req -config $SRCDIR/$PREFIX.prm -new -key $PREFIX.keyenc -out $PREFIX.csr -passin pass:secret 2>$dev_null"); redir('2>', $OPENSSL, ('req', '-config', "$SRCDIR/$PREFIX.prm", '-new', '-key', "$PREFIX.keyenc", '-out', "$PREFIX.csr", '-passin', 'pass:secret'));
system("$OPENSSL pkey -in $PREFIX.keyenc -out $PREFIX.key -passin pass:secret"); system($OPENSSL, ('pkey', '-in', "$PREFIX.keyenc", '-out', "$PREFIX.key", '-passin', 'pass:secret'));
system("$OPENSSL pkey -in $PREFIX.key -pubout -outform DER -out $PREFIX.pub.der"); system($OPENSSL, ('pkey', '-in', "$PREFIX.key", '-pubout', '-outform', 'DER', '-out', "$PREFIX.pub.der"));
system("$OPENSSL pkey -in $PREFIX.key -pubout -outform PEM -out $PREFIX.pub.pem"); system($OPENSSL, ('pkey', '-in', "$PREFIX.key", '-pubout', '-outform', 'PEM', '-out', "$PREFIX.pub.pem"));
system("$OPENSSL x509 -sha256 -extfile $SRCDIR/$PREFIX.prm -days $DURATION " . redir(">$PREFIX.crt", '2>', $OPENSSL, ('x509', '-sha256', '-extfile', "$SRCDIR/$PREFIX.prm", '-days', $DURATION,
"-req -CA $CAPREFIX-ca.cacert -CAkey $CAPREFIX-ca.key -CAcreateserial -in $PREFIX.csr > $PREFIX.crt 2>$dev_null"); '-req', '-CA', "$CAPREFIX-ca.cacert", '-CAkey', "$CAPREFIX-ca.key", '-CAcreateserial', '-in', "$PREFIX.csr"));
# revoke server cert # revoke server cert
if(open($fh, '>', "$CAPREFIX-ca.cnt")) { if(open($fh, '>', "$CAPREFIX-ca.cnt")) {
print $fh '01'; print $fh '01';
close($fh); close($fh);
} }
system("$OPENSSL ca -config $SRCDIR/$CAPREFIX-ca.cnf -revoke $PREFIX.crt 2>$dev_null"); redir('2>', $OPENSSL, ('ca', '-config', "$SRCDIR/$CAPREFIX-ca.cnf", '-revoke', "$PREFIX.crt"));
# issue CRL # issue CRL
system("$OPENSSL ca -config $SRCDIR/$CAPREFIX-ca.cnf -gencrl -out $PREFIX.crl 2>$dev_null"); redir('2>', $OPENSSL, ('ca', '-config', "$SRCDIR/$CAPREFIX-ca.cnf", '-gencrl', '-out', "$PREFIX.crl"));
system("$OPENSSL x509 -in $PREFIX.crt -outform der -out $PREFIX.der"); system($OPENSSL, ('x509', '-in', "$PREFIX.crt", '-outform', 'der', '-out', "$PREFIX.der"));
# concatenate all together now # concatenate all together now
open($fh, '>', "$PREFIX.pem") and close($fh); open($fh, '>', "$PREFIX.pem") and close($fh);