Merge pull request #177 from waterkip/GL-add-keyname_to_SP

Add key_name function to SP

Author: waterkip

lib/Net/SAML2/SP.pm

@@ -157,7 +157,7 @@ Consumer Services.
 
 has 'url'    => (isa => Uri, is => 'ro', required => 1, coerce => 1);
 has 'id'     => (isa => 'Str', is => 'ro', required => 1);
-has 'cert'   => (isa => 'Str', is => 'ro', required => 1);
+has 'cert'   => (isa => 'Str', is => 'ro', required => 1, predicate => 'has_cert');
 has 'key'    => (isa => 'Str', is => 'ro', required => 1);
 has 'cacert' => (isa => 'Str', is => 'rw', required => 0, predicate => 'has_cacert');
 
@@ -274,6 +274,7 @@ around BUILDARGS => sub {
 sub _build_encryption_key_text {
     my ($self) = @_;
 
+    return '' unless $self->has_encryption_key;
     my $cert = Crypt::OpenSSL::X509->new_from_file($self->encryption_key);
     my $text = $cert->as_string;
     $text =~ s/-----[^-]*-----//gm;
@@ -283,6 +284,7 @@ sub _build_encryption_key_text {
 sub _build_cert_text {
     my ($self) = @_;
 
+    return '' unless $self->has_cert;
     my $cert = Crypt::OpenSSL::X509->new_from_file($self->cert);
     my $text = $cert->as_string;
     $text =~ s/-----[^-]*-----//gm;
@@ -634,11 +636,25 @@ sub _generate_key_descriptors {
         $x->KeyInfo(
             $ds,
             $x->X509Data($ds, $x->X509Certificate($ds, $key)),
-            $x->KeyName($ds, Digest::MD5::md5_hex($key)),
+            $x->KeyName($ds, $self->key_name($use)),
         ),
     );
 }
 
+=head2 key_name($type)
+
+Get the key name for either the C<signing> or C<encryption> key
+
+=cut
+
+sub key_name {
+    my $self = shift;
+    my $use  = shift;
+    my $key = $use eq 'signing' ? $self->_cert_text : $self->_encryption_key_text;
+    return unless $key;
+    return Digest::MD5::md5_hex($key);
+}
+
 sub _generate_single_logout_service {
     my $self = shift;
     my $x    = shift;

t/02-create-sp.t

@@ -71,6 +71,18 @@ use URN::OASIS::SAML2 qw(:bindings :urn);
 
 
     get_single_node_ok($xpath, '//ds:Signature');
+
+    is(
+        'e73560b0e23602121aedc55bcb1ca637',
+        $sp->key_name('signing'),
+        "Got a key name for the signing key"
+    );
+    is(
+        undef,
+        $sp->key_name('encryption'),
+        "... and there is no encryption key name"
+    );
+
 }
 
 {
@@ -228,6 +240,17 @@ use URN::OASIS::SAML2 qw(:bindings :urn);
     is($kd->getAttribute('use'),
         "encryption", "Key descriptor is there for encryption");
 
+    is(
+        'e73560b0e23602121aedc55bcb1ca637',
+        $sp->key_name('signing'),
+        "Got a key name for the signing key"
+    );
+    is(
+        'e73560b0e23602121aedc55bcb1ca637',
+        $sp->key_name('encryption'),
+        "... and we also have a encryption key name"
+    );
+
 }
 
 {
@@ -335,7 +358,6 @@ use URN::OASIS::SAML2 qw(:bindings :urn);
         $nodes = $xpath->findnodes('//md:SingleLogoutService');
         is($nodes->size, 0, "No single logout service generated without arguments");
 
-
     }
 
     throws_ok(