X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tools%2Fgenssl;h=a8fc51514477d7cfe7112d2db11041a1753eceb4;hb=e94b673532f7833aaa4789f834e61d68e0b4fc56;hp=9bc66669f6836431084e3c00c307cddd98583f19;hpb=2bcb73e8339d4ad9db6c0e9cd1307b522f3fcde5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/tools/genssl b/tools/genssl
index 9bc66669f..a8fc51514 100755
--- a/tools/genssl
+++ b/tools/genssl
@@ -1,10 +1,9 @@
-#!/usr/bin/env perl -w
+#!/usr/bin/env perl
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
-#   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
-#   Copyright (C) 2013 Peter Powell <petpow@saberuk.com>
+#   Copyright (C) 2020 Nicole Kleinhoff <ilbelkyr@shalture.org>
+#   Copyright (C) 2013-2017, 2020-2021 Sadie Powell <sadie@witchery.services>
 #
 # This file is part of InspIRCd.  InspIRCd is free software: you can
 # redistribute it and/or modify it under the terms of the GNU General Public
@@ -20,33 +19,74 @@
 #
 
 
-BEGIN {
-	require 5.8.0;
-}
-
+use v5.10.0;
 use strict;
 use warnings FATAL => qw(all);
 
 use File::Temp();
 
 # IMPORTANT: This script has to be able to run by itself so that it can be used
-#            by binary distributions where the make/utilities.pm module will not
+#            by binary distributions where the make/console.pm module will not
 #            be available!
+eval {
+	use File::Basename qw(dirname);
+	use FindBin        qw($RealDir);
+
+	use lib dirname $RealDir;
+	require make::console;
+	make::console->import();
+};
 
 sub prompt($$) {
 	my ($question, $default) = @_;
-	print "$question\n";
+	return prompt_string(1, $question, $default) if defined main->can('prompt_string');
+	say $question;
 	print "[$default] => ";
 	chomp(my $answer = <STDIN>);
-	print "\n";
+	say '';
 	return $answer ? $answer : $default;
 }
 
-if ($#ARGV != 0 || $ARGV[0] !~ /gnutls|openssl/i) {
-	print "Syntax: genssl <gnutls|openssl>\n";
+if (scalar @ARGV < 1 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) {
+	say STDERR "Usage: $0 <auto|gnutls|openssl> [SSL-DIR]";
 	exit 1;
 }
 
+# On OS X the GnuTLS certtool is prefixed to avoid collision with the system certtool.
+my $certtool = $^O eq 'darwin' ? 'gnutls-certtool' : 'certtool';
+
+# Check whether the user has the required tools installed.
+my $has_gnutls = `$certtool --version v 2>/dev/null`;
+my $has_openssl = !system 'openssl version >/dev/null 2>&1';
+
+# The framework the user has specified.
+my $tool = lc $ARGV[0];
+
+# If the user has not explicitly specified a framework then detect one.
+if ($tool eq 'auto') {
+	if ($has_gnutls) {
+		$tool = 'gnutls';
+	} elsif ($has_openssl) {
+		$tool = 'openssl';
+	} else {
+		say STDERR "SSL generation failed: could not find $certtool or openssl in the PATH!";
+		exit 1;
+	}
+} elsif ($tool eq 'gnutls' && !$has_gnutls) {
+	say STDERR "SSL generation failed: could not find '$certtool' in the PATH!";
+	exit 1;
+} elsif ($tool eq 'openssl' && !$has_openssl) {
+	say STDERR 'SSL generation failed: could not find \'openssl\' in the PATH!';
+	exit 1;
+}
+
+# Output to the cwd unless an SSL directory is specified.
+if (scalar @ARGV > 1 && !chdir $ARGV[1]) {
+	say STDERR "Unable to change the working directory to $ARGV[1]: $!.";
+	exit 1;
+}
+
+# Harvest information needed to generate the certificate.
 my $common_name = prompt('What is the hostname of your server?', 'irc.example.com');
 my $email = prompt('What email address can you be contacted at?', 'example@example.com');
 my $unit = prompt('What is the name of your unit?', 'Server Admins');
@@ -59,7 +99,9 @@ my $days = prompt('How many days do you want your certificate to be valid for?',
 # Contains the exit code of openssl/gnutls-certtool.
 my $status = 0;
 
-if (lc $ARGV[0] eq 'gnutls') {
+if ($tool eq 'gnutls') {
+	$has_gnutls =~ /certtool.+?(\d+\.\d+)/;
+	my $sec_param = $1 lt '2.10' ? '--bits 2048' : '--sec-param normal';
 	my $tmp = new File::Temp();
 	print $tmp <<__GNUTLS_END__;
 cn              = "$common_name"
@@ -81,11 +123,11 @@ ocsp_signing_key
 time_stamping_key
 __GNUTLS_END__
 	close($tmp);
-	my $certtool = `uname -s` eq "Darwin\n" ? 'gnutls-certtool' : 'certtool';
-	$status ||= system "$certtool --version  >/dev/null 2>&1";
-	$status ||= system "$certtool --generate-privkey --outfile key.pem";
+	$status ||= system "$certtool --generate-privkey $sec_param --outfile key.pem";
 	$status ||= system "$certtool --generate-self-signed --load-privkey key.pem --outfile cert.pem --template $tmp";
-} elsif (lc $ARGV[0] eq 'openssl') {
+	$status ||= system "$certtool --generate-request --load-privkey key.pem --outfile csr.pem --template $tmp";
+	$status ||= system "$certtool --generate-dh-params $sec_param --outfile dhparams.pem";
+} elsif ($tool eq 'openssl') {
 	my $tmp = new File::Temp();
 	print $tmp <<__OPENSSL_END__;
 $country
@@ -95,15 +137,16 @@ $organization
 $unit
 $common_name
 $email
+.
+$organization
 __OPENSSL_END__
 	close($tmp);
-	$status ||= system 'openssl version >/dev/null 2>&1';
 	$status ||= system "cat $tmp | openssl req -x509 -nodes -newkey rsa:2048 -keyout key.pem -out cert.pem -days $days 2>/dev/null";
+	$status ||= system "cat $tmp | openssl req -new -nodes -key key.pem -out csr.pem 2>/dev/null";
 	$status ||= system 'openssl dhparam -out dhparams.pem 2048';
 }
 
 if ($status) {
-	print "SSL generation failed! Are you missing an $ARGV[0] binary package?\n";
+	say STDERR "SSL generation failed: $tool exited with a non-zero status!";
 	exit 1;
 }
-