Skip to content

Commit dbcff05

Browse files
timleggetimlegge
authored
Merge pull request #54 from perl-net-saml2/xmlsec-updates
Fix tests for changes to xmlsec output
2 parents 5d790dd + 44e3f47 commit dbcff05

12 files changed

+38
-39
lines changed

‎t/002_xmlsec.t‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,19 @@
33
use strict;
44
use warnings;
55

6+
use Test::Lib;
7+
use Test::XML::Sig;
68
use Test::More qw/ no_plan /;
7-
use File::Which;
8-
99

1010
BEGIN {
1111
use_ok( 'XML::Sig' );
1212
}
1313

14-
SKIP: {
15-
skip "xmlsec1 not installed", 4 unless which('xmlsec1');
16-
17-
# Try whether xmlsec is correctly installed which
18-
# doesn't seem to be the case on every cpan testing machine
14+
my $xmlsec = get_xmlsec_features;
15+
my $lax_key_search = $xmlsec->{lax_key_search} ? '--lax-key-search' : '';
1916

20-
my $output = `xmlsec1 --version`;
21-
skip "xmlsec1 not correctly installed", 6 if $?;
17+
SKIP: {
18+
skip "xmlsec1 not installed", 4 unless $xmlsec->{installed};
2219

2320
my $xml = '<?xml version="1.0"?>'."\n".'<foo ID="XML-SIG_1">'."\n".' <bar>123</bar>'."\n".'</foo>';
2421
my $sig = XML::Sig->new( { key => 't/rsa.private.key', cert => 't/rsa.cert.pem' } );
@@ -28,8 +25,8 @@ SKIP: {
2825
ok( open XML, '>', 'tmp.xml' );
2926
print XML $signed;
3027
close XML;
31-
my $verify_response = `xmlsec1 --verify --id-attr:ID "foo" --pubkey-cert-pem t/rsa.cert.pem --untrusted-pem t/intermediate.pem --trusted-pem t/cacert.pem tmp.xml 2>&1`;
32-
ok( $verify_response =~ m/^OK/, "Response is OK for xmlsec1" )
28+
my $verify_response = `xmlsec1 --verify $lax_key_search --id-attr:ID "foo" --pubkey-cert-pem t/rsa.cert.pem --untrusted-pem t/intermediate.pem --trusted-pem t/cacert.pem tmp.xml 2>&1`;
29+
ok( $verify_response =~ m/OK/, "Response is OK for xmlsec1" )
3330
or warn "calling xmlsec1 failed: '$verify_response'\n";
3431

3532
unlink 'tmp.xml';

‎t/008_sign_saml.t‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ foreach my $key ('t/dsa.private-2048.key', 't/dsa.private-3072.key', 't/dsa.priv
5656
}
5757

5858
my $verify_response = `xmlsec1 --verify --id-attr:ID "ArtifactResolve" t/dsa.xml 2>&1`;
59-
ok( $verify_response =~ m/^OK/, "DSA verify XML:Sig signed with $key: xmlsec1 Response is OK" )
59+
ok( $verify_response =~ m/OK/, "DSA verify XML:Sig signed with $key: xmlsec1 Response is OK" )
6060
or warn "calling xmlsec1 failed: '$verify_response'\n";
6161
unlink 't/dsa.xml';
6262
}
@@ -74,7 +74,7 @@ ok($xmlsec_ret, "xmlsec1: DSA Verifed Successfully");
7474
SKIP: {
7575
skip "xmlsec1 not installed", 1 unless which('xmlsec1');
7676
my $verify_response = `xmlsec1 --verify --id-attr:ID "ArtifactResolve" t/signed/saml_request-xmlsec1-dsa-signed.xml 2>&1`;
77-
ok( $verify_response =~ m/^OK/, "DSA verify XML:Sig signed with $key: xmlsec1 Response is OK" )
77+
ok( $verify_response =~ m/OK/, "DSA verify XML:Sig signed with $key: xmlsec1 Response is OK" )
7878
or warn "calling xmlsec1 failed: '$verify_response'\n";
7979
}
8080
}

‎t/011-sign_multiple_sections.t‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ SKIP: {
5151
}
5252

5353
my $verify_response = `xmlsec1 --verify --pubkey-cert-pem t/rsa.cert.pem --untrusted-pem t/intermediate.pem --trusted-pem t/cacert.pem --id-attr:ID "Response" --id-attr:ID "Assertion" t/rsa.xml 2>&1`;
54-
ok( $verify_response =~ m/^OK/, "RSA verify XML:Sig signed: xmlsec1 Response is OK" )
54+
ok( $verify_response =~ m/OK/, "RSA verify XML:Sig signed: xmlsec1 Response is OK" )
5555
or warn "calling xmlsec1 failed: '$verify_response'\n";
5656
}
5757

