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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 21 22:25:32 2015
New Revision: 7851

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7851&view=rev
Log:
IDP-111 - Continued cleanup, working flow files and configuration

Added:
    trunk/idp-conf/src/main/resources/conf/authn/spnego-authn-config.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/views/spnego-unavailable.vm   (with props)
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/GSSAcceptorLoginModule.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/GSSContextAcceptor.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/KerberosRealmSettings.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/SPNEGOAuthnController.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/KerberosRealmSettingsTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/spnego/impl/KerberosSettingsTest.java
    trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml
    trunk/idp-conf/src/main/resources/messages/authn-messages.properties
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/views/login-error.vm

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java?rev=7851&r1=7850&r2=7851&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java	(original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java	Wed Oct 21 22:25:32 2015
@@ -129,7 +129,7 @@
         
         final Object obj = request.getSession().getAttribute(CONVERSATION_KEY + conv);
         if (obj == null || !(obj instanceof ExternalAuthentication)) {
-            throw new ExternalAuthenticationException("No conversation state found in session");
+            throw new ExternalAuthenticationException("No conversation state found in session for key (" + conv + ")");
         }
         
         ((ExternalAuthentication) obj).doStart(request);
@@ -154,7 +154,7 @@
         
         final Object obj = request.getSession().getAttribute(CONVERSATION_KEY + key);
         if (obj == null || !(obj instanceof ExternalAuthentication)) {
-            throw new ExternalAuthenticationException("No conversation state found in session");
+            throw new ExternalAuthenticationException("No conversation state found in session for key (" + key + ")");
         }
         
         request.getSession().removeAttribute(CONVERSATION_KEY + key);

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/GSSAcceptorLoginModule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/GSSAcceptorLoginModule.java?rev=7851&r1=7850&r2=7851&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/GSSAcceptorLoginModule.java	(original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/GSSAcceptorLoginModule.java	Wed Oct 21 22:25:32 2015
@@ -74,7 +74,7 @@
         options.put("useKeyTab", "true");
         options.put("keyTab", realmSettings.getKeytab());
         options.put("principal", realmSettings.getServicePrincipal());
-        options.put("isInitiator", "false");
+        options.put("isInitiator", realmSettings.getPassword() != null ? "true" : "false");
         options.put("storeKey", "true");
 
         try {
@@ -147,11 +147,11 @@
         public void handle(@Nullable final Callback[] callbacks) throws IOException, UnsupportedCallbackException {
             if (callbacks != null && callbacks.length > 0) {
                 if (name == null || name.length() == 0) {
-                    throw new IllegalArgumentException("Invalid name");
+                    throw new IllegalArgumentException("No username provided");
                 }
 
                 if (password == null || password.length() == 0) {
-                    throw new IllegalArgumentException("Invalid password");
+                    throw new IllegalArgumentException("No password provided");
                 }
 
                 for (final Callback c : callbacks) {

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/spnego/impl/GSSContextAcceptor.java

[... 531 lines stripped ...]