[java-identity-provider COMMIT] in /trunk: idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExterna...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Sep 16 20:54:45 2014
New Revision: 6535

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6535&view=rev
Log:
IDP-229 - external login flow for X.509

Added:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java   (with props)
    trunk/idp-conf/src/main/resources/conf/authn/x509-authn-config.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/authn/x509-authn-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/authn/x509-authn-flow.xml   (with props)
    trunk/idp-war/src/main/webapp/x509-prompt.jsp   (with props)
Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
    trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java?rev=6535&r1=6534&r2=6535&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java Tue Sep 16 20:54:45 2014
@@ -105,7 +105,8 @@
         }
         
         if (extContext.getSubject() != null) {
-            log.info("{} External authentication succeeded for Subject: {}", getLogPrefix(), extContext.getSubject());
+            log.info("{} External authentication succeeded for Subject: {}", getLogPrefix(),
+                    extContext.getSubject().getPrincipals());
         } else if (extContext.getPrincipal() != null) {
             log.info("{} External authentication succeeded for Principal: {}", getLogPrefix(),
                     extContext.getPrincipal());

Modified: trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml?rev=6535&r1=6534&r2=6535&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml Tue Sep 16 20:54:45 2014
@@ -38,10 +38,22 @@
                 </util:list>
             </property>
         </bean>
-        
+
         <bean id="authn/RemoteUser" parent="shibboleth.AuthenticationFlow"
             p:nonBrowserSupported="false" />
 
+        <bean id="authn/X509" parent="shibboleth.AuthenticationFlow"
+                p:nonBrowserSupported="false">
+            <property name="supportedPrincipals">
+                <util:list>
+                    <bean parent="shibboleth.SAML2AuthnContextClassRef"
+                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient" />
+                    <bean parent="shibboleth.SAML1AuthenticationMethod"
+                        c:method="urn:ietf:rfc:2246" />
+                </util:list>
+            </property>
+        </bean>
+        
         <bean id="authn/External" parent="shibboleth.AuthenticationFlow"
             p:nonBrowserSupported="false" />
 

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=6535&r1=6534&r2=6535&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Tue Sep 16 20:54:45 2014
@@ -68,6 +68,7 @@
         <webflow:flow-location id="authn/RemoteUserInternal" path="../system/flows/authn/remoteuser-internal-authn-flow.xml" />
         <webflow:flow-location id="authn/Password" path="../system/flows/authn/password-authn-flow.xml" />
         <webflow:flow-location id="authn/RemoteUser" path="../system/flows/authn/remoteuser-authn-flow.xml" />
+        <webflow:flow-location id="authn/X509" path="../system/flows/authn/x509-authn-flow.xml" />
         <webflow:flow-location id="authn/External" path="../system/flows/authn/external-authn-flow.xml" />
 
         <!-- Master flows for post-authn and SAML subject c14n. -->

Modified: trunk/idp-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/web.xml?rev=6535&r1=6534&r2=6535&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/web.xml Tue Sep 16 20:54:45 2014
@@ -129,6 +129,21 @@

[... 22 lines stripped ...]