@@ -89,7 +89,7 @@ SKIP: {
8989
}
9090

9191
my $verify_response = `xmlsec1 --verify --id-attr:ID "Response" --id-attr:ID "Assertion" t/dsa.xml 2>&1`;
92-
ok( $verify_response =~ m/^OK/, "DSA verify XML:Sig signed: xmlsec1 Response is OK" )
92+
ok( $verify_response =~ m/OK/, "DSA verify XML:Sig signed: xmlsec1 Response is OK" )
9393
or warn "calling xmlsec1 failed: '$verify_response'\n";
9494
}
9595

‎t/015_ecdsa_signing.t‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ SKIP: {
2323
skip "xmlsec1 not installed", 1 unless which('xmlsec1');
2424

2525
my $verify_response = `xmlsec1 --verify --trusted-pem t/ecdsa.public.pem --id-attr:ID "foo" t/tmp.xml 2>&1`;
26-
ok( $verify_response =~ m/^OK/, "ECDSA Response is verified using xmlsec1" )
26+
ok( $verify_response =~ m/OK/, "ECDSA Response is verified using xmlsec1" )
2727
or warn "calling xmlsec1 failed: '$verify_response'\n";
28-
if ($verify_response =~ m/^OK/) {
28+
if ($verify_response =~ m/OK/) {
2929
unlink 't/tmp.xml';
3030
} else{
3131
print $signed;

‎t/016-SigningAlgorithms.t‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SKIP: {
3030
close XML;
3131

3232
my $verify_response = `xmlsec1 --verify --id-attr:ID "foo" t/tmp.xml 2>&1`;
33-
ok( $verify_response =~ m/^OK/, "t/tmp.xml is verified using xmlsec1" )
33+
ok( $verify_response =~ m/OK/, "t/tmp.xml is verified using xmlsec1" )
3434
or warn "calling xmlsec1 failed: '$verify_response'\n";
3535
unlink "t/tmp.xml";
3636
}
@@ -58,7 +58,7 @@ SKIP: {
5858
close XML;
5959

6060
my $verify_response = `xmlsec1 --verify --pubkey-cert-pem t/rsa.cert.pem --untrusted-pem t/intermediate.pem --trusted-pem t/cacert.pem --id-attr:ID "foo" t/tmp.xml 2>&1`;
61-
ok( $verify_response =~ m/^OK/, "t/tmp.xml RSA is verified using xmlsec1 - no X509" )
61+
ok( $verify_response =~ m/OK/, "t/tmp.xml RSA is verified using xmlsec1 - no X509" )
6262
or warn "calling xmlsec1 failed: '$verify_response'\n";
6363
unlink "t/tmp.xml";
6464

@@ -89,7 +89,7 @@ SKIP: {
8989
close XML;
9090

9191
my $verify_response = `xmlsec1 --verify --pubkey-cert-pem t/rsa.cert.pem --untrusted-pem t/intermediate.pem --trusted-pem t/cacert.pem --id-attr:ID "foo" t/tmp.xml 2>&1`;
92-
ok( $verify_response =~ m/^OK/, "t/tmp.xml RSA is verified using xmlsec1" )
92+
ok( $verify_response =~ m/OK/, "t/tmp.xml RSA is verified using xmlsec1" )
9393
or warn "calling xmlsec1 failed: '$verify_response'\n";
9494
unlink "t/tmp.xml";
9595
}
@@ -114,9 +114,9 @@ foreach my $alg (@hash_alg) {
114114
close XML;
115115

116116
my $verify_response = `xmlsec1 --verify --trusted-pem t/ecdsa.public.pem --id-attr:ID "foo" t/tmp.xml 2>&1`;
117-
ok( $verify_response =~ m/^OK/, "ECDSA Response is verified using xmlsec1" )
117+
ok( $verify_response =~ m/OK/, "ECDSA Response is verified using xmlsec1" )
118118
or warn "calling xmlsec1 failed: '$verify_response'\n";
119-
if ($verify_response =~ m/^OK/) {
119+
if ($verify_response =~ m/OK/) {
120120
unlink 't/tmp.xml';
121121
} else{
122122
print $signed;

‎t/017-DigestAlgorithms.t‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SKIP: {
3535
close XML;
3636

3737
my $verify_response = `xmlsec1 --verify --id-attr:ID "foo" t/tmp.xml 2>&1`;
38-
ok( $verify_response =~ m/^OK/, "t/tmp.xml is verified using xmlsec1" )
38+
ok( $verify_response =~ m/OK/, "t/tmp.xml is verified using xmlsec1" )
3939
or warn "calling xmlsec1 failed: '$verify_response'\n";
4040
unlink "t/tmp.xml";
4141
}
@@ -66,7 +66,7 @@ SKIP: {
6666
close XML;
6767

6868
my $verify_response = `xmlsec1 --verify --pubkey-cert-pem t/rsa.cert.pem --untrusted-pem t/intermediate.pem --trusted-pem t/cacert.pem --id-attr:ID "foo" t/tmp.xml 2>&1`;
69-
ok( $verify_response =~ m/^OK/, "t/tmp.xml RSA is verified using xmlsec1 - no X509" )
69+
ok( $verify_response =~ m/OK/, "t/tmp.xml RSA is verified using xmlsec1 - no X509" )
7070
or warn "calling xmlsec1 failed: '$verify_response'\n";
7171
unlink "t/tmp.xml";
7272

@@ -100,7 +100,7 @@ SKIP: {
100100
close XML;
101101

102102
my $verify_response = `xmlsec1 --verify --pubkey-cert-pem t/rsa.cert.pem --untrusted-pem t/intermediate.pem --trusted-pem t/cacert.pem --id-attr:ID "foo" t/tmp.xml 2>&1`;
103-
ok( $verify_response =~ m/^OK/, "t/tmp.xml RSA is verified using xmlsec1" )
103+
ok( $verify_response =~ m/OK/, "t/tmp.xml RSA is verified using xmlsec1" )
104104
or warn "calling xmlsec1 failed: '$verify_response'\n";
105105
unlink "t/tmp.xml";
106106

@@ -130,9 +130,9 @@ foreach my $alg (@hash_alg) {
130130
close XML;
131131

132132
my $verify_response = `xmlsec1 --verify --trusted-pem t/ecdsa.public.pem --id-attr:ID "foo" t/tmp.xml 2>&1`;
133-
ok( $verify_response =~ m/^OK/, "ECDSA Response is verified using xmlsec1" )
133+
ok( $verify_response =~ m/OK/, "ECDSA Response is verified using xmlsec1" )
134134
or warn "calling xmlsec1 failed: '$verify_response'\n";
135-
if ($verify_response =~ m/^OK/) {
135+
if ($verify_response =~ m/OK/) {
136136
unlink 't/tmp.xml';
137137
} else{
138138
print $signed;

‎t/018-DigestSignatureAlgorithms.t‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ foreach my $key ('t/dsa.private.key', 't/dsa.private-2048.key', 't/dsa.private-3
4545
close XML;
4646

4747
my $verify_response = `xmlsec1 --verify --id-attr:ID "foo" t/tmp-dsa-$sig->{sig_hash}-nox509-$digalg.xml 2>&1`;
48-
ok( $verify_response =~ m/^OK/, "t/tmp-dsa-$sig->{sig_hash}-nox509-$digalg.xml is verified using xmlsec1" )
48+
ok( $verify_response =~ m/OK/, "t/tmp-dsa-$sig->{sig_hash}-nox509-$digalg.xml is verified using xmlsec1" )
4949
or warn "calling xmlsec1 failed: '$verify_response'\n";
5050
unlink "t/tmp-dsa-$sig->{sig_hash}-nox509-$digalg.xml";
5151
}
@@ -79,9 +79,9 @@ foreach my $key ('t/dsa.private.key', 't/dsa.private-2048.key', 't/dsa.private-3
7979
close XML;
8080

8181
my $verify_response = `xmlsec1 --verify --id-attr:ID "foo" --pubkey-cert-pem t/dsa.public.pem --trusted-pem t/dsa.public.pem t/tmp-dsa-$sig->{sig_hash}-x509-$digalg.xml 2>&1`;
82-
ok( $verify_response =~ m/^OK/, "t/tmp-dsa-$sig->{sig_hash}-x509-$digalg.xml is verified using xmlsec1" )
82+
ok( $verify_response =~ m/OK/, "t/tmp-dsa-$sig->{sig_hash}-x509-$digalg.xml is verified using xmlsec1" )
8383
or warn "calling xmlsec1 failed: '$verify_response'\n";
84-
if ($verify_response =~ m/^OK/) {
84+
if ($verify_response =~ m/OK/) {
8585
unlink "t/tmp-dsa-$sig->{sig_hash}-x509-$digalg.xml";
8686
} else{
8787
print $signed;
@@ -120,7 +120,7 @@ foreach my $sigalg (@hash) {
120120
close XML;
121121

122122
my $verify_response = `xmlsec1 --verify --pubkey-cert-pem t/rsa.cert.pem --untrusted-pem t/intermediate.pem --trusted-pem t/cacert.pem --id-attr:ID "foo" t/tmp-rsa-$sigalg-nox509-$digalg.xml 2>&1`;
123-
ok( $verify_response =~ m/^OK/, "t/tmp-rsa-$sigalg-nox509-$digalg.xml RSA is verified using xmlsec1 - no X509" )
123+
ok( $verify_response =~ m/OK/, "t/tmp-rsa-$sigalg-nox509-$digalg.xml RSA is verified using xmlsec1 - no X509" )
124124
or warn "calling xmlsec1 failed: '$verify_response'\n";
125125
unlink "t/tmp-rsa-$sigalg-nox509-$digalg.xml";
126126

@@ -157,7 +157,7 @@ foreach my $sigalg (@hash) {
157157
close XML;
158158

159159
my $verify_response = `xmlsec1 --verify --pubkey-cert-pem t/rsa.cert.pem --untrusted-pem t/intermediate.pem --trusted-pem t/cacert.pem --id-attr:ID "foo" t/tmp-rsa-$sigalg-x509-$digalg.xml 2>&1`;
160-
ok( $verify_response =~ m/^OK/, "t/tmp-rsa-$sigalg-x509-$digalg.xml RSA is verified using xmlsec1" )
160+
ok( $verify_response =~ m/OK/, "t/tmp-rsa-$sigalg-x509-$digalg.xml RSA is verified using xmlsec1" )
161161
or warn "calling xmlsec1 failed: '$verify_response'\n";
162162
unlink "t/tmp-rsa-$sigalg-x509-$digalg.xml";
163163

@@ -196,9 +196,9 @@ foreach my $sigalg (@hash) {
196196
close XML;
197197

198198
my $verify_response = `xmlsec1 --verify --trusted-pem t/ecdsa.public.pem --id-attr:ID "foo" t/tmp-ecdsa-$sigalg-x509-$digalg.xml 2>&1`;
199-
ok( $verify_response =~ m/^OK/, "ECDSA Response is verified using xmlsec1" )
199+
ok( $verify_response =~ m/OK/, "ECDSA Response is verified using xmlsec1" )
200200
or warn "calling xmlsec1 failed: '$verify_response'\n";
201-
if ($verify_response =~ m/^OK/) {
201+
if ($verify_response =~ m/OK/) {
202202
unlink "t/tmp-ecdsa-$sigalg-x509-$digalg.xml";
203203
} else{
204204
print $signed;

‎t/019_dsakeys.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SKIP: {
3131
close XML;
3232

3333
my $verify_response = `xmlsec1 --verify --pubkey-cert-pem t/dsa.public.pem --trusted-pem t/dsa.public.pem --id-attr:ID "foo" t/tmp.xml 2>&1`;
34-
ok( $verify_response =~ m/^OK/, "t/tmp.xml is verified using xmlsec1 and X509Certificate" )
34+
ok( $verify_response =~ m/OK/, "t/tmp.xml is verified using xmlsec1 and X509Certificate" )
3535
or warn "calling xmlsec1 failed: '$verify_response'\n";
3636
unlink "t/tmp.xml";
3737
}

‎t/020_dsakeys-2048.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SKIP: {
3333
close XML;
3434

3535
my $verify_response = `xmlsec1 --verify --pubkey-cert-pem t/dsa.public-2048.pem --trusted-pem t/dsa.public-2048.pem --id-attr:ID "foo" t/tmp.xml 2>&1`;
36-
ok( $verify_response =~ m/^OK/, "t/tmp.xml is verified using xmlsec1 and X509Certificate" )
36+
ok( $verify_response =~ m/OK/, "t/tmp.xml is verified using xmlsec1 and X509Certificate" )
3737
or warn "calling xmlsec1 failed: '$verify_response'\n";
3838
unlink "t/tmp.xml";
3939
}

‎t/021_dsakeys-3072.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ SKIP: {
3333
close XML;
3434

3535
my $verify_response = `xmlsec1 --verify --pubkey-cert-pem t/dsa.public-3072.pem --trusted-pem t/dsa.public-3072.pem --id-attr:ID "foo" t/tmp.xml 2>&1`;
36-
ok( $verify_response =~ m/^OK/, "t/tmp.xml is verified using xmlsec1 and X509Certificate" )
36+
ok( $verify_response =~ m/OK/, "t/tmp.xml is verified using xmlsec1 and X509Certificate" )
3737
or warn "calling xmlsec1 failed: '$verify_response'\n";
3838
unlink "t/tmp.xml";
3939
}

0 commit comments

Comments
 (0)