Merge remote-tracking branch 'upstream/master'

model/api/src/main/java/org/keycloak/models/KerberosConstants.java

@@ -1,4 +1,4 @@
-package org.keycloak.models.utils;
+package org.keycloak.models;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
@@ -10,26 +10,38 @@ public class KerberosConstants {
      **/
     public static final String NEGOTIATE = "Negotiate";
 
+
     /**
      * OID of SPNEGO mechanism. See http://www.oid-info.com/get/1.3.6.1.5.5.2
      */
     public static final String SPNEGO_OID = "1.3.6.1.5.5.2";
 
+
     /**
      * OID of Kerberos v5 mechanism. See http://www.oid-info.com/get/1.2.840.113554.1.2.2
      */
     public static final String KRB5_OID = "1.2.840.113554.1.2.2";
 
+
     /**
-     * Configuration federation provider model attribute. It's always true for KerberosFederationProvider and configurable for LDAPFederationProvider
+     * Configuration federation provider model attributes.
      */
     public static final String ALLOW_KERBEROS_AUTHENTICATION = "allowKerberosAuthentication";
+    public static final String KERBEROS_REALM = "kerberosRealm";
+    public static final String SERVER_PRINCIPAL = "serverPrincipal";
+    public static final String KEYTAB = "keyTab";
+    public static final String DEBUG = "debug";
+    public static final String ALLOW_PASSWORD_AUTHENTICATION = "allowPasswordAuthentication";
+    public static final String UPDATE_PROFILE_FIRST_LOGIN = "updateProfileFirstLogin";
+    public static final String USE_KERBEROS_FOR_PASSWORD_AUTHENTICATION = "useKerberosForPasswordAuthentication";
+
 
     /**
      * Internal attribute used in "state" map . Contains token to be passed in HTTP Response back to browser to continue handshake
      */
     public static final String RESPONSE_TOKEN = "SpnegoResponseToken";
 
+
     /**
      * Internal attribute used in "state" map . Contains credential from SPNEGO/Kerberos successful authentication
      */

model/api/src/main/java/org/keycloak/models/LDAPConstants.java

@@ -23,6 +23,8 @@ public class LDAPConstants {
     public static final String CONNECTION_POOLING = "connectionPooling";
     public static final String PAGINATION = "pagination";
 
+    public static final String EDIT_MODE = "editMode";
+
     // Count of users processed per single transaction during sync process
     public static final String BATCH_SIZE_FOR_SYNC = "batchSizeForSync";
     public static final int DEFAULT_BATCH_SIZE_FOR_SYNC = 1000;

model/api/src/main/java/org/keycloak/models/UserFederationManager.java

@@ -384,6 +384,7 @@ public class UserFederationManager implements UserProvider {
                 return CredentialValidationOutput.failed();
             }
 
+            logger.debug("Found provider [" + providerSupportingCreds + "] supporting credentials of type " + cred.getType());
             CredentialValidationOutput currentResult = providerSupportingCreds.validCredentials(realm, cred);
             result = (result == null) ? currentResult : result.merge(currentResult);
         }