Use xsltproc instead of Xalan

See ukf/ukf-meta#159.
InCommon · Mar 22, 2018 · 4f74fc5 · 4f74fc5
1 parent dcddefd
commit 4f74fc5
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 82 deletions.
diff --git a/build/Xalan.pm b/build/Xalan.pm
diff --git a/build/check_entity.pl b/build/check_entity.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-use Xalan;
 use File::Temp qw(tempfile);
 use Date::Parse;
 use Digest::SHA1 qw(sha1 sha1_hex sha1_base64);
@@ -28,16 +27,16 @@
 		# temporary file
 		$temp = '../xml/embedded.pem';
 		unlink($temp) if -e $temp;
-		
+
 		# extract embedded certificates
-		open(EXTRACT, xalanCall . " -IN $fn -OUT $temp -XSL extract_embedded.xsl|")
+		open(EXTRACT, "xsltproc --output $temp extract_embedded.xsl $fn|")
 		 	|| die "could not open certificate extract process";
 		while (<EXTRACT>) {
 			print $_;
 		}
 		close EXTRACT;
 		die "no embedded certificates extracted" unless -e $temp;
-		
+
 		# check embedded certificates
 		open(CHECK, "cd ../xml; perl ../build/check_embedded.pl <$temp|")
 			|| die "could not open certificate check process";
@@ -47,7 +46,7 @@
 			print $_;
 		}
 		close CHECK;
-		
+
 		# clean up
 		unlink($temp) if -e $temp;
 	}

diff --git a/build/extract_locs.pl b/build/extract_locs.pl
@@ -1,8 +1,6 @@
 #!/usr/bin/perl -w
 
