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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Oct 22 13:39:07 2015
New Revision: 7858

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7858&view=rev
Log:
IDP-111 - stop hardwiring base path of controller

Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java?rev=7858&r1=7857&r2=7858&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java	(original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java	Thu Oct 22 13:39:07 2015
@@ -42,7 +42,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -57,8 +56,6 @@
  * {@link ExternalAuthentication#finishExternalAuthentication(String, HttpServletRequest, HttpServletResponse)} and
  * returning null. On unrecoverable errors, an exception is thrown.
  */
- at Controller
- at RequestMapping("/Authn/SPNEGO")
 public class SPNEGOAuthnController {
     
     /** Event ID indicating that SPNEGO is not supported by the client or is not available for other reasons. */

Modified: trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?rev=7858&r1=7857&r2=7858&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml	Thu Oct 22 13:39:07 2015
@@ -20,6 +20,16 @@
 
     <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" p:order="2" />
 
+    <!-- Add this one to mount any additional MVC controllers we create. -->
+
+    <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping" p:order="3">
+        <property name="mappings">
+            <props>
+                <prop key="%{idp.authn.spnego.externalAuthnPath:/Authn/SPNEGO}/**">shibboleth.SPNEGOAuthnController</prop>
+            </props>
+        </property>
+    </bean>
+
     <!-- HandlerAdapters: These aren't ordered. Add the WebFlow one, then the standard Spring MVC default ones. 
          Have to enumerate them all explicitly b/c we're overriding the built-in defaults. -->
     
@@ -33,7 +43,7 @@
     
     <!-- Additional MVC controllers -->
     
-    <bean class="net.shibboleth.idp.authn.spnego.impl.SPNEGOAuthnController" />
+    <bean id="shibboleth.SPNEGOAuthnController" class="net.shibboleth.idp.authn.spnego.impl.SPNEGOAuthnController" />
 
     <!-- Exception handling -->
     

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-beans.xml?rev=7858&r1=7857&r2=7858&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-beans.xml	Thu Oct 22 13:39:07 2015
@@ -23,13 +23,20 @@
 
     <import resource="../../../conf/authn/spnego-authn-config.xml" />
 
-    <!-- Make configurable value available in flow. -->
+    <!-- Make configurable values available in flow. -->
+    
     <alias name="shibboleth.authn.SPNEGO.EnforceRun" alias="enforceRun"/>
 
-    <!-- Kerberos settings and realms -->
+    <bean id="shibboleth.authn.SPNEGO.externalAuthnPath" class="java.lang.String"
+        c:_0="servletRelative:%{idp.authn.spnego.externalAuthnPath:/Authn/SPNEGO}" />
+
+    <!-- Kerberos settings and realms. -->
+    
     <bean id="shibboleth.authn.SPNEGO.Krb5.Settings" class="net.shibboleth.idp.authn.spnego.impl.KerberosSettings"
         p:refreshKrb5Config-ref="shibboleth.authn.SPNEGO.Krb5.RefreshConfig"
         p:realms-ref="shibboleth.authn.SPNEGO.Krb5.Realms" />
+
+    <!-- Action beans. -->
 
     <bean id="ValidateExternalAuthentication"
             class="net.shibboleth.idp.authn.impl.ValidateExternalAuthentication" scope="prototype"

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml

[... 14 lines stripped ...]