[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/i...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Oct 23 20:07:53 2015
New Revision: 7868

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7868&view=rev
Log:
Add missing default token strategy.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/ProcessSAML20AssertionWSSToken.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/ProcessSAML20AssertionWSSToken.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/ProcessSAML20AssertionWSSToken.java?rev=7868&r1=7867&r2=7868&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/ProcessSAML20AssertionWSSToken.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/ProcessSAML20AssertionWSSToken.java	Fri Oct 23 20:07:53 2015
@@ -80,6 +80,7 @@
     public ProcessSAML20AssertionWSSToken() {
         requesterLookupStrategy = new RelyingPartyIdLookupFunction();
         responderLookupStrategy = new ResponderIdLookupFunction();
+        assertionTokenStrategy = new TokenStrategy();
     }
     
     /**
@@ -130,7 +131,6 @@
         
         if (assertionToken == null) {
             log.info("{} No valid SAML20AssertionToken available within inbound WSSecurityContext", getLogPrefix());
-            //TODO can use this event ID here?
             ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.NO_CREDENTIALS);
             return false;
         }
@@ -138,8 +138,7 @@
         org.opensaml.saml.saml2.core.Subject samlSubject = assertionToken.getWrappedToken().getSubject();
         if (samlSubject == null || samlSubject.getNameID() == null) {
             log.info("{} SAML20AssertionToken does not contain either a Subject or a NameID", getLogPrefix());
-            //TODO can use this event ID here?
-            ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.NO_CREDENTIALS);
+            ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.INVALID_SUBJECT);
             return false;
         }