-use Xalan;
-
-open(XML, xalanCall . " -IN ../mdx/uk/collected.xml -XSL extract_locs.xsl|") || die "could not open input file";
+open(XML, "xsltproc extract_locs.xsl ../mdx/uk/collected.xml|") || die "could not open input file";
 while (<XML>) {
 	chop;
 	if (/^https:\/\/([^\/:]+(:\d+)?)(\/|$)/) {

diff --git a/build/extract_locs_edugain.pl b/build/extract_locs_edugain.pl
@@ -1,8 +1,6 @@
 #!/usr/bin/perl -w
 
-use Xalan;
-
-open(XML, xalanCall . " -IN ../mdx/int_edugain/imported.xml -XSL extract_locs.xsl|") || die "could not open input file";
+open(XML, xalanCall . "xsltproc extract_locs.xsl ../mdx/int_edugain/imported.xml|") || die "could not open input file";
 while (<XML>) {
 	chop;
 	if (/^https:\/\/([^\/:]+(:\d+)?)(\/|$)/) {

diff --git a/build/extract_locs_noports.pl b/build/extract_locs_noports.pl
@@ -1,8 +1,6 @@
 #!/usr/bin/perl -w
 
-use Xalan;
-
-open(XML, xalanCall . " -IN ../mdx/uk/collected.xml -XSL extract_locs.xsl|") || die "could not open input file";
+open(XML, xalanCall . "xsltproc extract_locs.xsl ../mdx/uk/collected.xml|") || die "could not open input file";
 while (<XML>) {
     chop;
     if (/^https:\/\/([^\/:]+)(:\d+)?(\/|$)/) {

diff --git a/build/probe_certs.pl b/build/probe_certs.pl
@@ -1,10 +1,9 @@
 #!/usr/bin/perl -w
 
 use ExtractCert;
-use Xalan;
 
 print "Loading endpoint locations...\n";
-open(XML, xalanCall . " -IN ../xml/ukfederation-metadata.xml -XSL extract_cert_locs.xsl|") || die "could not open input file";
+open(XML, "xsltproc extract_cert_locs.xsl ../xml/ukfederation-metadata.xml|") || die "could not open input file";
 while (<XML>) {
 	if (/^http:/) {
 		print "skipping http location: $_";
@@ -37,7 +36,7 @@
 	# Remove any old copy of the DER file.
 	#
 	unlink $temp_der;
-	
+
 	#
 	# Separate location into host and port.
 	#
@@ -58,7 +57,7 @@
 		$failed{$loc} = 1;
 		next;
 	}
-	
+
 	#
 	# Use openssl to convert the certificate to text
 	#
@@ -75,7 +74,7 @@
 			$subject = $1;
 		}
 	}
-	
+
 	if ($subject eq $issuer) {
 		$issuer = "(self-signed certificate)";
 	}
@@ -101,7 +100,7 @@
 	print "$n: $issuer\n";
 	foreach $loc (sort keys %locs) {
 		print "   $loc\n";
-	} 
+	}
 }
 
 #

diff --git a/build/probe_nk_certs.pl b/build/probe_nk_certs.pl
@@ -3,7 +3,6 @@
 use POSIX qw(floor);
 use Date::Parse;
 use ExtractCert;
-use Xalan;
 
 sub error {
 	my($s) = @_;
@@ -28,7 +27,7 @@ sub comment {
 my $longExpiredDays = 30*3; # about three months
 
 print "Loading endpoint locations...\n";
-open(XML, xalanCall . " -IN ../xml/ukfederation-metadata.xml -XSL extract_nk_cert_locs.xsl|") || die "could not open input file";
+open(XML, "xsltproc extract_nk_cert_locs.xsl ../xml/ukfederation-metadata.xml|") || die "could not open input file";
 while (<XML>) {
 	my ($entity, $url) = split;
 	if ($url =~ /^https:\/\/([^\/:]+(:\d+)?)\//) {
@@ -61,7 +60,7 @@ sub comment {
 	# Remove any old copy of the DER file.
 	#
 	unlink $temp_der;
-	
+
 	#
 	# Separate location into host and port.
 	#
@@ -82,7 +81,7 @@ sub comment {
 		$failed{$loc} = 1;
 		next;
 	}
-	
+
 	#
 	# Use openssl to convert the certificate to text
 	#
@@ -122,7 +121,7 @@ sub comment {
 			}
 			next;
 		}
-		
+
 		if (/Not After : (.*)$/) {
 			$notAfter = $1;
 			$notAfterTime = str2time($notAfter);
@@ -143,7 +142,7 @@ sub comment {
 		}
 
 	}
-	
+
 	if ($pubSize < 2048) {
 		warning("short public key: $pubSize bits, certificate expires $notAfter");
 	}
@@ -173,7 +172,7 @@ sub comment {
 	print "$n: $issuer\n";
 	foreach $loc (sort keys %locs) {
 		print "   $loc\n";
-	} 
+	}
 }
 
 #

diff --git a/build/probe_nk_nocerts.pl b/build/probe_nk_nocerts.pl
@@ -3,7 +3,6 @@
 use POSIX qw(floor);
 use Date::Parse;
 use ExtractCert;
-use Xalan;
 
 sub error {
 	my($s) = @_;
@@ -30,7 +29,7 @@ sub comment {
 my $longExpiredDays = 30*3; # about three months
 
 print "Loading endpoint locations...\n";
-open(XML, xalanCall . " -IN ../xml/ukfederation-metadata.xml -XSL extract_nk_nocert_locs.xsl|") || die "could not open input file";
+open(XML, "xsltproc extract_nk_nocert_locs.xsl ../xml/ukfederation-metadata.xml|") || die "could not open input file";
 while (<XML>) {
 	my ($entity, $url) = split;
 	if ($url =~ /^https:\/\/([^\/:]+(:\d+)?)(\/|$)/) {
@@ -62,12 +61,12 @@ sub comment {
 	my $entity = $locations{$loc};
 	print "$count: probing $entity: $loc\n";
 	$count--;
-	
+
 	#
 	# Remove any old copy of the DER file.
 	#
 	unlink $temp_der;
-	
+
 	#
 	# Separate location into host and port.
 	#
@@ -88,7 +87,7 @@ sub comment {
 		$failed{$loc} = 1;
 		next;
 	}
-	
+
 	#
 	# Use openssl to convert the certificate to text
 	#
@@ -128,7 +127,7 @@ sub comment {
 			}
 			next;
 		}
-		
+
 		if (/Not After : (.*)$/) {
 			$notAfter = $1;
 			$notAfterTime = str2time($notAfter);
@@ -179,7 +178,7 @@ sub comment {
 	print "$n: $issuer\n";
 	foreach $loc (sort keys %locs) {
 		print "   $loc\n";
-	} 
+	}
 }
 
 #

diff --git a/build/probe_nocerts.pl b/build/probe_nocerts.pl
@@ -1,12 +1,11 @@
 #!/usr/bin/perl -w
 
 use ExtractCert;
-use Xalan;
 
 $known_bad{'census.data-archive.ac.uk:8080'} = 1; # it is really http, not https
 
 print "Loading endpoint locations...\n";
-open(XML, xalanCall . " -IN ../xml/ukfederation-metadata.xml -XSL extract_nocert_locs.xsl|") || die "could not open input file";
+open(XML, "xsltproc extract_nocert_locs.xsl ../xml/ukfederation-metadata.xml|") || die "could not open input file";
 while (<XML>) {
 	chop;
 	if (/^http:/) {
@@ -39,12 +38,12 @@
 foreach $loc (sort keys %locations) {
 	print "$count: probing: $loc\n";
 	$count--;
-	
+
 	#
 	# Remove any old copy of the DER file.
 	#
 	unlink $temp_der;
-	
+
 	#
 	# Separate location into host and port.
 	#
@@ -65,7 +64,7 @@
 		$failed{$loc} = 1;
 		next;
 	}
-	
+
 	#
 	# Use openssl to convert the certificate to text
 	#
@@ -108,7 +107,7 @@
 	print "$n: $issuer\n";
 	foreach $loc (sort keys %locs) {
 		print "   $loc\n";
-	} 
+	}
 }
 
 #

diff --git a/build/probe_openssl.pl b/build/probe_openssl.pl
@@ -1,12 +1,11 @@
 #!/usr/bin/perl -w
 
 use ExtractCert;
-use Xalan;
 
 $known_bad{'census.data-archive.ac.uk:8080'} = 1; # it is really http, not https
 
 print "Loading endpoint locations...\n";
-open(XML, xalanCall . " -IN ../xml/ukfederation-metadata.xml -XSL extract_nocert_locs.xsl|") || die "could not open input file";
+open(XML, "xsltproc extract_nocert_locs.xsl ../xml/ukfederation-metadata.xml|") || die "could not open input file";
 while (<XML>) {
 	chop;
 	if (/^http:/) {
@@ -39,12 +38,12 @@
 foreach $loc (sort keys %locations) {
 	print "$count: probing: $loc\n";
 	$count--;
-	
+
 	#
 	# Remove any old copy of the DER file.
 	#
 	unlink $temp_der;
-	
+
 	#
 	# Separate location into host and port.
 	#