libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

KEYCLOAK-2319

Browse source 
Cannot login to admin console after upgrade 1.6 -> 1.8.CR1
This commit is contained in:
Stian Thorgersen 2016-01-18 11:16:02 +01:00
parent ded919c0a6
commit 904ed65a5c
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
connections/jpa-liquibase/src/main/resources/META-INF/jpa-changelog-1.8.0.xml
View file

@ -111,4 +111,14 @@
</update>
</changeSet>
<changeSet id="1.8.0-2" author="keycloak">
<dropDefaultValue tableName="CREDENTIAL" columnName="ALGORITHM" columnDataType="VARCHAR(36)"/>
<update tableName="CREDENTIAL">
<column name="ALGORITHM" type="VARCHAR(36)" value="pbkdf2" />
<where>TYPE in ('password-history', 'password') AND ALGORITHM is 'HmacSHA1'</where>
</update>
</changeSet>
</databaseChangeLog>

12
server-spi/src/main/java/org/keycloak/hash/PasswordHashManager.java
View file

@ -1,5 +1,6 @@
package org.keycloak.hash;
import org.jboss.logging.Logger;
import org.keycloak.models.*;
/**
@ -7,6 +8,8 @@ import org.keycloak.models.*;
*/
public class PasswordHashManager {
private static final Logger log = Logger.getLogger(PasswordHashManager.class);
public static UserCredentialValueModel encode(KeycloakSession session, RealmModel realm, String rawPassword) {
return encode(session, realm.getPasswordPolicy(), rawPassword);
}
@ -17,9 +20,10 @@ public class PasswordHashManager {
if (iterations < 1) {
iterations = 1;
}
PasswordHashProvider provider = session.getProvider(PasswordHashProvider.class, algorithm);
PasswordHashProvider provider = session.getProvider(PasswordHashProvider.class, passwordPolicy.getHashAlgorithm());
if (provider == null) {
throw new RuntimeException("Password hash provider for algorithm " + algorithm + " not found");
log.warnv("Could not find hash provider {0} from password policy, using default provider {1}", algorithm, Constants.DEFAULT_HASH_ALGORITHM);
provider = session.getProvider(PasswordHashProvider.class, Constants.DEFAULT_HASH_ALGORITHM);
}
return provider.encode(rawPassword, iterations);
}
@ -31,6 +35,10 @@ public class PasswordHashManager {
public static boolean verify(KeycloakSession session, PasswordPolicy passwordPolicy, String password, UserCredentialValueModel credential) {
String algorithm = credential.getAlgorithm() != null ? credential.getAlgorithm() : passwordPolicy.getHashAlgorithm();
PasswordHashProvider provider = session.getProvider(PasswordHashProvider.class, algorithm);
if (provider == null) {
log.warnv("Could not find hash provider {0} for password", algorithm);
return false;
}
return provider.verify(password, credential);
}