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

Merge pull request #3746 from patriot1burke/master

Browse source 
KEYCLOAK-4099
This commit is contained in:
Bill Burke 2017-01-12 11:17:28 -05:00 committed by GitHub
commit 8de3b26126
4 changed files with 1465 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server-spi/src/main/java/org/keycloak/component/PrioritizedComponentModel.java
View file

@ -23,6 +23,7 @@ import java.util.Comparator;
* @version $Revision: 1 $ * @version $Revision: 1 $
*/ */
public class PrioritizedComponentModel extends ComponentModel { public class PrioritizedComponentModel extends ComponentModel {
public static final String PRIORITY = "priority";
public static Comparator<ComponentModel> comparator = new Comparator<ComponentModel>() { public static Comparator<ComponentModel> comparator = new Comparator<ComponentModel>() {
@Override @Override
public int compare(ComponentModel o1, ComponentModel o2) { public int compare(ComponentModel o1, ComponentModel o2) {
@ -38,7 +39,7 @@ public class PrioritizedComponentModel extends ComponentModel {
} }
public static int parsePriority(ComponentModel component) { public static int parsePriority(ComponentModel component) {
String priority = component.getConfig().getFirst("priority"); String priority = component.getConfig().getFirst(PRIORITY);
if (priority == null) return 0; if (priority == null) return 0;
return Integer.valueOf(priority); return Integer.valueOf(priority);

53
server-spi/src/main/java/org/keycloak/storage/UserStorageProviderModel.java
View file

@ -28,6 +28,17 @@ import org.keycloak.component.PrioritizedComponentModel;
*/ */
public class UserStorageProviderModel extends PrioritizedComponentModel { public class UserStorageProviderModel extends PrioritizedComponentModel {
public static final String CACHE_POLICY = "cachePolicy";
public static final String MAX_LIFESPAN = "maxLifespan";
public static final String EVICTION_HOUR = "evictionHour";
public static final String EVICTION_MINUTE = "evictionMinute";
public static final String EVICTION_DAY = "evictionDay";
public static final String CACHE_INVALID_BEFORE = "cacheInvalidBefore";
public static final String IMPORT_ENABLED = "importEnabled";
public static final String FULL_SYNC_PERIOD = "fullSyncPeriod";
public static final String CHANGED_SYNC_PERIOD = "changedSyncPeriod";
public static final String LAST_SYNC = "lastSync";
public static enum CachePolicy { public static enum CachePolicy {
NO_CACHE, NO_CACHE,
DEFAULT, DEFAULT,
@ -57,7 +68,7 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public CachePolicy getCachePolicy() { public CachePolicy getCachePolicy() {
if (cachePolicy == null) { if (cachePolicy == null) {
String str = getConfig().getFirst("cachePolicy"); String str = getConfig().getFirst(CACHE_POLICY);
if (str == null) return null; if (str == null) return null;
cachePolicy = CachePolicy.valueOf(str); cachePolicy = CachePolicy.valueOf(str);
} }
@ -67,16 +78,16 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public void setCachePolicy(CachePolicy cachePolicy) { public void setCachePolicy(CachePolicy cachePolicy) {
this.cachePolicy = cachePolicy; this.cachePolicy = cachePolicy;
if (cachePolicy == null) { if (cachePolicy == null) {
getConfig().remove("cachePolicy"); getConfig().remove(CACHE_POLICY);
} else { } else {
getConfig().putSingle("cachePolicy", cachePolicy.name()); getConfig().putSingle(CACHE_POLICY, cachePolicy.name());
} }
} }
public long getMaxLifespan() { public long getMaxLifespan() {
if (maxLifespan < 0) { if (maxLifespan < 0) {
String str = getConfig().getFirst("maxLifespan"); String str = getConfig().getFirst(MAX_LIFESPAN);
if (str == null) return -1; if (str == null) return -1;
maxLifespan = Long.valueOf(str); maxLifespan = Long.valueOf(str);
} }
@ -85,12 +96,12 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public void setMaxLifespan(long maxLifespan) { public void setMaxLifespan(long maxLifespan) {
this.maxLifespan = maxLifespan; this.maxLifespan = maxLifespan;
getConfig().putSingle("maxLifespan", Long.toString(maxLifespan)); getConfig().putSingle(MAX_LIFESPAN, Long.toString(maxLifespan));
} }
public int getEvictionHour() { public int getEvictionHour() {
if (evictionHour < 0) { if (evictionHour < 0) {
String str = getConfig().getFirst("evictionHour"); String str = getConfig().getFirst(EVICTION_HOUR);
if (str == null) return -1; if (str == null) return -1;
evictionHour = Integer.valueOf(str); evictionHour = Integer.valueOf(str);
} }
@ -100,12 +111,12 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public void setEvictionHour(int evictionHour) { public void setEvictionHour(int evictionHour) {
if (evictionHour > 23 || evictionHour < 0) throw new IllegalArgumentException("Must be between 0 and 23"); if (evictionHour > 23 || evictionHour < 0) throw new IllegalArgumentException("Must be between 0 and 23");
this.evictionHour = evictionHour; this.evictionHour = evictionHour;
getConfig().putSingle("evictionHour", Integer.toString(evictionHour)); getConfig().putSingle(EVICTION_HOUR, Integer.toString(evictionHour));
} }
public int getEvictionMinute() { public int getEvictionMinute() {
if (evictionMinute < 0) { if (evictionMinute < 0) {
String str = getConfig().getFirst("evictionMinute"); String str = getConfig().getFirst(EVICTION_MINUTE);
if (str == null) return -1; if (str == null) return -1;
evictionMinute = Integer.valueOf(str); evictionMinute = Integer.valueOf(str);
} }
@ -115,12 +126,12 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public void setEvictionMinute(int evictionMinute) { public void setEvictionMinute(int evictionMinute) {
if (evictionMinute > 59 || evictionMinute < 0) throw new IllegalArgumentException("Must be between 0 and 59"); if (evictionMinute > 59 || evictionMinute < 0) throw new IllegalArgumentException("Must be between 0 and 59");
this.evictionMinute = evictionMinute; this.evictionMinute = evictionMinute;
getConfig().putSingle("evictionMinute", Integer.toString(evictionMinute)); getConfig().putSingle(EVICTION_MINUTE, Integer.toString(evictionMinute));
} }
public int getEvictionDay() { public int getEvictionDay() {
if (evictionDay < 0) { if (evictionDay < 0) {
String str = getConfig().getFirst("evictionDay"); String str = getConfig().getFirst(EVICTION_DAY);
if (str == null) return -1; if (str == null) return -1;
evictionDay = Integer.valueOf(str); evictionDay = Integer.valueOf(str);
} }
@ -130,12 +141,12 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public void setEvictionDay(int evictionDay) { public void setEvictionDay(int evictionDay) {
if (evictionDay > 7 || evictionDay < 1) throw new IllegalArgumentException("Must be between 1 and 7"); if (evictionDay > 7 || evictionDay < 1) throw new IllegalArgumentException("Must be between 1 and 7");
this.evictionDay = evictionDay; this.evictionDay = evictionDay;
getConfig().putSingle("evictionDay", Integer.toString(evictionDay)); getConfig().putSingle(EVICTION_DAY, Integer.toString(evictionDay));
} }
public long getCacheInvalidBefore() { public long getCacheInvalidBefore() {
if (cacheInvalidBefore < 0) { if (cacheInvalidBefore < 0) {
String str = getConfig().getFirst("cacheInvalidBefore"); String str = getConfig().getFirst(CACHE_INVALID_BEFORE);
if (str == null) return -1; if (str == null) return -1;
cacheInvalidBefore = Long.valueOf(str); cacheInvalidBefore = Long.valueOf(str);
} }
@ -144,12 +155,12 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public void setCacheInvalidBefore(long cacheInvalidBefore) { public void setCacheInvalidBefore(long cacheInvalidBefore) {
this.cacheInvalidBefore = cacheInvalidBefore; this.cacheInvalidBefore = cacheInvalidBefore;
getConfig().putSingle("cacheInvalidBefore", Long.toString(cacheInvalidBefore)); getConfig().putSingle(CACHE_INVALID_BEFORE, Long.toString(cacheInvalidBefore));
} }
public boolean isImportEnabled() { public boolean isImportEnabled() {
if (importEnabled == null) { if (importEnabled == null) {
String val = getConfig().getFirst("importEnabled"); String val = getConfig().getFirst(IMPORT_ENABLED);
if (val == null) { if (val == null) {
importEnabled = true; importEnabled = true;
} else { } else {
@ -164,12 +175,12 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public void setImportEnabled(boolean flag) { public void setImportEnabled(boolean flag) {
importEnabled = flag; importEnabled = flag;
getConfig().putSingle("importEnabled", Boolean.toString(flag)); getConfig().putSingle(IMPORT_ENABLED, Boolean.toString(flag));
} }
public int getFullSyncPeriod() { public int getFullSyncPeriod() {
if (fullSyncPeriod == null) { if (fullSyncPeriod == null) {
String val = getConfig().getFirst("fullSyncPeriod"); String val = getConfig().getFirst(FULL_SYNC_PERIOD);
if (val == null) { if (val == null) {
fullSyncPeriod = -1; fullSyncPeriod = -1;
} else { } else {
@ -181,12 +192,12 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public void setFullSyncPeriod(int fullSyncPeriod) { public void setFullSyncPeriod(int fullSyncPeriod) {
this.fullSyncPeriod = fullSyncPeriod; this.fullSyncPeriod = fullSyncPeriod;
getConfig().putSingle("fullSyncPeriod", Integer.toString(fullSyncPeriod)); getConfig().putSingle(FULL_SYNC_PERIOD, Integer.toString(fullSyncPeriod));
} }
public int getChangedSyncPeriod() { public int getChangedSyncPeriod() {
if (changedSyncPeriod == null) { if (changedSyncPeriod == null) {
String val = getConfig().getFirst("changedSyncPeriod"); String val = getConfig().getFirst(CHANGED_SYNC_PERIOD);
if (val == null) { if (val == null) {
changedSyncPeriod = -1; changedSyncPeriod = -1;
} else { } else {
@ -198,12 +209,12 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public void setChangedSyncPeriod(int changedSyncPeriod) { public void setChangedSyncPeriod(int changedSyncPeriod) {
this.changedSyncPeriod = changedSyncPeriod; this.changedSyncPeriod = changedSyncPeriod;
getConfig().putSingle("changedSyncPeriod", Integer.toString(changedSyncPeriod)); getConfig().putSingle(CHANGED_SYNC_PERIOD, Integer.toString(changedSyncPeriod));
} }
public int getLastSync() { public int getLastSync() {
if (lastSync == null) { if (lastSync == null) {
String val = getConfig().getFirst("lastSync"); String val = getConfig().getFirst(LAST_SYNC);
if (val == null) { if (val == null) {
lastSync = 0; lastSync = 0;
} else { } else {
@ -215,6 +226,6 @@ public class UserStorageProviderModel extends PrioritizedComponentModel {
public void setLastSync(int lastSync) { public void setLastSync(int lastSync) {
this.lastSync = lastSync; this.lastSync = lastSync;
getConfig().putSingle("lastSync", Integer.toString(lastSync)); getConfig().putSingle(LAST_SYNC, Integer.toString(lastSync));
} }
} }

45
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java
View file

@ -19,9 +19,14 @@ package org.keycloak.testsuite.migration;
import java.util.HashSet; import java.util.HashSet;
import org.junit.Test; import org.junit.Test;
import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.common.constants.KerberosConstants;
import org.keycloak.component.PrioritizedComponentModel;
import org.keycloak.keys.KeyProvider; import org.keycloak.keys.KeyProvider;
import org.keycloak.models.LDAPConstants;
import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.ComponentRepresentation;
import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.storage.UserStorageProvider;
import org.keycloak.storage.UserStorageProviderModel;
import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AbstractKeycloakTest;
import org.keycloak.testsuite.arquillian.migration.Migration; import org.keycloak.testsuite.arquillian.migration.Migration;
@ -55,7 +60,9 @@ import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER;
public class MigrationTest extends AbstractKeycloakTest { public class MigrationTest extends AbstractKeycloakTest {
public static final String MIGRATION = "Migration"; public static final String MIGRATION = "Migration";
public static final String MIGRATION2 = "Migration2";
private RealmResource migrationRealm; private RealmResource migrationRealm;
private RealmResource migrationRealm2;
private RealmResource masterRealm; private RealmResource masterRealm;
@Override @Override
@ -66,6 +73,7 @@ public class MigrationTest extends AbstractKeycloakTest {
@Before @Before
public void beforeMigrationTest() { public void beforeMigrationTest() {
migrationRealm = adminClient.realms().realm(MIGRATION); migrationRealm = adminClient.realms().realm(MIGRATION);
migrationRealm2 = adminClient.realms().realm(MIGRATION2);
masterRealm = adminClient.realms().realm(MASTER); masterRealm = adminClient.realms().realm(MASTER);
//add migration realm to testRealmReps to make the migration removed after test //add migration realm to testRealmReps to make the migration removed after test
@ -81,6 +89,7 @@ public class MigrationTest extends AbstractKeycloakTest {
testMigrationTo2_2_0(); testMigrationTo2_2_0();
testMigrationTo2_3_0(); testMigrationTo2_3_0();
testMigrationTo2_5_0(); testMigrationTo2_5_0();
testLdapKerberosMigration_2_5_0();
} }
@Test @Test
@ -95,7 +104,7 @@ public class MigrationTest extends AbstractKeycloakTest {
//master realm //master realm
assertNames(masterRealm.roles().list(), "offline_access", "uma_authorization", "create-realm", "master-test-realm-role", "admin"); assertNames(masterRealm.roles().list(), "offline_access", "uma_authorization", "create-realm", "master-test-realm-role", "admin");
assertNames(masterRealm.clients().findAll(), "admin-cli", "security-admin-console", "broker", "account", assertNames(masterRealm.clients().findAll(), "admin-cli", "security-admin-console", "broker", "account",
"master-realm", "master-test-client", "Migration-realm"); "master-realm", "master-test-client", "Migration-realm", "Migration2-realm");
String id = masterRealm.clients().findByClientId("master-test-client").get(0).getId(); String id = masterRealm.clients().findByClientId("master-test-client").get(0).getId();
assertNames(masterRealm.clients().get(id).roles().list(), "master-test-client-role"); assertNames(masterRealm.clients().get(id).roles().list(), "master-test-client-role");
assertNames(masterRealm.users().search("", 0, 5), "admin", "master-test-user"); assertNames(masterRealm.users().search("", 0, 5), "admin", "master-test-user");
@ -171,6 +180,40 @@ public class MigrationTest extends AbstractKeycloakTest {
//https://github.com/keycloak/keycloak/pull/3630 //https://github.com/keycloak/keycloak/pull/3630
testDuplicateEmailSupport(masterRealm, migrationRealm); testDuplicateEmailSupport(masterRealm, migrationRealm);
} }
private void testLdapKerberosMigration_2_5_0() {
RealmRepresentation realmRep = migrationRealm2.toRepresentation();
List<ComponentRepresentation> components = migrationRealm2.components().query(realmRep.getId(), UserStorageProvider.class.getName());
assertEquals(2, components.size());
boolean testedLdap = false;
boolean testedKerberos = false;
for (ComponentRepresentation component : components) {
if (component.getName().equals("ldap-provider")) {
assertEquals("2", component.getConfig().getFirst(PrioritizedComponentModel.PRIORITY));
assertEquals("READ_ONLY", component.getConfig().getFirst(LDAPConstants.EDIT_MODE));
assertEquals("true", component.getConfig().getFirst(LDAPConstants.SYNC_REGISTRATIONS));
assertEquals(LDAPConstants.VENDOR_RHDS, component.getConfig().getFirst(LDAPConstants.VENDOR));
assertEquals("uid", component.getConfig().getFirst(LDAPConstants.USERNAME_LDAP_ATTRIBUTE));
assertEquals("uid", component.getConfig().getFirst(LDAPConstants.RDN_LDAP_ATTRIBUTE));
assertEquals("nsuniqueid", component.getConfig().getFirst(LDAPConstants.UUID_LDAP_ATTRIBUTE));
assertEquals("inetOrgPerson, organizationalPerson", component.getConfig().getFirst(LDAPConstants.USER_OBJECT_CLASSES));
assertEquals("http://localhost", component.getConfig().getFirst(LDAPConstants.CONNECTION_URL));
assertEquals("dn", component.getConfig().getFirst(LDAPConstants.USERS_DN));
assertEquals(LDAPConstants.AUTH_TYPE_NONE, component.getConfig().getFirst(LDAPConstants.AUTH_TYPE));
assertEquals("true", component.getConfig().getFirst(KerberosConstants.ALLOW_KERBEROS_AUTHENTICATION));
assertEquals("realm", component.getConfig().getFirst(KerberosConstants.KERBEROS_REALM));
assertEquals("principal", component.getConfig().getFirst(KerberosConstants.SERVER_PRINCIPAL));
assertEquals("keytab", component.getConfig().getFirst(KerberosConstants.KEYTAB));
testedLdap = true;
} else if (component.getName().equals("kerberos-provider")) {
assertEquals("3", component.getConfig().getFirst(PrioritizedComponentModel.PRIORITY));
assertEquals("realm", component.getConfig().getFirst(KerberosConstants.KERBEROS_REALM));
assertEquals("principal", component.getConfig().getFirst(KerberosConstants.SERVER_PRINCIPAL));
assertEquals("keytab", component.getConfig().getFirst(KerberosConstants.KEYTAB));
}
}
}
private void testAuthorizationServices(RealmResource... realms) { private void testAuthorizationServices(RealmResource... realms) {
for (RealmResource realm : realms) { for (RealmResource realm : realms) {

1437
testsuite/integration-arquillian/tests/base/src/test/resources/migration-test/migration-realm-1.9.8.Final.json
View file

File diff suppressed because it is too large Load diff