From 91eb80beb0d608ed5f8b6e163397fd65948b3fe3 Mon Sep 17 00:00:00 2001 From: mposolda Date: Tue, 5 May 2015 17:57:31 +0200 Subject: [PATCH] Minor improvements --- .../keycloak/federation/kerberos/impl/SPNEGOAuthenticator.java | 1 - model/api/src/main/java/org/keycloak/models/RealmModel.java | 2 +- .../org/keycloak/models/cache/DefaultCacheRealmProvider.java | 2 +- .../src/main/java/org/keycloak/protocol/oidc/TokenManager.java | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/SPNEGOAuthenticator.java b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/SPNEGOAuthenticator.java index 6dd2576448..9c56f75385 100644 --- a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/SPNEGOAuthenticator.java +++ b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/SPNEGOAuthenticator.java @@ -108,7 +108,6 @@ public class SPNEGOAuthenticator { if (gssContext.isEstablished()) { authenticatedKerberosPrincipal = gssContext.getSrcName().toString(); - // What should be done with delegation credential? Figure out if there are use-cases for storing it as claims in FederatedIdentity if (gssContext.getCredDelegState()) { delegationCredential = gssContext.getDelegCred(); } diff --git a/model/api/src/main/java/org/keycloak/models/RealmModel.java b/model/api/src/main/java/org/keycloak/models/RealmModel.java index 9c2960424b..8b901a2d03 100755 --- a/model/api/src/main/java/org/keycloak/models/RealmModel.java +++ b/model/api/src/main/java/org/keycloak/models/RealmModel.java @@ -181,7 +181,7 @@ public interface RealmModel extends RoleContainerModel { public IdentityProviderMapperModel getIdentityProviderMapperById(String id); public IdentityProviderMapperModel getIdentityProviderMapperByName(String brokerAlias, String name); - + // Should return list sorted by UserFederationProviderModel.priority List getUserFederationProviders(); UserFederationProviderModel addUserFederationProvider(String providerName, Map config, int priority, String displayName, int fullSyncPeriod, int changedSyncPeriod, int lastSync); diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheRealmProvider.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheRealmProvider.java index f73f7529fb..436e1891c7 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheRealmProvider.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheRealmProvider.java @@ -203,7 +203,7 @@ public class DefaultCacheRealmProvider implements CacheRealmProvider { // Return cache delegates to ensure cache invalidated during write operations List cachedRealms = new LinkedList(); for (RealmModel realm : backendRealms) { - RealmModel cached = session.realms().getRealm(realm.getId()); + RealmModel cached = getRealm(realm.getId()); cachedRealms.add(cached); } return cachedRealms; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java index fafb2e9bea..82ed245b41 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java @@ -300,14 +300,11 @@ public class TokenManager { Set mappings = new ClientSessionCode(realm, clientSession).getRequestedProtocolMappers(); KeycloakSessionFactory sessionFactory = session.getKeycloakSessionFactory(); for (ProtocolMapperModel mapping : mappings) { - if (!mapping.getProtocol().equals(OIDCLoginProtocol.LOGIN_PROTOCOL)) continue; ProtocolMapper mapper = (ProtocolMapper)sessionFactory.getProviderFactory(ProtocolMapper.class, mapping.getProtocolMapper()); if (mapper == null || !(mapper instanceof OIDCIDTokenMapper)) continue; token = ((OIDCIDTokenMapper)mapper).transformIDToken(token, mapping, session, userSession, clientSession); - - } }