Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Stian Thorgersen
|
dd74ec97f5 | ||
|
Stian Thorgersen
|
76ccc9ea63 |
No files matched your search
@@ -1,20 +0,0 @@
|
|||||||
* text=auto
|
|
||||||
|
|
||||||
*.html text eol=lf
|
|
||||||
*.java text eol=lf
|
|
||||||
*.js text eol=lf
|
|
||||||
*.json text eol=lf
|
|
||||||
*.jsp text eol=lf
|
|
||||||
*.md text eol=lf
|
|
||||||
*.properties text eol=lf
|
|
||||||
*.svg text auto
|
|
||||||
*.xml text eol=lf
|
|
||||||
*.xsl text eol=lf
|
|
||||||
|
|
||||||
*.png binary
|
|
||||||
*.jpg binary
|
|
||||||
*.gif binary
|
|
||||||
*.ttf binary
|
|
||||||
*.eot binary
|
|
||||||
*.otf binary
|
|
||||||
*.woff binary
|
|
||||||
+2
-13
@@ -1,19 +1,8 @@
|
|||||||
language: java
|
language: java
|
||||||
|
|
||||||
jdk:
|
|
||||||
- oraclejdk8
|
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- $HOME/.m2
|
- $HOME/.m2
|
||||||
|
|
||||||
before_cache:
|
|
||||||
- rm -rf $HOME/.m2/repository/org/keycloak
|
|
||||||
|
|
||||||
install: mvn install -Pdistribution -DskipTests=true -B -V
|
|
||||||
|
|
||||||
script:
|
|
||||||
- mvn test -B
|
|
||||||
- mvn -file testsuite/integration-arquillian test -B
|
|
||||||
|
|
||||||
sudo: false
|
sudo: false
|
||||||
|
|
||||||
|
after_script: 'misc/.travis/after.sh'
|
||||||
+50
-50
@@ -1,50 +1,50 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>keycloak-broker-core</artifactId>
|
<artifactId>keycloak-broker-core</artifactId>
|
||||||
<name>Keycloak Broker Core</name>
|
<name>Keycloak Broker Core</name>
|
||||||
<description/>
|
<description/>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-core</artifactId>
|
<artifactId>keycloak-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-model-api</artifactId>
|
<artifactId>keycloak-model-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-events-api</artifactId>
|
<artifactId>keycloak-events-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jboss.resteasy</groupId>
|
<groupId>org.jboss.resteasy</groupId>
|
||||||
<artifactId>resteasy-jaxrs</artifactId>
|
<artifactId>resteasy-jaxrs</artifactId>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>log4j</groupId>
|
<groupId>log4j</groupId>
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-simple</artifactId>
|
<artifactId>slf4j-simple</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -58,11 +58,6 @@ public abstract class AbstractIdentityProvider<C extends IdentityProviderModel>
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Response performLogin(AuthenticationRequest request) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Response keycloakInitiatedBrowserLogout(UserSessionModel userSession, UriInfo uriInfo, RealmModel realm) {
|
public Response keycloakInitiatedBrowserLogout(UserSessionModel userSession, UriInfo uriInfo, RealmModel realm) {
|
||||||
return null;
|
return null;
|
||||||
@@ -78,11 +73,6 @@ public abstract class AbstractIdentityProvider<C extends IdentityProviderModel>
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void preprocessFederatedIdentity(KeycloakSession session, RealmModel realm, BrokeredIdentityContext context) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, BrokeredIdentityContext context) {
|
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, BrokeredIdentityContext context) {
|
||||||
|
|
||||||
|
|||||||
-2
@@ -18,10 +18,8 @@
|
|||||||
package org.keycloak.broker.provider;
|
package org.keycloak.broker.provider;
|
||||||
|
|
||||||
import org.keycloak.Config;
|
import org.keycloak.Config;
|
||||||
import org.keycloak.models.IdentityProviderModel;
|
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.KeycloakSessionFactory;
|
import org.keycloak.models.KeycloakSessionFactory;
|
||||||
import org.keycloak.models.RealmModel;
|
|
||||||
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|||||||
+31
-38
@@ -1,38 +1,31 @@
|
|||||||
package org.keycloak.broker.provider;
|
package org.keycloak.broker.provider;
|
||||||
|
|
||||||
import org.keycloak.broker.provider.IdentityProviderMapper;
|
import org.keycloak.broker.provider.IdentityProviderMapper;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSessionFactory;
|
||||||
import org.keycloak.models.KeycloakSessionFactory;
|
|
||||||
import org.keycloak.models.RealmModel;
|
/**
|
||||||
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
/**
|
* @version $Revision: 1 $
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
*/
|
||||||
* @version $Revision: 1 $
|
public abstract class AbstractIdentityProviderMapper implements IdentityProviderMapper {
|
||||||
*/
|
@Override
|
||||||
public abstract class AbstractIdentityProviderMapper implements IdentityProviderMapper {
|
public void close() {
|
||||||
@Override
|
|
||||||
public void close() {
|
}
|
||||||
|
|
||||||
}
|
@Override
|
||||||
|
public IdentityProviderMapper create(KeycloakSession session) {
|
||||||
@Override
|
return null;
|
||||||
public IdentityProviderMapper create(KeycloakSession session) {
|
}
|
||||||
return null;
|
|
||||||
}
|
@Override
|
||||||
|
public void init(org.keycloak.Config.Scope config) {
|
||||||
@Override
|
|
||||||
public void init(org.keycloak.Config.Scope config) {
|
}
|
||||||
|
|
||||||
}
|
@Override
|
||||||
|
public void postInit(KeycloakSessionFactory factory) {
|
||||||
@Override
|
|
||||||
public void postInit(KeycloakSessionFactory factory) {
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void preprocessFederatedIdentity(KeycloakSession session, RealmModel realm, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -17,7 +17,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.keycloak.broker.provider;
|
package org.keycloak.broker.provider;
|
||||||
|
|
||||||
import org.keycloak.models.ClientSessionModel;
|
|
||||||
import org.keycloak.models.IdentityProviderModel;
|
import org.keycloak.models.IdentityProviderModel;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@@ -33,7 +32,6 @@ public class BrokeredIdentityContext {
|
|||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
private String username;
|
private String username;
|
||||||
private String modelUsername;
|
|
||||||
private String email;
|
private String email;
|
||||||
private String firstName;
|
private String firstName;
|
||||||
private String lastName;
|
private String lastName;
|
||||||
@@ -44,7 +42,6 @@ public class BrokeredIdentityContext {
|
|||||||
private IdentityProviderModel idpConfig;
|
private IdentityProviderModel idpConfig;
|
||||||
private IdentityProvider idp;
|
private IdentityProvider idp;
|
||||||
private Map<String, Object> contextData = new HashMap<>();
|
private Map<String, Object> contextData = new HashMap<>();
|
||||||
private ClientSessionModel clientSession;
|
|
||||||
|
|
||||||
public BrokeredIdentityContext(String id) {
|
public BrokeredIdentityContext(String id) {
|
||||||
if (id == null) {
|
if (id == null) {
|
||||||
@@ -62,11 +59,6 @@ public class BrokeredIdentityContext {
|
|||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Username in remote idp
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public String getUsername() {
|
public String getUsername() {
|
||||||
return username;
|
return username;
|
||||||
}
|
}
|
||||||
@@ -75,19 +67,6 @@ public class BrokeredIdentityContext {
|
|||||||
this.username = username;
|
this.username = username;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* username to store in UserModel
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public String getModelUsername() {
|
|
||||||
return modelUsername;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setModelUsername(String modelUsername) {
|
|
||||||
this.modelUsername = modelUsername;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getEmail() {
|
public String getEmail() {
|
||||||
return email;
|
return email;
|
||||||
}
|
}
|
||||||
@@ -168,14 +147,6 @@ public class BrokeredIdentityContext {
|
|||||||
this.lastName = lastName;
|
this.lastName = lastName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ClientSessionModel getClientSession() {
|
|
||||||
return clientSession;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setClientSession(ClientSessionModel clientSession) {
|
|
||||||
this.clientSession = clientSession;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setName(String name) {
|
public void setName(String name) {
|
||||||
if (name != null) {
|
if (name != null) {
|
||||||
int i = name.lastIndexOf(' ');
|
int i = name.lastIndexOf(' ');
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
package org.keycloak.broker.provider;
|
|
||||||
|
|
||||||
import org.keycloak.models.ClientModel;
|
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.models.RealmModel;
|
|
||||||
import org.keycloak.models.RoleModel;
|
|
||||||
import org.keycloak.models.UserModel;
|
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
|
||||||
* @version $Revision: 1 $
|
|
||||||
*/
|
|
||||||
public class HardcodedAttributeMapper extends AbstractIdentityProviderMapper {
|
|
||||||
public static final String ATTRIBUTE = "attribute";
|
|
||||||
public static final String ATTRIBUTE_VALUE = "attribute.value";
|
|
||||||
protected static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
|
||||||
|
|
||||||
static {
|
|
||||||
ProviderConfigProperty property;
|
|
||||||
property = new ProviderConfigProperty();
|
|
||||||
property.setName(ATTRIBUTE);
|
|
||||||
property.setLabel("User Attribute");
|
|
||||||
property.setHelpText("Name of user attribute you want to hardcode");
|
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
|
||||||
configProperties.add(property);
|
|
||||||
property = new ProviderConfigProperty();
|
|
||||||
property.setName(ATTRIBUTE_VALUE);
|
|
||||||
property.setLabel("User Attribute Value");
|
|
||||||
property.setHelpText("Value you want to hardcode");
|
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
|
||||||
configProperties.add(property);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
|
||||||
return configProperties;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayCategory() {
|
|
||||||
return "Attribute Importer";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayType() {
|
|
||||||
return "Hardcoded Attribute";
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final String[] COMPATIBLE_PROVIDERS = {ANY_PROVIDER};
|
|
||||||
|
|
||||||
|
|
||||||
public static final String PROVIDER_ID = "hardcoded-attribute-idp-mapper";
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getId() {
|
|
||||||
return PROVIDER_ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String[] getCompatibleProviders() {
|
|
||||||
return COMPATIBLE_PROVIDERS;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
String attribute = mapperModel.getConfig().get(ATTRIBUTE);
|
|
||||||
String attributeValue = mapperModel.getConfig().get(ATTRIBUTE_VALUE);
|
|
||||||
user.setSingleAttribute(attribute, attributeValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
String attribute = mapperModel.getConfig().get(ATTRIBUTE);
|
|
||||||
String attributeValue = mapperModel.getConfig().get(ATTRIBUTE_VALUE);
|
|
||||||
user.setSingleAttribute(attribute, attributeValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getHelpText() {
|
|
||||||
return "When user is imported from provider, hardcode a value to a specific user attribute.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,110 +1,110 @@
|
|||||||
package org.keycloak.broker.provider;
|
package org.keycloak.broker.provider;
|
||||||
|
|
||||||
import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
|
import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
||||||
import org.keycloak.broker.provider.IdentityBrokerException;
|
import org.keycloak.broker.provider.IdentityBrokerException;
|
||||||
import org.keycloak.models.ClientModel;
|
import org.keycloak.models.ClientModel;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
import org.keycloak.models.IdentityProviderMapperModel;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.RealmModel;
|
||||||
import org.keycloak.models.RoleModel;
|
import org.keycloak.models.RoleModel;
|
||||||
import org.keycloak.models.UserModel;
|
import org.keycloak.models.UserModel;
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
import org.keycloak.provider.ProviderConfigProperty;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public class HardcodedRoleMapper extends AbstractIdentityProviderMapper {
|
public class HardcodedRoleMapper extends AbstractIdentityProviderMapper {
|
||||||
public static final String ROLE = "role";
|
public static final String ROLE = "role";
|
||||||
protected static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
protected static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
ProviderConfigProperty property;
|
ProviderConfigProperty property;
|
||||||
property = new ProviderConfigProperty();
|
property = new ProviderConfigProperty();
|
||||||
property.setName(ROLE);
|
property.setName(ROLE);
|
||||||
property.setLabel("Role");
|
property.setLabel("Role");
|
||||||
property.setHelpText("Role to grant to user. Click 'Select Role' button to browse roles, or just type it in the textbox. To reference an application role the syntax is appname.approle, i.e. myapp.myrole");
|
property.setHelpText("Role to grant to user. To reference an application role the syntax is appname.approle, i.e. myapp.myrole");
|
||||||
property.setType(ProviderConfigProperty.ROLE_TYPE);
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
configProperties.add(property);
|
configProperties.add(property);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static String[] parseRole(String role) {
|
public static String[] parseRole(String role) {
|
||||||
int scopeIndex = role.lastIndexOf('.');
|
int scopeIndex = role.indexOf('.');
|
||||||
if (scopeIndex > -1) {
|
if (scopeIndex > -1) {
|
||||||
String appName = role.substring(0, scopeIndex);
|
String appName = role.substring(0, scopeIndex);
|
||||||
role = role.substring(scopeIndex + 1);
|
role = role.substring(scopeIndex + 1);
|
||||||
String[] rtn = {appName, role};
|
String[] rtn = {appName, role};
|
||||||
return rtn;
|
return rtn;
|
||||||
} else {
|
} else {
|
||||||
String[] rtn = {null, role};
|
String[] rtn = {null, role};
|
||||||
return rtn;
|
return rtn;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static RoleModel getRoleFromString(RealmModel realm, String roleName) {
|
public static RoleModel getRoleFromString(RealmModel realm, String roleName) {
|
||||||
String[] parsedRole = parseRole(roleName);
|
String[] parsedRole = parseRole(roleName);
|
||||||
RoleModel role = null;
|
RoleModel role = null;
|
||||||
if (parsedRole[0] == null) {
|
if (parsedRole[0] == null) {
|
||||||
role = realm.getRole(parsedRole[1]);
|
role = realm.getRole(parsedRole[1]);
|
||||||
} else {
|
} else {
|
||||||
ClientModel client = realm.getClientByClientId(parsedRole[0]);
|
ClientModel client = realm.getClientByClientId(parsedRole[0]);
|
||||||
role = client.getRole(parsedRole[1]);
|
role = client.getRole(parsedRole[1]);
|
||||||
}
|
}
|
||||||
return role;
|
return role;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
public List<ProviderConfigProperty> getConfigProperties() {
|
||||||
return configProperties;
|
return configProperties;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getDisplayCategory() {
|
public String getDisplayCategory() {
|
||||||
return "Role Importer";
|
return "Role Importer";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getDisplayType() {
|
public String getDisplayType() {
|
||||||
return "Hardcoded Role";
|
return "Hardcoded Role";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String[] COMPATIBLE_PROVIDERS = {ANY_PROVIDER};
|
public static final String[] COMPATIBLE_PROVIDERS = {ANY_PROVIDER};
|
||||||
|
|
||||||
|
|
||||||
public static final String PROVIDER_ID = "oidc-hardcoded-role-idp-mapper";
|
public static final String PROVIDER_ID = "oidc-hardcoded-role-idp-mapper";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return PROVIDER_ID;
|
return PROVIDER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getCompatibleProviders() {
|
public String[] getCompatibleProviders() {
|
||||||
return COMPATIBLE_PROVIDERS;
|
return COMPATIBLE_PROVIDERS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
String roleName = mapperModel.getConfig().get(ROLE);
|
String roleName = mapperModel.getConfig().get(ROLE);
|
||||||
RoleModel role = getRoleFromString(realm, roleName);
|
RoleModel role = getRoleFromString(realm, roleName);
|
||||||
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
||||||
user.grantRole(role);
|
user.grantRole(role);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getHelpText() {
|
public String getHelpText() {
|
||||||
return "When user is imported from provider, hardcode a role mapping for it.";
|
return "When user is imported from provider, hardcode a role mapping for it.";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-87
@@ -1,87 +0,0 @@
|
|||||||
package org.keycloak.broker.provider;
|
|
||||||
|
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.models.RealmModel;
|
|
||||||
import org.keycloak.models.UserModel;
|
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
|
||||||
* @version $Revision: 1 $
|
|
||||||
*/
|
|
||||||
public class HardcodedUserSessionAttributeMapper extends AbstractIdentityProviderMapper {
|
|
||||||
public static final String ATTRIBUTE = "attribute";
|
|
||||||
public static final String ATTRIBUTE_VALUE = "attribute.value";
|
|
||||||
protected static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
|
||||||
|
|
||||||
static {
|
|
||||||
ProviderConfigProperty property;
|
|
||||||
property = new ProviderConfigProperty();
|
|
||||||
property.setName(ATTRIBUTE);
|
|
||||||
property.setLabel("User Session Attribute");
|
|
||||||
property.setHelpText("Name of user session attribute you want to hardcode");
|
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
|
||||||
configProperties.add(property);
|
|
||||||
property = new ProviderConfigProperty();
|
|
||||||
property.setName(ATTRIBUTE_VALUE);
|
|
||||||
property.setLabel("User Session Attribute Value");
|
|
||||||
property.setHelpText("Value you want to hardcode");
|
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
|
||||||
configProperties.add(property);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
|
||||||
return configProperties;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayCategory() {
|
|
||||||
return "Attribute Importer";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayType() {
|
|
||||||
return "Hardcoded User Session Attribute";
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final String[] COMPATIBLE_PROVIDERS = {ANY_PROVIDER};
|
|
||||||
|
|
||||||
|
|
||||||
public static final String PROVIDER_ID = "hardcoded-user-session-attribute-idp-mapper";
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getId() {
|
|
||||||
return PROVIDER_ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String[] getCompatibleProviders() {
|
|
||||||
return COMPATIBLE_PROVIDERS;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
String attribute = mapperModel.getConfig().get(ATTRIBUTE);
|
|
||||||
String attributeValue = mapperModel.getConfig().get(ATTRIBUTE_VALUE);
|
|
||||||
context.getClientSession().setUserSessionNote(attribute, attributeValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
String attribute = mapperModel.getConfig().get(ATTRIBUTE);
|
|
||||||
String attributeValue = mapperModel.getConfig().get(ATTRIBUTE_VALUE);
|
|
||||||
context.getClientSession().setUserSessionNote(attribute, attributeValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getHelpText() {
|
|
||||||
return "When user is imported from provider, hardcode a value to a specific user session attribute.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -20,7 +20,6 @@ package org.keycloak.broker.provider;
|
|||||||
import org.keycloak.events.EventBuilder;
|
import org.keycloak.events.EventBuilder;
|
||||||
import org.keycloak.models.ClientSessionModel;
|
import org.keycloak.models.ClientSessionModel;
|
||||||
import org.keycloak.models.FederatedIdentityModel;
|
import org.keycloak.models.FederatedIdentityModel;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
|
||||||
import org.keycloak.models.IdentityProviderModel;
|
import org.keycloak.models.IdentityProviderModel;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.RealmModel;
|
||||||
@@ -36,7 +35,7 @@ import javax.ws.rs.core.UriInfo;
|
|||||||
*/
|
*/
|
||||||
public interface IdentityProvider<C extends IdentityProviderModel> extends Provider {
|
public interface IdentityProvider<C extends IdentityProviderModel> extends Provider {
|
||||||
|
|
||||||
interface AuthenticationCallback {
|
public interface AuthenticationCallback {
|
||||||
/**
|
/**
|
||||||
* This method should be called by provider after the JAXRS callback endpoint has finished authentication
|
* This method should be called by provider after the JAXRS callback endpoint has finished authentication
|
||||||
* with the remote IDP
|
* with the remote IDP
|
||||||
@@ -44,15 +43,9 @@ public interface IdentityProvider<C extends IdentityProviderModel> extends Provi
|
|||||||
* @param context
|
* @param context
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Response authenticated(BrokeredIdentityContext context);
|
public Response authenticated(BrokeredIdentityContext context);
|
||||||
|
|
||||||
Response cancelled(String code);
|
|
||||||
|
|
||||||
Response error(String code, String message);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void preprocessFederatedIdentity(KeycloakSession session, RealmModel realm, BrokeredIdentityContext context);
|
|
||||||
void attachUserSession(UserSessionModel userSession, ClientSessionModel clientSession, BrokeredIdentityContext context);
|
void attachUserSession(UserSessionModel userSession, ClientSessionModel clientSession, BrokeredIdentityContext context);
|
||||||
void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, BrokeredIdentityContext context);
|
void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, BrokeredIdentityContext context);
|
||||||
void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, BrokeredIdentityContext context);
|
void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, BrokeredIdentityContext context);
|
||||||
|
|||||||
Executable → Regular
-2
@@ -18,8 +18,6 @@
|
|||||||
package org.keycloak.broker.provider;
|
package org.keycloak.broker.provider;
|
||||||
|
|
||||||
import org.keycloak.models.IdentityProviderModel;
|
import org.keycloak.models.IdentityProviderModel;
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.models.RealmModel;
|
|
||||||
import org.keycloak.provider.ProviderFactory;
|
import org.keycloak.provider.ProviderFactory;
|
||||||
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
|||||||
+26
-56
@@ -1,56 +1,26 @@
|
|||||||
package org.keycloak.broker.provider;
|
package org.keycloak.broker.provider;
|
||||||
|
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
import org.keycloak.models.IdentityProviderMapperModel;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.RealmModel;
|
||||||
import org.keycloak.models.UserModel;
|
import org.keycloak.models.UserModel;
|
||||||
import org.keycloak.provider.ConfiguredProvider;
|
import org.keycloak.provider.ConfiguredProvider;
|
||||||
import org.keycloak.provider.Provider;
|
import org.keycloak.provider.Provider;
|
||||||
import org.keycloak.provider.ProviderFactory;
|
import org.keycloak.provider.ProviderFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public interface IdentityProviderMapper extends Provider, ProviderFactory<IdentityProviderMapper>,ConfiguredProvider {
|
public interface IdentityProviderMapper extends Provider, ProviderFactory<IdentityProviderMapper>,ConfiguredProvider {
|
||||||
public static final String ANY_PROVIDER = "*";
|
public static final String ANY_PROVIDER = "*";
|
||||||
|
|
||||||
String[] getCompatibleProviders();
|
String[] getCompatibleProviders();
|
||||||
String getDisplayCategory();
|
String getDisplayCategory();
|
||||||
String getDisplayType();
|
String getDisplayType();
|
||||||
|
|
||||||
/**
|
void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context);
|
||||||
* Called to determine what keycloak username and email to use to process the login request from the external IDP
|
void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context);
|
||||||
* Usually used to map BrokeredIdentityContet.username or email.
|
|
||||||
*
|
|
||||||
* @param session
|
}
|
||||||
* @param realm
|
|
||||||
* @param mapperModel
|
|
||||||
* @param context
|
|
||||||
*/
|
|
||||||
void preprocessFederatedIdentity(KeycloakSession session, RealmModel realm, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called after UserModel is created for first time for this user.
|
|
||||||
*
|
|
||||||
* @param session
|
|
||||||
* @param realm
|
|
||||||
* @param user
|
|
||||||
* @param mapperModel
|
|
||||||
* @param context
|
|
||||||
*/
|
|
||||||
void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called when this user has logged in before and has already been imported.
|
|
||||||
*
|
|
||||||
* @param session
|
|
||||||
* @param realm
|
|
||||||
* @param user
|
|
||||||
* @param mapperModel
|
|
||||||
* @param context
|
|
||||||
*/
|
|
||||||
void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -9,11 +9,6 @@ import org.keycloak.provider.Spi;
|
|||||||
*/
|
*/
|
||||||
public class IdentityProviderMapperSpi implements Spi {
|
public class IdentityProviderMapperSpi implements Spi {
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInternal() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return "identity-provider-mapper";
|
return "identity-provider-mapper";
|
||||||
|
|||||||
@@ -28,11 +28,6 @@ public class IdentityProviderSpi implements Spi {
|
|||||||
|
|
||||||
public static final String IDENTITY_PROVIDER_SPI_NAME = "identity_provider";
|
public static final String IDENTITY_PROVIDER_SPI_NAME = "identity_provider";
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInternal() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return IDENTITY_PROVIDER_SPI_NAME;
|
return IDENTITY_PROVIDER_SPI_NAME;
|
||||||
|
|||||||
+1
-3
@@ -1,3 +1 @@
|
|||||||
org.keycloak.broker.provider.HardcodedRoleMapper
|
org.keycloak.broker.provider.HardcodedRoleMapper
|
||||||
org.keycloak.broker.provider.HardcodedAttributeMapper
|
|
||||||
org.keycloak.broker.provider.HardcodedUserSessionAttributeMapper
|
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
org.keycloak.broker.provider.IdentityProviderSpi
|
org.keycloak.broker.provider.IdentityProviderSpi
|
||||||
org.keycloak.broker.provider.IdentityProviderMapperSpi
|
org.keycloak.broker.provider.IdentityProviderMapperSpi
|
||||||
+58
-58
@@ -1,58 +1,58 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>keycloak-broker-oidc</artifactId>
|
<artifactId>keycloak-broker-oidc</artifactId>
|
||||||
<name>Keycloak Broker - OpenID Connect Identity Provider</name>
|
<name>Keycloak Broker - OpenID Connect Identity Provider</name>
|
||||||
<description/>
|
<description/>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-core</artifactId>
|
<artifactId>keycloak-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-broker-core</artifactId>
|
<artifactId>keycloak-broker-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.jackson</groupId>
|
<groupId>org.codehaus.jackson</groupId>
|
||||||
<artifactId>jackson-core-asl</artifactId>
|
<artifactId>jackson-core-asl</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.jackson</groupId>
|
<groupId>org.codehaus.jackson</groupId>
|
||||||
<artifactId>jackson-mapper-asl</artifactId>
|
<artifactId>jackson-mapper-asl</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-events-api</artifactId>
|
<artifactId>keycloak-events-api</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-services</artifactId>
|
<artifactId>keycloak-services</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jboss.logging</groupId>
|
<groupId>org.jboss.logging</groupId>
|
||||||
<artifactId>jboss-logging</artifactId>
|
<artifactId>jboss-logging</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
+4
-7
@@ -20,7 +20,7 @@ package org.keycloak.broker.oidc;
|
|||||||
import org.codehaus.jackson.JsonNode;
|
import org.codehaus.jackson.JsonNode;
|
||||||
import org.codehaus.jackson.map.ObjectMapper;
|
import org.codehaus.jackson.map.ObjectMapper;
|
||||||
import org.jboss.logging.Logger;
|
import org.jboss.logging.Logger;
|
||||||
import org.keycloak.common.ClientConnection;
|
import org.keycloak.ClientConnection;
|
||||||
import org.keycloak.OAuth2Constants;
|
import org.keycloak.OAuth2Constants;
|
||||||
import org.keycloak.broker.provider.util.SimpleHttp;
|
import org.keycloak.broker.provider.util.SimpleHttp;
|
||||||
import org.keycloak.broker.provider.AbstractIdentityProvider;
|
import org.keycloak.broker.provider.AbstractIdentityProvider;
|
||||||
@@ -58,7 +58,6 @@ public abstract class AbstractOAuth2IdentityProvider<C extends OAuth2IdentityPro
|
|||||||
public static final String FEDERATED_ACCESS_TOKEN = "FEDERATED_ACCESS_TOKEN";
|
public static final String FEDERATED_ACCESS_TOKEN = "FEDERATED_ACCESS_TOKEN";
|
||||||
public static final String FEDERATED_REFRESH_TOKEN = "FEDERATED_REFRESH_TOKEN";
|
public static final String FEDERATED_REFRESH_TOKEN = "FEDERATED_REFRESH_TOKEN";
|
||||||
public static final String FEDERATED_TOKEN_EXPIRATION = "FEDERATED_TOKEN_EXPIRATION";
|
public static final String FEDERATED_TOKEN_EXPIRATION = "FEDERATED_TOKEN_EXPIRATION";
|
||||||
public static final String ACCESS_DENIED = "access_denied";
|
|
||||||
protected static ObjectMapper mapper = new ObjectMapper();
|
protected static ObjectMapper mapper = new ObjectMapper();
|
||||||
|
|
||||||
public static final String OAUTH2_PARAMETER_ACCESS_TOKEN = "access_token";
|
public static final String OAUTH2_PARAMETER_ACCESS_TOKEN = "access_token";
|
||||||
@@ -214,11 +213,9 @@ public abstract class AbstractOAuth2IdentityProvider<C extends OAuth2IdentityPro
|
|||||||
@QueryParam(OAuth2Constants.ERROR) String error) {
|
@QueryParam(OAuth2Constants.ERROR) String error) {
|
||||||
if (error != null) {
|
if (error != null) {
|
||||||
//logger.error("Failed " + getConfig().getAlias() + " broker login: " + error);
|
//logger.error("Failed " + getConfig().getAlias() + " broker login: " + error);
|
||||||
if (error.equals(ACCESS_DENIED)) {
|
event.event(EventType.LOGIN);
|
||||||
return callback.cancelled(state);
|
event.error(error);
|
||||||
} else {
|
return ErrorPage.error(session, Messages.IDENTITY_PROVIDER_UNEXPECTED_ERROR);
|
||||||
return callback.error(state, Messages.IDENTITY_PROVIDER_UNEXPECTED_ERROR);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
+114
-114
@@ -1,114 +1,114 @@
|
|||||||
package org.keycloak.broker.oidc;
|
package org.keycloak.broker.oidc;
|
||||||
|
|
||||||
import org.keycloak.broker.provider.util.SimpleHttp;
|
import org.keycloak.broker.provider.util.SimpleHttp;
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
||||||
import org.keycloak.constants.AdapterConstants;
|
import org.keycloak.constants.AdapterConstants;
|
||||||
import org.keycloak.events.EventBuilder;
|
import org.keycloak.events.EventBuilder;
|
||||||
import org.keycloak.jose.jws.JWSInput;
|
import org.keycloak.jose.jws.JWSInput;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.RealmModel;
|
||||||
import org.keycloak.models.UserSessionModel;
|
import org.keycloak.models.UserSessionModel;
|
||||||
import org.keycloak.representations.AccessTokenResponse;
|
import org.keycloak.representations.AccessTokenResponse;
|
||||||
import org.keycloak.representations.JsonWebToken;
|
import org.keycloak.representations.JsonWebToken;
|
||||||
import org.keycloak.representations.adapters.action.AdminAction;
|
import org.keycloak.representations.adapters.action.AdminAction;
|
||||||
import org.keycloak.representations.adapters.action.LogoutAction;
|
import org.keycloak.representations.adapters.action.LogoutAction;
|
||||||
import org.keycloak.services.managers.AuthenticationManager;
|
import org.keycloak.services.managers.AuthenticationManager;
|
||||||
import org.keycloak.util.JsonSerialization;
|
import org.keycloak.util.JsonSerialization;
|
||||||
|
|
||||||
import javax.ws.rs.POST;
|
import javax.ws.rs.POST;
|
||||||
import javax.ws.rs.Path;
|
import javax.ws.rs.Path;
|
||||||
import javax.ws.rs.core.Response;
|
import javax.ws.rs.core.Response;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.security.PublicKey;
|
import java.security.PublicKey;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public class KeycloakOIDCIdentityProvider extends OIDCIdentityProvider {
|
public class KeycloakOIDCIdentityProvider extends OIDCIdentityProvider {
|
||||||
|
|
||||||
public static final String VALIDATED_ACCESS_TOKEN = "VALIDATED_ACCESS_TOKEN";
|
public static final String VALIDATED_ACCESS_TOKEN = "VALIDATED_ACCESS_TOKEN";
|
||||||
|
|
||||||
public KeycloakOIDCIdentityProvider(OIDCIdentityProviderConfig config) {
|
public KeycloakOIDCIdentityProvider(OIDCIdentityProviderConfig config) {
|
||||||
super(config);
|
super(config);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object callback(RealmModel realm, AuthenticationCallback callback, EventBuilder event) {
|
public Object callback(RealmModel realm, AuthenticationCallback callback, EventBuilder event) {
|
||||||
return new KeycloakEndpoint(callback, realm, event);
|
return new KeycloakEndpoint(callback, realm, event);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void processAccessTokenResponse(BrokeredIdentityContext context, PublicKey idpKey, AccessTokenResponse response) {
|
protected void processAccessTokenResponse(BrokeredIdentityContext context, PublicKey idpKey, AccessTokenResponse response) {
|
||||||
JsonWebToken access = validateToken(idpKey, response.getToken());
|
JsonWebToken access = validateToken(idpKey, response.getToken());
|
||||||
context.getContextData().put(VALIDATED_ACCESS_TOKEN, access);
|
context.getContextData().put(VALIDATED_ACCESS_TOKEN, access);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected class KeycloakEndpoint extends OIDCEndpoint {
|
protected class KeycloakEndpoint extends OIDCEndpoint {
|
||||||
public KeycloakEndpoint(AuthenticationCallback callback, RealmModel realm, EventBuilder event) {
|
public KeycloakEndpoint(AuthenticationCallback callback, RealmModel realm, EventBuilder event) {
|
||||||
super(callback, realm, event);
|
super(callback, realm, event);
|
||||||
}
|
}
|
||||||
|
|
||||||
@POST
|
@POST
|
||||||
@Path(AdapterConstants.K_LOGOUT)
|
@Path(AdapterConstants.K_LOGOUT)
|
||||||
public Response backchannelLogout(String input) {
|
public Response backchannelLogout(String input) {
|
||||||
JWSInput token = new JWSInput(input);
|
JWSInput token = new JWSInput(input);
|
||||||
PublicKey key = getExternalIdpKey();
|
PublicKey key = getExternalIdpKey();
|
||||||
if (key != null) {
|
if (key != null) {
|
||||||
if (!verify(token, key)) {
|
if (!verify(token, key)) {
|
||||||
logger.warn("Failed to verify logout request");
|
logger.warn("Failed to verify logout request");
|
||||||
return Response.status(400).build();
|
return Response.status(400).build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
LogoutAction action = null;
|
LogoutAction action = null;
|
||||||
try {
|
try {
|
||||||
action = JsonSerialization.readValue(token.getContent(), LogoutAction.class);
|
action = JsonSerialization.readValue(token.getContent(), LogoutAction.class);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
if (!validateAction(action)) return Response.status(400).build();
|
if (!validateAction(action)) return Response.status(400).build();
|
||||||
if (action.getKeycloakSessionIds() != null) {
|
if (action.getKeycloakSessionIds() != null) {
|
||||||
for (String sessionId : action.getKeycloakSessionIds()) {
|
for (String sessionId : action.getKeycloakSessionIds()) {
|
||||||
String brokerSessionId = getConfig().getAlias() + "." + sessionId;
|
String brokerSessionId = getConfig().getAlias() + "." + sessionId;
|
||||||
UserSessionModel userSession = session.sessions().getUserSessionByBrokerSessionId(realm, brokerSessionId);
|
UserSessionModel userSession = session.sessions().getUserSessionByBrokerSessionId(realm, brokerSessionId);
|
||||||
if (userSession != null
|
if (userSession != null
|
||||||
&& userSession.getState() != UserSessionModel.State.LOGGING_OUT
|
&& userSession.getState() != UserSessionModel.State.LOGGING_OUT
|
||||||
&& userSession.getState() != UserSessionModel.State.LOGGED_OUT
|
&& userSession.getState() != UserSessionModel.State.LOGGED_OUT
|
||||||
) {
|
) {
|
||||||
AuthenticationManager.backchannelLogout(session, realm, userSession, uriInfo, clientConnection, headers, false);
|
AuthenticationManager.backchannelLogout(session, realm, userSession, uriInfo, clientConnection, headers, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return Response.ok().build();
|
return Response.ok().build();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected boolean validateAction(AdminAction action) {
|
protected boolean validateAction(AdminAction action) {
|
||||||
if (!action.validate()) {
|
if (!action.validate()) {
|
||||||
logger.warn("admin request failed, not validated" + action.getAction());
|
logger.warn("admin request failed, not validated" + action.getAction());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (action.isExpired()) {
|
if (action.isExpired()) {
|
||||||
logger.warn("admin request failed, expired token");
|
logger.warn("admin request failed, expired token");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (!getConfig().getClientId().equals(action.getResource())) {
|
if (!getConfig().getClientId().equals(action.getResource())) {
|
||||||
logger.warn("Resource name does not match");
|
logger.warn("Resource name does not match");
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SimpleHttp generateTokenRequest(String authorizationCode) {
|
public SimpleHttp generateTokenRequest(String authorizationCode) {
|
||||||
return super.generateTokenRequest(authorizationCode)
|
return super.generateTokenRequest(authorizationCode)
|
||||||
.param(AdapterConstants.CLIENT_SESSION_STATE, "n/a"); // hack to get backchannel logout to work
|
.param(AdapterConstants.CLIENT_SESSION_STATE, "n/a"); // hack to get backchannel logout to work
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
+1
-7
@@ -17,15 +17,10 @@
|
|||||||
*/
|
*/
|
||||||
package org.keycloak.broker.oidc;
|
package org.keycloak.broker.oidc;
|
||||||
|
|
||||||
import org.keycloak.broker.oidc.mappers.UsernameTemplateMapper;
|
|
||||||
import org.keycloak.broker.provider.AbstractIdentityProviderFactory;
|
import org.keycloak.broker.provider.AbstractIdentityProviderFactory;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
|
||||||
import org.keycloak.models.IdentityProviderModel;
|
import org.keycloak.models.IdentityProviderModel;
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.models.RealmModel;
|
|
||||||
|
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -55,5 +50,4 @@ public class KeycloakOIDCIdentityProviderFactory extends AbstractIdentityProvide
|
|||||||
return OIDCIdentityProviderFactory.parseOIDCConfig(inputStream);
|
return OIDCIdentityProviderFactory.parseOIDCConfig(inputStream);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
@@ -19,7 +19,6 @@ package org.keycloak.broker.oidc;
|
|||||||
|
|
||||||
import org.codehaus.jackson.JsonNode;
|
import org.codehaus.jackson.JsonNode;
|
||||||
import org.jboss.logging.Logger;
|
import org.jboss.logging.Logger;
|
||||||
import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper;
|
|
||||||
import org.keycloak.broker.oidc.util.JsonSimpleHttp;
|
import org.keycloak.broker.oidc.util.JsonSimpleHttp;
|
||||||
import org.keycloak.broker.provider.util.SimpleHttp;
|
import org.keycloak.broker.provider.util.SimpleHttp;
|
||||||
import org.keycloak.broker.provider.AuthenticationRequest;
|
import org.keycloak.broker.provider.AuthenticationRequest;
|
||||||
@@ -42,7 +41,7 @@ import org.keycloak.services.messages.Messages;
|
|||||||
import org.keycloak.services.resources.IdentityBrokerService;
|
import org.keycloak.services.resources.IdentityBrokerService;
|
||||||
import org.keycloak.services.resources.RealmsResource;
|
import org.keycloak.services.resources.RealmsResource;
|
||||||
import org.keycloak.util.JsonSerialization;
|
import org.keycloak.util.JsonSerialization;
|
||||||
import org.keycloak.common.util.PemUtils;
|
import org.keycloak.util.PemUtils;
|
||||||
|
|
||||||
import javax.ws.rs.GET;
|
import javax.ws.rs.GET;
|
||||||
import javax.ws.rs.Path;
|
import javax.ws.rs.Path;
|
||||||
@@ -51,7 +50,6 @@ import javax.ws.rs.core.Context;
|
|||||||
import javax.ws.rs.core.Response;
|
import javax.ws.rs.core.Response;
|
||||||
import javax.ws.rs.core.UriBuilder;
|
import javax.ws.rs.core.UriBuilder;
|
||||||
import javax.ws.rs.core.UriInfo;
|
import javax.ws.rs.core.UriInfo;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.security.PublicKey;
|
import java.security.PublicKey;
|
||||||
|
|
||||||
@@ -226,7 +224,7 @@ public class OIDCIdentityProvider extends AbstractOAuth2IdentityProvider<OIDCIde
|
|||||||
name = getJsonProperty(userInfo, "name");
|
name = getJsonProperty(userInfo, "name");
|
||||||
preferredUsername = getJsonProperty(userInfo, "preferred_username");
|
preferredUsername = getJsonProperty(userInfo, "preferred_username");
|
||||||
email = getJsonProperty(userInfo, "email");
|
email = getJsonProperty(userInfo, "email");
|
||||||
AbstractJsonUserAttributeMapper.storeUserProfileForMapper(identity, userInfo, getConfig().getAlias());
|
identity.getContextData().put(USER_INFO, userInfo);
|
||||||
}
|
}
|
||||||
identity.getContextData().put(FEDERATED_ACCESS_TOKEN_RESPONSE, tokenResponse);
|
identity.getContextData().put(FEDERATED_ACCESS_TOKEN_RESPONSE, tokenResponse);
|
||||||
identity.getContextData().put(VALIDATED_ID_TOKEN, idToken);
|
identity.getContextData().put(VALIDATED_ID_TOKEN, idToken);
|
||||||
@@ -289,9 +287,10 @@ public class OIDCIdentityProvider extends AbstractOAuth2IdentityProvider<OIDCIde
|
|||||||
}
|
}
|
||||||
JsonWebToken token = jws.readJsonContent(JsonWebToken.class);
|
JsonWebToken token = jws.readJsonContent(JsonWebToken.class);
|
||||||
|
|
||||||
|
String aud = token.getAudience();
|
||||||
String iss = token.getIssuer();
|
String iss = token.getIssuer();
|
||||||
|
|
||||||
if (!token.hasAudience(getConfig().getClientId())) {
|
if (aud != null && !aud.equals(getConfig().getClientId())) {
|
||||||
throw new IdentityBrokerException("Wrong audience from token.");
|
throw new IdentityBrokerException("Wrong audience from token.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,15 +17,11 @@
|
|||||||
*/
|
*/
|
||||||
package org.keycloak.broker.oidc;
|
package org.keycloak.broker.oidc;
|
||||||
|
|
||||||
import org.keycloak.broker.oidc.mappers.UsernameTemplateMapper;
|
|
||||||
import org.keycloak.broker.provider.util.SimpleHttp;
|
import org.keycloak.broker.provider.util.SimpleHttp;
|
||||||
import org.keycloak.broker.provider.AbstractIdentityProviderFactory;
|
import org.keycloak.broker.provider.AbstractIdentityProviderFactory;
|
||||||
import org.keycloak.jose.jwk.JWK;
|
import org.keycloak.jose.jwk.JWK;
|
||||||
import org.keycloak.jose.jwk.JWKParser;
|
import org.keycloak.jose.jwk.JWKParser;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
|
||||||
import org.keycloak.models.IdentityProviderModel;
|
import org.keycloak.models.IdentityProviderModel;
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.models.RealmModel;
|
|
||||||
import org.keycloak.models.utils.KeycloakModelUtils;
|
import org.keycloak.models.utils.KeycloakModelUtils;
|
||||||
import org.keycloak.protocol.oidc.representations.JSONWebKeySet;
|
import org.keycloak.protocol.oidc.representations.JSONWebKeySet;
|
||||||
import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation;
|
import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation;
|
||||||
@@ -34,7 +30,6 @@ import org.keycloak.util.JsonSerialization;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.security.PublicKey;
|
import java.security.PublicKey;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -94,7 +89,7 @@ public class OIDCIdentityProviderFactory extends AbstractIdentityProviderFactory
|
|||||||
|
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new RuntimeException("Failed to query JWKSet from: " + uri, e);
|
throw new RuntimeException("F ailed to query JWKSet from: " + uri, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -104,5 +99,4 @@ public class OIDCIdentityProviderFactory extends AbstractIdentityProviderFactory
|
|||||||
protected static boolean keyTypeSupported(String type) {
|
protected static boolean keyTypeSupported(String type) {
|
||||||
return type != null && type.equals("RSA");
|
return type != null && type.equals("RSA");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+93
-97
@@ -1,97 +1,93 @@
|
|||||||
package org.keycloak.broker.oidc.mappers;
|
package org.keycloak.broker.oidc.mappers;
|
||||||
|
|
||||||
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider;
|
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider;
|
||||||
import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
|
import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
import org.keycloak.models.IdentityProviderMapperModel;
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
import org.keycloak.provider.ProviderConfigProperty;
|
||||||
import org.keycloak.representations.JsonWebToken;
|
import org.keycloak.representations.JsonWebToken;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public abstract class AbstractClaimMapper extends AbstractIdentityProviderMapper {
|
public abstract class AbstractClaimMapper extends AbstractIdentityProviderMapper {
|
||||||
public static final String CLAIM = "claim";
|
public static final String CLAIM = "claim";
|
||||||
public static final String CLAIM_VALUE = "claim.value";
|
public static final String CLAIM_VALUE = "claim.value";
|
||||||
|
|
||||||
public static Object getClaimValue(JsonWebToken token, String claim) {
|
public static Object getClaimValue(JsonWebToken token, String claim) {
|
||||||
String[] split = claim.split("\\.");
|
String[] split = claim.split("\\.");
|
||||||
Map<String, Object> jsonObject = token.getOtherClaims();
|
Map<String, Object> jsonObject = token.getOtherClaims();
|
||||||
for (int i = 0; i < split.length; i++) {
|
for (int i = 0; i < split.length; i++) {
|
||||||
if (i == split.length - 1) {
|
if (i == split.length - 1) {
|
||||||
return jsonObject.get(split[i]);
|
return jsonObject.get(split[i]);
|
||||||
} else {
|
} else {
|
||||||
Object val = jsonObject.get(split[i]);
|
Object val = jsonObject.get(split[i]);
|
||||||
if (!(val instanceof Map)) return null;
|
if (!(val instanceof Map)) return null;
|
||||||
jsonObject = (Map<String, Object>)val;
|
jsonObject = (Map<String, Object>)val;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Object getClaimValue(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
protected Object getClaimValue(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
String claim = mapperModel.getConfig().get(CLAIM);
|
String claim = mapperModel.getConfig().get(CLAIM);
|
||||||
return getClaimValue(context, claim);
|
{ // search access token
|
||||||
}
|
JsonWebToken token = (JsonWebToken)context.getContextData().get(KeycloakOIDCIdentityProvider.VALIDATED_ACCESS_TOKEN);
|
||||||
|
if (token != null) {
|
||||||
public static Object getClaimValue(BrokeredIdentityContext context, String claim) {
|
Object value = getClaimValue(token, claim);
|
||||||
{ // search access token
|
if (value != null) return value;
|
||||||
JsonWebToken token = (JsonWebToken)context.getContextData().get(KeycloakOIDCIdentityProvider.VALIDATED_ACCESS_TOKEN);
|
}
|
||||||
if (token != null) {
|
|
||||||
Object value = getClaimValue(token, claim);
|
}
|
||||||
if (value != null) return value;
|
{ // search ID Token
|
||||||
}
|
JsonWebToken token = (JsonWebToken)context.getContextData().get(KeycloakOIDCIdentityProvider.VALIDATED_ID_TOKEN);
|
||||||
|
if (token != null) {
|
||||||
}
|
Object value = getClaimValue(token, claim);
|
||||||
{ // search ID Token
|
if (value != null) return value;
|
||||||
JsonWebToken token = (JsonWebToken)context.getContextData().get(KeycloakOIDCIdentityProvider.VALIDATED_ID_TOKEN);
|
}
|
||||||
if (token != null) {
|
|
||||||
Object value = getClaimValue(token, claim);
|
}
|
||||||
if (value != null) return value;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
return null;
|
protected boolean hasClaimValue(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
}
|
Object value = getClaimValue(mapperModel, context);
|
||||||
|
String desiredValue = mapperModel.getConfig().get(CLAIM_VALUE);
|
||||||
|
return valueEquals(desiredValue, value);
|
||||||
protected boolean hasClaimValue(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
}
|
||||||
Object value = getClaimValue(mapperModel, context);
|
|
||||||
String desiredValue = mapperModel.getConfig().get(CLAIM_VALUE);
|
public boolean valueEquals(String desiredValue, Object value) {
|
||||||
return valueEquals(desiredValue, value);
|
if (value instanceof String) {
|
||||||
}
|
if (desiredValue.equals(value)) return true;
|
||||||
|
} else if (value instanceof Double) {
|
||||||
public boolean valueEquals(String desiredValue, Object value) {
|
try {
|
||||||
if (value instanceof String) {
|
if (Double.valueOf(desiredValue).equals(value)) return true;
|
||||||
if (desiredValue.equals(value)) return true;
|
} catch (Exception e) {
|
||||||
} else if (value instanceof Double) {
|
|
||||||
try {
|
}
|
||||||
if (Double.valueOf(desiredValue).equals(value)) return true;
|
} else if (value instanceof Integer) {
|
||||||
} catch (Exception e) {
|
try {
|
||||||
|
if (Integer.valueOf(desiredValue).equals(value)) return true;
|
||||||
}
|
} catch (Exception e) {
|
||||||
} else if (value instanceof Integer) {
|
|
||||||
try {
|
}
|
||||||
if (Integer.valueOf(desiredValue).equals(value)) return true;
|
} else if (value instanceof Boolean) {
|
||||||
} catch (Exception e) {
|
try {
|
||||||
|
if (Boolean.valueOf(desiredValue).equals(value)) return true;
|
||||||
}
|
} catch (Exception e) {
|
||||||
} else if (value instanceof Boolean) {
|
|
||||||
try {
|
}
|
||||||
if (Boolean.valueOf(desiredValue).equals(value)) return true;
|
} else if (value instanceof List) {
|
||||||
} catch (Exception e) {
|
List list = (List)value;
|
||||||
|
for (Object val : list) {
|
||||||
}
|
return valueEquals(desiredValue, val);
|
||||||
} else if (value instanceof List) {
|
}
|
||||||
List list = (List)value;
|
}
|
||||||
for (Object val : list) {
|
return false;
|
||||||
return valueEquals(desiredValue, val);
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-206
@@ -1,206 +0,0 @@
|
|||||||
package org.keycloak.broker.oidc.mappers;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import org.codehaus.jackson.JsonNode;
|
|
||||||
import org.jboss.logging.Logger;
|
|
||||||
import org.keycloak.broker.oidc.OIDCIdentityProvider;
|
|
||||||
import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
|
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.models.RealmModel;
|
|
||||||
import org.keycloak.models.UserModel;
|
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Abstract class for Social Provider mappers which allow mapping of JSON user profile field into Keycloak user
|
|
||||||
* attribute. Concrete mapper classes with own ID and provider mapping must be implemented for each social provider who
|
|
||||||
* uses {@link JsonNode} user profile.
|
|
||||||
*
|
|
||||||
* @author Vlastimil Elias (velias at redhat dot com)
|
|
||||||
*/
|
|
||||||
public abstract class AbstractJsonUserAttributeMapper extends AbstractIdentityProviderMapper {
|
|
||||||
|
|
||||||
|
|
||||||
protected static final Logger logger = Logger.getLogger(AbstractJsonUserAttributeMapper.class);
|
|
||||||
|
|
||||||
protected static final Logger LOGGER_DUMP_USER_PROFILE = Logger.getLogger("org.keycloak.social.user_profile_dump");
|
|
||||||
|
|
||||||
private static final String JSON_PATH_DELIMITER = ".";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Config param where name of mapping source JSON User Profile field is stored.
|
|
||||||
*/
|
|
||||||
public static final String CONF_JSON_FIELD = "jsonField";
|
|
||||||
/**
|
|
||||||
* Config param where name of mapping target USer attribute is stored.
|
|
||||||
*/
|
|
||||||
public static final String CONF_USER_ATTRIBUTE = "userAttribute";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Key in {@link BrokeredIdentityContext#getContextData()} where {@link JsonNode} with user profile is stored.
|
|
||||||
*/
|
|
||||||
public static final String CONTEXT_JSON_NODE = OIDCIdentityProvider.USER_INFO;
|
|
||||||
|
|
||||||
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
|
||||||
|
|
||||||
static {
|
|
||||||
ProviderConfigProperty property;
|
|
||||||
ProviderConfigProperty property1;
|
|
||||||
property1 = new ProviderConfigProperty();
|
|
||||||
property1.setName(CONF_JSON_FIELD);
|
|
||||||
property1.setLabel("Social Profile JSON Field Path");
|
|
||||||
property1.setHelpText("Path of field in Social provider User Profile JSON data to get value from. You can use dot notation for nesting and square brackets for array index. Eg. 'contact.address[0].country'.");
|
|
||||||
property1.setType(ProviderConfigProperty.STRING_TYPE);
|
|
||||||
configProperties.add(property1);
|
|
||||||
property = new ProviderConfigProperty();
|
|
||||||
property.setName(CONF_USER_ATTRIBUTE);
|
|
||||||
property.setLabel("User Attribute Name");
|
|
||||||
property.setHelpText("User attribute name to store information into.");
|
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
|
||||||
configProperties.add(property);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Store used profile JsonNode into user context for later use by this mapper. Profile data are dumped into special logger if enabled also to allow investigation of the structure.
|
|
||||||
*
|
|
||||||
* @param user context to store profile data into
|
|
||||||
* @param profile to store into context
|
|
||||||
* @param provider identification of social provider to be used in log dump
|
|
||||||
*
|
|
||||||
* @see #importNewUser(KeycloakSession, RealmModel, UserModel, IdentityProviderMapperModel, BrokeredIdentityContext)
|
|
||||||
* @see BrokeredIdentityContext#getContextData()
|
|
||||||
*/
|
|
||||||
public static void storeUserProfileForMapper(BrokeredIdentityContext user, JsonNode profile, String provider) {
|
|
||||||
user.getContextData().put(AbstractJsonUserAttributeMapper.CONTEXT_JSON_NODE, profile);
|
|
||||||
if (LOGGER_DUMP_USER_PROFILE.isDebugEnabled())
|
|
||||||
LOGGER_DUMP_USER_PROFILE.debug("User Profile JSON Data for provider "+provider+": " + profile);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
|
||||||
return configProperties;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayCategory() {
|
|
||||||
return "Attribute Importer";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayType() {
|
|
||||||
return "Attribute Importer";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getHelpText() {
|
|
||||||
return "Import user profile information if it exists in Social provider JSON data into the specified user attribute.";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
String attribute = mapperModel.getConfig().get(CONF_USER_ATTRIBUTE);
|
|
||||||
if (attribute == null || attribute.trim().isEmpty()) {
|
|
||||||
logger.debug("Attribute is not configured");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
attribute = attribute.trim();
|
|
||||||
|
|
||||||
String value = getJsonValue(mapperModel, context);
|
|
||||||
if (value != null) {
|
|
||||||
user.setSingleAttribute(attribute, value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
// we do not update user profile from social provider
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static String getJsonValue(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
|
|
||||||
String jsonField = mapperModel.getConfig().get(CONF_JSON_FIELD);
|
|
||||||
if (jsonField == null || jsonField.trim().isEmpty()) {
|
|
||||||
logger.debug("JSON field path is not configured");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
jsonField = jsonField.trim();
|
|
||||||
|
|
||||||
if (jsonField.startsWith(JSON_PATH_DELIMITER) || jsonField.endsWith(JSON_PATH_DELIMITER) || jsonField.startsWith("[")) {
|
|
||||||
logger.debug("JSON field path is invalid " + jsonField);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonNode profileJsonNode = (JsonNode) context.getContextData().get(CONTEXT_JSON_NODE);
|
|
||||||
|
|
||||||
String value = getJsonValue(profileJsonNode, jsonField);
|
|
||||||
|
|
||||||
if (value == null) {
|
|
||||||
logger.debug("User profile JSON value '" + jsonField + "' is not available.");
|
|
||||||
}
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static String getJsonValue(JsonNode baseNode, String fieldPath) {
|
|
||||||
logger.debug("Going to process JsonNode path " + fieldPath + " on data " + baseNode);
|
|
||||||
if (baseNode != null) {
|
|
||||||
|
|
||||||
int idx = fieldPath.indexOf(JSON_PATH_DELIMITER);
|
|
||||||
|
|
||||||
String currentFieldName = fieldPath;
|
|
||||||
if (idx > 0) {
|
|
||||||
currentFieldName = fieldPath.substring(0, idx).trim();
|
|
||||||
if (currentFieldName.isEmpty()) {
|
|
||||||
logger.debug("JSON path is invalid " + fieldPath);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
String currentNodeName = currentFieldName;
|
|
||||||
int arrayIndex = -1;
|
|
||||||
if (currentFieldName.endsWith("]")) {
|
|
||||||
int bi = currentFieldName.indexOf("[");
|
|
||||||
if (bi == -1) {
|
|
||||||
logger.debug("Invalid array index construct in " + currentFieldName);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
String is = currentFieldName.substring(bi+1, currentFieldName.length() - 1).trim();
|
|
||||||
arrayIndex = Integer.parseInt(is);
|
|
||||||
} catch (Exception e) {
|
|
||||||
logger.debug("Invalid array index construct in " + currentFieldName);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
currentNodeName = currentFieldName.substring(0,bi).trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonNode currentNode = baseNode.get(currentNodeName);
|
|
||||||
if (arrayIndex > -1 && currentNode.isArray()) {
|
|
||||||
logger.debug("Going to take array node at index " + arrayIndex);
|
|
||||||
currentNode = currentNode.get(arrayIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (currentNode == null) {
|
|
||||||
logger.debug("JsonNode not found for name " + currentFieldName);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (idx < 0) {
|
|
||||||
if (!currentNode.isValueNode()) {
|
|
||||||
logger.debug("JsonNode is not value node for name " + currentFieldName);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
String ret = currentNode.asText();
|
|
||||||
if (ret != null && !ret.trim().isEmpty())
|
|
||||||
return ret.trim();
|
|
||||||
} else {
|
|
||||||
return getJsonValue(currentNode, fieldPath.substring(idx + 1));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
+105
-105
@@ -1,105 +1,105 @@
|
|||||||
package org.keycloak.broker.oidc.mappers;
|
package org.keycloak.broker.oidc.mappers;
|
||||||
|
|
||||||
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory;
|
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory;
|
||||||
import org.keycloak.broker.oidc.OIDCIdentityProviderFactory;
|
import org.keycloak.broker.oidc.OIDCIdentityProviderFactory;
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
||||||
import org.keycloak.broker.provider.HardcodedRoleMapper;
|
import org.keycloak.broker.provider.HardcodedRoleMapper;
|
||||||
import org.keycloak.broker.provider.IdentityBrokerException;
|
import org.keycloak.broker.provider.IdentityBrokerException;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
import org.keycloak.models.IdentityProviderMapperModel;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.RealmModel;
|
||||||
import org.keycloak.models.RoleModel;
|
import org.keycloak.models.RoleModel;
|
||||||
import org.keycloak.models.UserModel;
|
import org.keycloak.models.UserModel;
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
import org.keycloak.provider.ProviderConfigProperty;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public class ClaimToRoleMapper extends AbstractClaimMapper {
|
public class ClaimToRoleMapper extends AbstractClaimMapper {
|
||||||
|
|
||||||
public static final String[] COMPATIBLE_PROVIDERS = {KeycloakOIDCIdentityProviderFactory.PROVIDER_ID, OIDCIdentityProviderFactory.PROVIDER_ID};
|
public static final String[] COMPATIBLE_PROVIDERS = {KeycloakOIDCIdentityProviderFactory.PROVIDER_ID, OIDCIdentityProviderFactory.PROVIDER_ID};
|
||||||
|
|
||||||
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
ProviderConfigProperty property;
|
ProviderConfigProperty property;
|
||||||
ProviderConfigProperty property1;
|
ProviderConfigProperty property1;
|
||||||
property1 = new ProviderConfigProperty();
|
property1 = new ProviderConfigProperty();
|
||||||
property1.setName(CLAIM);
|
property1.setName(CLAIM);
|
||||||
property1.setLabel("Claim");
|
property1.setLabel("Claim");
|
||||||
property1.setHelpText("Name of claim to search for in token. You can reference nested claims using a '.', i.e. 'address.locality'.");
|
property1.setHelpText("Name of claim to search for in token. You can reference nested claims using a '.', i.e. 'address.locality'.");
|
||||||
property1.setType(ProviderConfigProperty.STRING_TYPE);
|
property1.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
configProperties.add(property1);
|
configProperties.add(property1);
|
||||||
property1 = new ProviderConfigProperty();
|
property1 = new ProviderConfigProperty();
|
||||||
property1.setName(CLAIM_VALUE);
|
property1.setName(CLAIM_VALUE);
|
||||||
property1.setLabel("Claim Value");
|
property1.setLabel("Claim Value");
|
||||||
property1.setHelpText("Value the claim must have. If the claim is an array, then the value must be contained in the array.");
|
property1.setHelpText("Value the claim must have. If the claim is an array, then the value must be contained in the array.");
|
||||||
property1.setType(ProviderConfigProperty.STRING_TYPE);
|
property1.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
configProperties.add(property1);
|
configProperties.add(property1);
|
||||||
property = new ProviderConfigProperty();
|
property = new ProviderConfigProperty();
|
||||||
property.setName(HardcodedRoleMapper.ROLE);
|
property.setName(HardcodedRoleMapper.ROLE);
|
||||||
property.setLabel("Role");
|
property.setLabel("Role");
|
||||||
property.setHelpText("Role to grant to user if claim is present. Click 'Select Role' button to browse roles, or just type it in the textbox. To reference an application role the syntax is appname.approle, i.e. myapp.myrole");
|
property.setHelpText("Role to grant to user if claim is present. To reference an application role the syntax is appname.approle, i.e. myapp.myrole");
|
||||||
property.setType(ProviderConfigProperty.ROLE_TYPE);
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
configProperties.add(property);
|
configProperties.add(property);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String PROVIDER_ID = "oidc-role-idp-mapper";
|
public static final String PROVIDER_ID = "oidc-role-idp-mapper";
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
public List<ProviderConfigProperty> getConfigProperties() {
|
||||||
return configProperties;
|
return configProperties;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return PROVIDER_ID;
|
return PROVIDER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getCompatibleProviders() {
|
public String[] getCompatibleProviders() {
|
||||||
return COMPATIBLE_PROVIDERS;
|
return COMPATIBLE_PROVIDERS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getDisplayCategory() {
|
public String getDisplayCategory() {
|
||||||
return "Role Importer";
|
return "Role Importer";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getDisplayType() {
|
public String getDisplayType() {
|
||||||
return "Claim to Role";
|
return "Claim to Role";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
String roleName = mapperModel.getConfig().get(HardcodedRoleMapper.ROLE);
|
String roleName = mapperModel.getConfig().get(HardcodedRoleMapper.ROLE);
|
||||||
if (hasClaimValue(mapperModel, context)) {
|
if (hasClaimValue(mapperModel, context)) {
|
||||||
RoleModel role = HardcodedRoleMapper.getRoleFromString(realm, roleName);
|
RoleModel role = HardcodedRoleMapper.getRoleFromString(realm, roleName);
|
||||||
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
||||||
user.grantRole(role);
|
user.grantRole(role);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
String roleName = mapperModel.getConfig().get(HardcodedRoleMapper.ROLE);
|
String roleName = mapperModel.getConfig().get(HardcodedRoleMapper.ROLE);
|
||||||
if (!hasClaimValue(mapperModel, context)) {
|
if (!hasClaimValue(mapperModel, context)) {
|
||||||
RoleModel role = HardcodedRoleMapper.getRoleFromString(realm, roleName);
|
RoleModel role = HardcodedRoleMapper.getRoleFromString(realm, roleName);
|
||||||
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
||||||
user.deleteRoleMapping(role);
|
user.deleteRoleMapping(role);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getHelpText() {
|
public String getHelpText() {
|
||||||
return "If a claim exists, grant the user the specified realm or application role.";
|
return "If a claim exists, grant the user the specified realm or application role.";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+118
-118
@@ -1,118 +1,118 @@
|
|||||||
package org.keycloak.broker.oidc.mappers;
|
package org.keycloak.broker.oidc.mappers;
|
||||||
|
|
||||||
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider;
|
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider;
|
||||||
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory;
|
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory;
|
||||||
import org.keycloak.broker.oidc.OIDCIdentityProviderFactory;
|
import org.keycloak.broker.oidc.OIDCIdentityProviderFactory;
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
||||||
import org.keycloak.broker.provider.HardcodedRoleMapper;
|
import org.keycloak.broker.provider.HardcodedRoleMapper;
|
||||||
import org.keycloak.broker.provider.IdentityBrokerException;
|
import org.keycloak.broker.provider.IdentityBrokerException;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
import org.keycloak.models.IdentityProviderMapperModel;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.RealmModel;
|
||||||
import org.keycloak.models.RoleModel;
|
import org.keycloak.models.RoleModel;
|
||||||
import org.keycloak.models.UserModel;
|
import org.keycloak.models.UserModel;
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
import org.keycloak.provider.ProviderConfigProperty;
|
||||||
import org.keycloak.representations.JsonWebToken;
|
import org.keycloak.representations.JsonWebToken;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public class ExternalKeycloakRoleToRoleMapper extends AbstractClaimMapper {
|
public class ExternalKeycloakRoleToRoleMapper extends AbstractClaimMapper {
|
||||||
|
|
||||||
public static final String[] COMPATIBLE_PROVIDERS = {KeycloakOIDCIdentityProviderFactory.PROVIDER_ID};
|
public static final String[] COMPATIBLE_PROVIDERS = {KeycloakOIDCIdentityProviderFactory.PROVIDER_ID};
|
||||||
|
|
||||||
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
||||||
private static final String EXTERNAL_ROLE = "external.role";
|
private static final String EXTERNAL_ROLE = "external.role";
|
||||||
|
|
||||||
static {
|
static {
|
||||||
ProviderConfigProperty property;
|
ProviderConfigProperty property;
|
||||||
ProviderConfigProperty property1;
|
ProviderConfigProperty property1;
|
||||||
property1 = new ProviderConfigProperty();
|
property1 = new ProviderConfigProperty();
|
||||||
property1.setName(EXTERNAL_ROLE);
|
property1.setName(EXTERNAL_ROLE);
|
||||||
property1.setLabel("External role");
|
property1.setLabel("External role");
|
||||||
property1.setHelpText("External role to check for. To reference an application role the syntax is appname.approle, i.e. myapp.myrole.");
|
property1.setHelpText("External role to check for. To reference an application role the syntax is appname.approle, i.e. myapp.myrole.");
|
||||||
property1.setType(ProviderConfigProperty.STRING_TYPE);
|
property1.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
configProperties.add(property1);
|
configProperties.add(property1);
|
||||||
property = new ProviderConfigProperty();
|
property = new ProviderConfigProperty();
|
||||||
property.setName(HardcodedRoleMapper.ROLE);
|
property.setName(HardcodedRoleMapper.ROLE);
|
||||||
property.setLabel("Role");
|
property.setLabel("Role");
|
||||||
property.setHelpText("Role to grant to user if external role is present. Click 'Select Role' button to browse roles, or just type it in the textbox. To reference an application role the syntax is appname.approle, i.e. myapp.myrole");
|
property.setHelpText("Role to grant to user if external role is present. To reference an application role the syntax is appname.approle, i.e. myapp.myrole");
|
||||||
property.setType(ProviderConfigProperty.ROLE_TYPE);
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
configProperties.add(property);
|
configProperties.add(property);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String PROVIDER_ID = "keycloak-oidc-role-to-role-idp-mapper";
|
public static final String PROVIDER_ID = "keycloak-oidc-role-to-role-idp-mapper";
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
public List<ProviderConfigProperty> getConfigProperties() {
|
||||||
return configProperties;
|
return configProperties;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return PROVIDER_ID;
|
return PROVIDER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getCompatibleProviders() {
|
public String[] getCompatibleProviders() {
|
||||||
return COMPATIBLE_PROVIDERS;
|
return COMPATIBLE_PROVIDERS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getDisplayCategory() {
|
public String getDisplayCategory() {
|
||||||
return "Role Importer";
|
return "Role Importer";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getDisplayType() {
|
public String getDisplayType() {
|
||||||
return "External Role to Role";
|
return "External Role to Role";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
RoleModel role = hasRole(realm, mapperModel, context);
|
RoleModel role = hasRole(realm, mapperModel, context);
|
||||||
if (role != null) {
|
if (role != null) {
|
||||||
user.grantRole(role);
|
user.grantRole(role);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private RoleModel hasRole(RealmModel realm,IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
private RoleModel hasRole(RealmModel realm,IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
JsonWebToken token = (JsonWebToken)context.getContextData().get(KeycloakOIDCIdentityProvider.VALIDATED_ACCESS_TOKEN);
|
JsonWebToken token = (JsonWebToken)context.getContextData().get(KeycloakOIDCIdentityProvider.VALIDATED_ACCESS_TOKEN);
|
||||||
//if (token == null) return;
|
//if (token == null) return;
|
||||||
String roleName = mapperModel.getConfig().get(HardcodedRoleMapper.ROLE);
|
String roleName = mapperModel.getConfig().get(HardcodedRoleMapper.ROLE);
|
||||||
String[] parseRole = HardcodedRoleMapper.parseRole(mapperModel.getConfig().get(EXTERNAL_ROLE));
|
String[] parseRole = HardcodedRoleMapper.parseRole(mapperModel.getConfig().get(EXTERNAL_ROLE));
|
||||||
String externalRoleName = parseRole[1];
|
String externalRoleName = parseRole[1];
|
||||||
String claimName = null;
|
String claimName = null;
|
||||||
if (parseRole[0] == null) {
|
if (parseRole[0] == null) {
|
||||||
claimName = "realm_access.roles";
|
claimName = "realm_access.roles";
|
||||||
} else {
|
} else {
|
||||||
claimName = "resource_access." + parseRole[0] + ".roles";
|
claimName = "resource_access." + parseRole[0] + ".roles";
|
||||||
}
|
}
|
||||||
Object claim = getClaimValue(token, claimName);
|
Object claim = getClaimValue(token, claimName);
|
||||||
if (valueEquals(externalRoleName, claim)) {
|
if (valueEquals(externalRoleName, claim)) {
|
||||||
RoleModel role = HardcodedRoleMapper.getRoleFromString(realm, roleName);
|
RoleModel role = HardcodedRoleMapper.getRoleFromString(realm, roleName);
|
||||||
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
||||||
return role;
|
return role;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
RoleModel role = hasRole(realm, mapperModel, context);
|
RoleModel role = hasRole(realm, mapperModel, context);
|
||||||
if (role == null) {
|
if (role == null) {
|
||||||
user.deleteRoleMapping(role);
|
user.deleteRoleMapping(role);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getHelpText() {
|
public String getHelpText() {
|
||||||
return "Looks for an external role in a keycloak access token. If external role exists, grant the user the specified realm or application role.";
|
return "Looks for an external role in a keycloak access token. If external role exists, grant the user the specified realm or application role.";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+100
-98
@@ -1,98 +1,100 @@
|
|||||||
package org.keycloak.broker.oidc.mappers;
|
package org.keycloak.broker.oidc.mappers;
|
||||||
|
|
||||||
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory;
|
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory;
|
||||||
import org.keycloak.broker.oidc.OIDCIdentityProviderFactory;
|
import org.keycloak.broker.oidc.OIDCIdentityProviderFactory;
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
import org.keycloak.broker.provider.IdentityBrokerException;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.ClientModel;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.IdentityProviderMapperModel;
|
||||||
import org.keycloak.models.UserModel;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
import org.keycloak.models.RealmModel;
|
||||||
|
import org.keycloak.models.RoleModel;
|
||||||
import java.util.ArrayList;
|
import org.keycloak.models.UserModel;
|
||||||
import java.util.Collection;
|
import org.keycloak.provider.ProviderConfigProperty;
|
||||||
import java.util.List;
|
|
||||||
|
import java.util.ArrayList;
|
||||||
/**
|
import java.util.List;
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
|
||||||
* @version $Revision: 1 $
|
/**
|
||||||
*/
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
public class UserAttributeMapper extends AbstractClaimMapper {
|
* @version $Revision: 1 $
|
||||||
|
*/
|
||||||
public static final String[] COMPATIBLE_PROVIDERS = {KeycloakOIDCIdentityProviderFactory.PROVIDER_ID, OIDCIdentityProviderFactory.PROVIDER_ID};
|
public class UserAttributeMapper extends AbstractClaimMapper {
|
||||||
|
|
||||||
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
public static final String[] COMPATIBLE_PROVIDERS = {KeycloakOIDCIdentityProviderFactory.PROVIDER_ID, OIDCIdentityProviderFactory.PROVIDER_ID};
|
||||||
|
|
||||||
public static final String USER_ATTRIBUTE = "user.attribute";
|
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
||||||
|
|
||||||
static {
|
public static final String USER_ATTRIBUTE = "user.attribute";
|
||||||
ProviderConfigProperty property;
|
|
||||||
ProviderConfigProperty property1;
|
static {
|
||||||
property1 = new ProviderConfigProperty();
|
ProviderConfigProperty property;
|
||||||
property1.setName(CLAIM);
|
ProviderConfigProperty property1;
|
||||||
property1.setLabel("Claim");
|
property1 = new ProviderConfigProperty();
|
||||||
property1.setHelpText("Name of claim to search for in token. You can reference nested claims using a '.', i.e. 'address.locality'.");
|
property1.setName(CLAIM);
|
||||||
property1.setType(ProviderConfigProperty.STRING_TYPE);
|
property1.setLabel("Claim");
|
||||||
configProperties.add(property1);
|
property1.setHelpText("Name of claim to search for in token. You can reference nested claims using a '.', i.e. 'address.locality'.");
|
||||||
property = new ProviderConfigProperty();
|
property1.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
property.setName(USER_ATTRIBUTE);
|
configProperties.add(property1);
|
||||||
property.setLabel("User Attribute Name");
|
property = new ProviderConfigProperty();
|
||||||
property.setHelpText("User attribute name to store claim.");
|
property.setName(USER_ATTRIBUTE);
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
property.setLabel("User Attribute Name");
|
||||||
configProperties.add(property);
|
property.setHelpText("User attribute name to store claim.");
|
||||||
}
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
|
configProperties.add(property);
|
||||||
public static final String PROVIDER_ID = "oidc-user-attribute-idp-mapper";
|
}
|
||||||
|
|
||||||
@Override
|
public static final String PROVIDER_ID = "oidc-user-attribute-idp-mapper";
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
|
||||||
return configProperties;
|
@Override
|
||||||
}
|
public List<ProviderConfigProperty> getConfigProperties() {
|
||||||
|
return configProperties;
|
||||||
@Override
|
}
|
||||||
public String getId() {
|
|
||||||
return PROVIDER_ID;
|
@Override
|
||||||
}
|
public String getId() {
|
||||||
|
return PROVIDER_ID;
|
||||||
@Override
|
}
|
||||||
public String[] getCompatibleProviders() {
|
|
||||||
return COMPATIBLE_PROVIDERS;
|
@Override
|
||||||
}
|
public String[] getCompatibleProviders() {
|
||||||
|
return COMPATIBLE_PROVIDERS;
|
||||||
@Override
|
}
|
||||||
public String getDisplayCategory() {
|
|
||||||
return "Attribute Importer";
|
@Override
|
||||||
}
|
public String getDisplayCategory() {
|
||||||
|
return "Attribute Importer";
|
||||||
@Override
|
}
|
||||||
public String getDisplayType() {
|
|
||||||
return "Attribute Importer";
|
@Override
|
||||||
}
|
public String getDisplayType() {
|
||||||
|
return "Attribute Importer";
|
||||||
@Override
|
}
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
|
@Override
|
||||||
Object value = getClaimValue(mapperModel, context);
|
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
if (value != null) {
|
String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
|
||||||
user.setSingleAttribute(attribute, value.toString());
|
Object value = getClaimValue(mapperModel, context);
|
||||||
}
|
if (value != null) {
|
||||||
}
|
user.setAttribute(attribute, value.toString());
|
||||||
|
}
|
||||||
@Override
|
}
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
|
@Override
|
||||||
Object value = getClaimValue(mapperModel, context);
|
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
String current = user.getFirstAttribute(attribute);
|
String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
|
||||||
if (value != null && !value.equals(current)) {
|
Object value = getClaimValue(mapperModel, context);
|
||||||
user.setSingleAttribute(attribute, value.toString());
|
String current = user.getAttribute(attribute);
|
||||||
} else if (value == null) {
|
if (value != null && !value.equals(current)) {
|
||||||
user.removeAttribute(attribute);
|
user.setAttribute(attribute, value.toString());
|
||||||
}
|
} else if (value == null) {
|
||||||
}
|
user.removeAttribute(attribute);
|
||||||
|
}
|
||||||
@Override
|
}
|
||||||
public String getHelpText() {
|
|
||||||
return "Import declared claim if it exists in ID or access token into the specified user attribute.";
|
@Override
|
||||||
}
|
public String getHelpText() {
|
||||||
|
return "Import declared claim if it exists in ID or access token into the specified user attribute.";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
-109
@@ -1,109 +0,0 @@
|
|||||||
package org.keycloak.broker.oidc.mappers;
|
|
||||||
|
|
||||||
import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory;
|
|
||||||
import org.keycloak.broker.oidc.OIDCIdentityProviderFactory;
|
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.models.RealmModel;
|
|
||||||
import org.keycloak.models.UserModel;
|
|
||||||
import org.keycloak.models.utils.KeycloakModelUtils;
|
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
|
||||||
* @version $Revision: 1 $
|
|
||||||
*/
|
|
||||||
public class UsernameTemplateMapper extends AbstractClaimMapper {
|
|
||||||
|
|
||||||
public static final String[] COMPATIBLE_PROVIDERS = {KeycloakOIDCIdentityProviderFactory.PROVIDER_ID, OIDCIdentityProviderFactory.PROVIDER_ID};
|
|
||||||
|
|
||||||
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
|
||||||
|
|
||||||
public static final String TEMPLATE = "template";
|
|
||||||
|
|
||||||
static {
|
|
||||||
ProviderConfigProperty property;
|
|
||||||
property = new ProviderConfigProperty();
|
|
||||||
property.setName(TEMPLATE);
|
|
||||||
property.setLabel("Template");
|
|
||||||
property.setHelpText("Template to use to format the username to import. Substitutions are enclosed in ${}. For example: '${ALIAS}.${CLAIM.sub}'. ALIAS is the provider alias. CLAIM.<NAME> references an ID or Access token claim.");
|
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
|
||||||
property.setDefaultValue("${ALIAS}.${CLAIM.preferred_username}");
|
|
||||||
configProperties.add(property);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final String PROVIDER_ID = "oidc-username-idp-mapper";
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
|
||||||
return configProperties;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getId() {
|
|
||||||
return PROVIDER_ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String[] getCompatibleProviders() {
|
|
||||||
return COMPATIBLE_PROVIDERS;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayCategory() {
|
|
||||||
return "Preprocessor";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayType() {
|
|
||||||
return "Username Template Importer";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
}
|
|
||||||
|
|
||||||
static Pattern substitution = Pattern.compile("\\$\\{([^}]+)\\}");
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void preprocessFederatedIdentity(KeycloakSession session, RealmModel realm, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
String template = mapperModel.getConfig().get(TEMPLATE);
|
|
||||||
Matcher m = substitution.matcher(template);
|
|
||||||
StringBuffer sb = new StringBuffer();
|
|
||||||
while (m.find()) {
|
|
||||||
String variable = m.group(1);
|
|
||||||
if (variable.equals("ALIAS")) {
|
|
||||||
m.appendReplacement(sb, context.getIdpConfig().getAlias());
|
|
||||||
} else if (variable.equals("UUID")) {
|
|
||||||
m.appendReplacement(sb, KeycloakModelUtils.generateId());
|
|
||||||
} else if (variable.startsWith("CLAIM.")) {
|
|
||||||
String name = variable.substring("CLAIM.".length());
|
|
||||||
Object value = AbstractClaimMapper.getClaimValue(context, name);
|
|
||||||
if (value == null) value = "";
|
|
||||||
m.appendReplacement(sb, value.toString());
|
|
||||||
} else {
|
|
||||||
m.appendReplacement(sb, m.group(1));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
m.appendTail(sb);
|
|
||||||
String username = sb.toString();
|
|
||||||
context.setModelUsername(username);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getHelpText() {
|
|
||||||
return "Format the username to import.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +1,32 @@
|
|||||||
package org.keycloak.broker.oidc.util;
|
package org.keycloak.broker.oidc.util;
|
||||||
|
|
||||||
import org.codehaus.jackson.JsonNode;
|
import org.codehaus.jackson.JsonNode;
|
||||||
import org.codehaus.jackson.map.ObjectMapper;
|
import org.codehaus.jackson.map.ObjectMapper;
|
||||||
import org.keycloak.broker.provider.util.SimpleHttp;
|
import org.keycloak.broker.provider.util.SimpleHttp;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public class JsonSimpleHttp extends SimpleHttp {
|
public class JsonSimpleHttp extends SimpleHttp {
|
||||||
public JsonSimpleHttp(String url, String method) {
|
public JsonSimpleHttp(String url, String method) {
|
||||||
super(url, method);
|
super(url, method);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static JsonSimpleHttp doGet(String url) {
|
public static JsonSimpleHttp doGet(String url) {
|
||||||
return new JsonSimpleHttp(url, "GET");
|
return new JsonSimpleHttp(url, "GET");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static JsonSimpleHttp doPost(String url) {
|
public static JsonSimpleHttp doPost(String url) {
|
||||||
return new JsonSimpleHttp(url, "POST");
|
return new JsonSimpleHttp(url, "POST");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ObjectMapper mapper = new ObjectMapper();
|
private static ObjectMapper mapper = new ObjectMapper();
|
||||||
|
|
||||||
public static JsonNode asJson(SimpleHttp request) throws IOException {
|
public static JsonNode asJson(SimpleHttp request) throws IOException {
|
||||||
return mapper.readTree(request.asString());
|
return mapper.readTree(request.asString());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+1
-1
@@ -1,2 +1,2 @@
|
|||||||
org.keycloak.broker.oidc.OIDCIdentityProviderFactory
|
org.keycloak.broker.oidc.OIDCIdentityProviderFactory
|
||||||
org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory
|
org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory
|
||||||
+3
-4
@@ -1,4 +1,3 @@
|
|||||||
org.keycloak.broker.oidc.mappers.ClaimToRoleMapper
|
org.keycloak.broker.oidc.mappers.ClaimToRoleMapper
|
||||||
org.keycloak.broker.oidc.mappers.ExternalKeycloakRoleToRoleMapper
|
org.keycloak.broker.oidc.mappers.ExternalKeycloakRoleToRoleMapper
|
||||||
org.keycloak.broker.oidc.mappers.UserAttributeMapper
|
org.keycloak.broker.oidc.mappers.UserAttributeMapper
|
||||||
org.keycloak.broker.oidc.mappers.UsernameTemplateMapper
|
|
||||||
-120
@@ -1,120 +0,0 @@
|
|||||||
/*
|
|
||||||
* JBoss, Home of Professional Open Source
|
|
||||||
* Copyright 2015 Red Hat Inc. and/or its affiliates and other contributors
|
|
||||||
* as indicated by the @authors tag. All rights reserved.
|
|
||||||
*/
|
|
||||||
package org.keycloak.broker.oidc.mappers;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import org.codehaus.jackson.JsonNode;
|
|
||||||
import org.codehaus.jackson.JsonProcessingException;
|
|
||||||
import org.codehaus.jackson.map.ObjectMapper;
|
|
||||||
import org.junit.Assert;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unit test for {@link AbstractJsonUserAttributeMapper}
|
|
||||||
*
|
|
||||||
* @author Vlastimil Elias (velias at redhat dot com)
|
|
||||||
*/
|
|
||||||
public class AbstractJsonUserAttributeMapperTest {
|
|
||||||
|
|
||||||
private static ObjectMapper mapper = new ObjectMapper();
|
|
||||||
|
|
||||||
private static JsonNode baseNode;
|
|
||||||
|
|
||||||
private JsonNode getJsonNode() throws JsonProcessingException, IOException {
|
|
||||||
if (baseNode == null)
|
|
||||||
baseNode = mapper.readTree("{ \"value1\" : \"v1 \",\"value_empty\" : \"\", \"value_b\" : true, \"value_i\" : 454, " + " \"value_array\":[\"a1\",\"a2\"], " +" \"nest1\": {\"value1\": \" fgh \",\"value_empty\" : \"\", \"nest2\":{\"value_b\" : false, \"value_i\" : 43}}, "+ " \"nesta\": { \"a\":[{\"av1\": \"vala1\"},{\"av1\": \"vala2\"}]}"+" }");
|
|
||||||
return baseNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getJsonValue_invalidPath() throws JsonProcessingException, IOException {
|
|
||||||
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "."));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), ".."));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "...value1"));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), ".value1"));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value1."));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "[]"));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "[value1"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getJsonValue_simpleValues() throws JsonProcessingException, IOException {
|
|
||||||
|
|
||||||
//unknown field returns null
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_unknown"));
|
|
||||||
|
|
||||||
// we check value is trimmed also!
|
|
||||||
Assert.assertEquals("v1", AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value1"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_empty"));
|
|
||||||
|
|
||||||
Assert.assertEquals("true", AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_b"));
|
|
||||||
Assert.assertEquals("454", AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_i"));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getJsonValue_nestedSimpleValues() throws JsonProcessingException, IOException {
|
|
||||||
|
|
||||||
// null if path points to JSON object
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nest1"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nest1.nest2"));
|
|
||||||
|
|
||||||
//unknown field returns null
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nest1.value_unknown"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nest1.nest2.value_unknown"));
|
|
||||||
|
|
||||||
// we check value is trimmed also!
|
|
||||||
Assert.assertEquals("fgh", AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nest1.value1"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nest1.value_empty"));
|
|
||||||
|
|
||||||
Assert.assertEquals("false", AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nest1.nest2.value_b"));
|
|
||||||
Assert.assertEquals("43", AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nest1.nest2.value_i"));
|
|
||||||
|
|
||||||
// null if invalid nested path
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nest1."));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nest1.nest2."));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getJsonValue_simpleArray() throws JsonProcessingException, IOException {
|
|
||||||
|
|
||||||
// array field itself returns null if no index is provided
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_array"));
|
|
||||||
// outside index returns null
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_array[2]"));
|
|
||||||
|
|
||||||
//corect index
|
|
||||||
Assert.assertEquals("a1", AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_array[0]"));
|
|
||||||
Assert.assertEquals("a2", AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_array[1]"));
|
|
||||||
|
|
||||||
//incorrect array constructs
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_array[]"));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_array]"));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_array["));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_array[a]"));
|
|
||||||
Assert.assertNull(AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "value_array[-2]"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getJsonValue_nestedArrayWithObjects() throws JsonProcessingException, IOException {
|
|
||||||
Assert.assertEquals("vala1", AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nesta.a[0].av1"));
|
|
||||||
Assert.assertEquals("vala2", AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nesta.a[1].av1"));
|
|
||||||
|
|
||||||
//different path erros or nonexisting indexes or fields return null
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nesta.a[2].av1"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nesta.a[0]"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nesta.a[0].av_unknown"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nesta.a[].av1"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nesta.a"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nesta.a.av1"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nesta.a].av1"));
|
|
||||||
Assert.assertEquals(null, AbstractJsonUserAttributeMapper.getJsonValue(getJsonNode(), "nesta.a[.av1"));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
+23
-23
@@ -1,23 +1,23 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>keycloak-broker-parent</artifactId>
|
<artifactId>keycloak-broker-parent</artifactId>
|
||||||
<name>Keycloak Broker Parent</name>
|
<name>Keycloak Broker Parent</name>
|
||||||
<description/>
|
<description/>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>core</module>
|
<module>core</module>
|
||||||
<module>oidc</module>
|
<module>oidc</module>
|
||||||
<module>saml</module>
|
<module>saml</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
+50
-50
@@ -1,50 +1,50 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>keycloak-broker-saml</artifactId>
|
<artifactId>keycloak-broker-saml</artifactId>
|
||||||
<name>Keycloak Broker - SAML Identity Provider</name>
|
<name>Keycloak Broker - SAML Identity Provider</name>
|
||||||
<description/>
|
<description/>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-broker-core</artifactId>
|
<artifactId>keycloak-broker-core</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-saml-protocol</artifactId>
|
<artifactId>keycloak-saml-protocol</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-saml-core</artifactId>
|
<artifactId>keycloak-saml-core</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-services</artifactId>
|
<artifactId>keycloak-services</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-events-api</artifactId>
|
<artifactId>keycloak-events-api</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jboss.logging</groupId>
|
<groupId>org.jboss.logging</groupId>
|
||||||
<artifactId>jboss-logging</artifactId>
|
<artifactId>jboss-logging</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -1,438 +1,485 @@
|
|||||||
package org.keycloak.broker.saml;
|
package org.keycloak.broker.saml;
|
||||||
|
|
||||||
import org.jboss.logging.Logger;
|
import org.jboss.logging.Logger;
|
||||||
import org.keycloak.common.ClientConnection;
|
import org.keycloak.ClientConnection;
|
||||||
import org.keycloak.common.VerificationException;
|
import org.keycloak.VerificationException;
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
||||||
import org.keycloak.broker.provider.IdentityBrokerException;
|
import org.keycloak.broker.provider.IdentityBrokerException;
|
||||||
import org.keycloak.broker.provider.IdentityProvider;
|
import org.keycloak.broker.provider.IdentityProvider;
|
||||||
import org.keycloak.dom.saml.v2.assertion.AssertionType;
|
import org.keycloak.dom.saml.v2.assertion.AssertionType;
|
||||||
import org.keycloak.dom.saml.v2.assertion.AttributeStatementType;
|
import org.keycloak.dom.saml.v2.assertion.AttributeStatementType;
|
||||||
import org.keycloak.dom.saml.v2.assertion.AttributeType;
|
import org.keycloak.dom.saml.v2.assertion.AttributeType;
|
||||||
import org.keycloak.dom.saml.v2.assertion.AuthnStatementType;
|
import org.keycloak.dom.saml.v2.assertion.AuthnStatementType;
|
||||||
import org.keycloak.dom.saml.v2.assertion.NameIDType;
|
import org.keycloak.dom.saml.v2.assertion.EncryptedAssertionType;
|
||||||
import org.keycloak.dom.saml.v2.assertion.SubjectType;
|
import org.keycloak.dom.saml.v2.assertion.NameIDType;
|
||||||
import org.keycloak.dom.saml.v2.protocol.LogoutRequestType;
|
import org.keycloak.dom.saml.v2.assertion.SubjectType;
|
||||||
import org.keycloak.dom.saml.v2.protocol.RequestAbstractType;
|
import org.keycloak.dom.saml.v2.protocol.LogoutRequestType;
|
||||||
import org.keycloak.dom.saml.v2.protocol.ResponseType;
|
import org.keycloak.dom.saml.v2.protocol.RequestAbstractType;
|
||||||
import org.keycloak.dom.saml.v2.protocol.StatusResponseType;
|
import org.keycloak.dom.saml.v2.protocol.ResponseType;
|
||||||
import org.keycloak.events.Details;
|
import org.keycloak.dom.saml.v2.protocol.StatusResponseType;
|
||||||
import org.keycloak.events.Errors;
|
import org.keycloak.events.Details;
|
||||||
import org.keycloak.events.EventBuilder;
|
import org.keycloak.events.Errors;
|
||||||
import org.keycloak.events.EventType;
|
import org.keycloak.events.EventBuilder;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.events.EventType;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.UserSessionModel;
|
import org.keycloak.models.RealmModel;
|
||||||
import org.keycloak.protocol.saml.JaxrsSAML2BindingBuilder;
|
import org.keycloak.models.UserSessionModel;
|
||||||
import org.keycloak.saml.SAML2LogoutResponseBuilder;
|
import org.keycloak.protocol.saml.SAML2LogoutResponseBuilder;
|
||||||
import org.keycloak.saml.SAMLRequestParser;
|
import org.keycloak.protocol.saml.SAMLRequestParser;
|
||||||
import org.keycloak.protocol.saml.SamlProtocol;
|
import org.keycloak.protocol.saml.SamlProtocol;
|
||||||
import org.keycloak.protocol.saml.SamlProtocolUtils;
|
import org.keycloak.protocol.saml.SamlProtocolUtils;
|
||||||
import org.keycloak.saml.common.constants.GeneralConstants;
|
import org.keycloak.saml.common.constants.GeneralConstants;
|
||||||
import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
|
import org.keycloak.saml.common.constants.JBossSAMLConstants;
|
||||||
import org.keycloak.saml.common.exceptions.ConfigurationException;
|
import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
|
||||||
import org.keycloak.saml.common.exceptions.ProcessingException;
|
import org.keycloak.saml.common.exceptions.ConfigurationException;
|
||||||
import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder;
|
import org.keycloak.saml.common.exceptions.ProcessingException;
|
||||||
import org.keycloak.saml.processing.core.saml.v2.constants.X500SAMLProfileConstants;
|
import org.keycloak.saml.common.util.DocumentUtil;
|
||||||
import org.keycloak.saml.processing.core.saml.v2.util.AssertionUtil;
|
import org.keycloak.saml.common.util.StaxParserUtil;
|
||||||
import org.keycloak.saml.processing.core.util.XMLSignatureUtil;
|
import org.keycloak.saml.processing.api.saml.v2.response.SAML2Response;
|
||||||
import org.keycloak.saml.processing.web.util.PostBindingUtil;
|
import org.keycloak.saml.processing.core.parsers.saml.SAMLParser;
|
||||||
import org.keycloak.services.ErrorPage;
|
import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder;
|
||||||
import org.keycloak.services.managers.AuthenticationManager;
|
import org.keycloak.saml.processing.core.saml.v2.constants.X500SAMLProfileConstants;
|
||||||
import org.keycloak.services.messages.Messages;
|
import org.keycloak.saml.processing.core.util.JAXPValidationUtil;
|
||||||
|
import org.keycloak.saml.processing.core.util.XMLEncryptionUtil;
|
||||||
import javax.ws.rs.Consumes;
|
import org.keycloak.saml.processing.core.util.XMLSignatureUtil;
|
||||||
import javax.ws.rs.FormParam;
|
import org.keycloak.saml.processing.web.util.PostBindingUtil;
|
||||||
import javax.ws.rs.GET;
|
import org.keycloak.services.ErrorPage;
|
||||||
import javax.ws.rs.POST;
|
import org.keycloak.services.managers.AuthenticationManager;
|
||||||
import javax.ws.rs.QueryParam;
|
import org.keycloak.services.messages.Messages;
|
||||||
import javax.ws.rs.core.Context;
|
import org.w3c.dom.Document;
|
||||||
import javax.ws.rs.core.HttpHeaders;
|
import org.w3c.dom.Element;
|
||||||
import javax.ws.rs.core.MediaType;
|
import org.w3c.dom.Node;
|
||||||
import javax.ws.rs.core.Response;
|
|
||||||
import javax.ws.rs.core.UriBuilder;
|
import javax.ws.rs.Consumes;
|
||||||
import javax.ws.rs.core.UriInfo;
|
import javax.ws.rs.FormParam;
|
||||||
import java.io.IOException;
|
import javax.ws.rs.GET;
|
||||||
import java.security.PublicKey;
|
import javax.ws.rs.POST;
|
||||||
import java.security.cert.X509Certificate;
|
import javax.ws.rs.QueryParam;
|
||||||
import java.util.List;
|
import javax.ws.rs.core.Context;
|
||||||
|
import javax.ws.rs.core.HttpHeaders;
|
||||||
/**
|
import javax.ws.rs.core.MediaType;
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
import javax.ws.rs.core.Response;
|
||||||
* @version $Revision: 1 $
|
import javax.ws.rs.core.UriBuilder;
|
||||||
*/
|
import javax.ws.rs.core.UriInfo;
|
||||||
public class SAMLEndpoint {
|
import javax.xml.namespace.QName;
|
||||||
protected static final Logger logger = Logger.getLogger(SAMLEndpoint.class);
|
import java.io.IOException;
|
||||||
public static final String SAML_FEDERATED_SESSION_INDEX = "SAML_FEDERATED_SESSION_INDEX";
|
import java.security.PrivateKey;
|
||||||
public static final String SAML_FEDERATED_SUBJECT = "SAML_FEDERATED_SUBJECT";
|
import java.security.PublicKey;
|
||||||
public static final String SAML_FEDERATED_SUBJECT_NAMEFORMAT = "SAML_FEDERATED_SUBJECT_NAMEFORMAT";
|
import java.security.cert.X509Certificate;
|
||||||
public static final String SAML_LOGIN_RESPONSE = "SAML_LOGIN_RESPONSE";
|
import java.util.List;
|
||||||
public static final String SAML_ASSERTION = "SAML_ASSERTION";
|
|
||||||
public static final String SAML_AUTHN_STATEMENT = "SAML_AUTHN_STATEMENT";
|
/**
|
||||||
protected RealmModel realm;
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
protected EventBuilder event;
|
* @version $Revision: 1 $
|
||||||
protected SAMLIdentityProviderConfig config;
|
*/
|
||||||
protected IdentityProvider.AuthenticationCallback callback;
|
public class SAMLEndpoint {
|
||||||
protected SAMLIdentityProvider provider;
|
protected static final Logger logger = Logger.getLogger(SAMLEndpoint.class);
|
||||||
|
public static final String SAML_FEDERATED_SESSION_INDEX = "SAML_FEDERATED_SESSION_INDEX";
|
||||||
@Context
|
public static final String SAML_FEDERATED_SUBJECT = "SAML_FEDERATED_SUBJECT";
|
||||||
private UriInfo uriInfo;
|
public static final String SAML_FEDERATED_SUBJECT_NAMEFORMAT = "SAML_FEDERATED_SUBJECT_NAMEFORMAT";
|
||||||
|
public static final String SAML_LOGIN_RESPONSE = "SAML_LOGIN_RESPONSE";
|
||||||
@Context
|
public static final String SAML_ASSERTION = "SAML_ASSERTION";
|
||||||
private KeycloakSession session;
|
public static final String SAML_AUTHN_STATEMENT = "SAML_AUTHN_STATEMENT";
|
||||||
|
protected RealmModel realm;
|
||||||
@Context
|
protected EventBuilder event;
|
||||||
private ClientConnection clientConnection;
|
protected SAMLIdentityProviderConfig config;
|
||||||
|
protected IdentityProvider.AuthenticationCallback callback;
|
||||||
@Context
|
protected SAMLIdentityProvider provider;
|
||||||
private HttpHeaders headers;
|
|
||||||
|
@Context
|
||||||
|
private UriInfo uriInfo;
|
||||||
public SAMLEndpoint(RealmModel realm, SAMLIdentityProvider provider, SAMLIdentityProviderConfig config, IdentityProvider.AuthenticationCallback callback) {
|
|
||||||
this.realm = realm;
|
@Context
|
||||||
this.config = config;
|
private KeycloakSession session;
|
||||||
this.callback = callback;
|
|
||||||
this.provider = provider;
|
@Context
|
||||||
}
|
private ClientConnection clientConnection;
|
||||||
|
|
||||||
@GET
|
@Context
|
||||||
public Response redirectBinding(@QueryParam(GeneralConstants.SAML_REQUEST_KEY) String samlRequest,
|
private HttpHeaders headers;
|
||||||
@QueryParam(GeneralConstants.SAML_RESPONSE_KEY) String samlResponse,
|
|
||||||
@QueryParam(GeneralConstants.RELAY_STATE) String relayState) {
|
|
||||||
return new RedirectBinding().execute(samlRequest, samlResponse, relayState);
|
public SAMLEndpoint(RealmModel realm, SAMLIdentityProvider provider, SAMLIdentityProviderConfig config, IdentityProvider.AuthenticationCallback callback) {
|
||||||
}
|
this.realm = realm;
|
||||||
|
this.config = config;
|
||||||
|
this.callback = callback;
|
||||||
/**
|
this.provider = provider;
|
||||||
*/
|
}
|
||||||
@POST
|
|
||||||
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
|
@GET
|
||||||
public Response postBinding(@FormParam(GeneralConstants.SAML_REQUEST_KEY) String samlRequest,
|
public Response redirectBinding(@QueryParam(GeneralConstants.SAML_REQUEST_KEY) String samlRequest,
|
||||||
@FormParam(GeneralConstants.SAML_RESPONSE_KEY) String samlResponse,
|
@QueryParam(GeneralConstants.SAML_RESPONSE_KEY) String samlResponse,
|
||||||
@FormParam(GeneralConstants.RELAY_STATE) String relayState) {
|
@QueryParam(GeneralConstants.RELAY_STATE) String relayState) {
|
||||||
return new PostBinding().execute(samlRequest, samlResponse, relayState);
|
return new RedirectBinding().execute(samlRequest, samlResponse, relayState);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract class Binding {
|
|
||||||
private boolean checkSsl() {
|
/**
|
||||||
if (uriInfo.getBaseUri().getScheme().equals("https")) {
|
*/
|
||||||
return true;
|
@POST
|
||||||
} else {
|
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
|
||||||
return !realm.getSslRequired().isRequired(clientConnection);
|
public Response postBinding(@FormParam(GeneralConstants.SAML_REQUEST_KEY) String samlRequest,
|
||||||
}
|
@FormParam(GeneralConstants.SAML_RESPONSE_KEY) String samlResponse,
|
||||||
}
|
@FormParam(GeneralConstants.RELAY_STATE) String relayState) {
|
||||||
|
return new PostBinding().execute(samlRequest, samlResponse, relayState);
|
||||||
protected Response basicChecks(String samlRequest, String samlResponse) {
|
}
|
||||||
if (!checkSsl()) {
|
|
||||||
event.event(EventType.LOGIN);
|
protected abstract class Binding {
|
||||||
event.error(Errors.SSL_REQUIRED);
|
private boolean checkSsl() {
|
||||||
return ErrorPage.error(session, Messages.HTTPS_REQUIRED);
|
if (uriInfo.getBaseUri().getScheme().equals("https")) {
|
||||||
}
|
return true;
|
||||||
if (!realm.isEnabled()) {
|
} else {
|
||||||
event.event(EventType.LOGIN_ERROR);
|
return !realm.getSslRequired().isRequired(clientConnection);
|
||||||
event.error(Errors.REALM_DISABLED);
|
}
|
||||||
return ErrorPage.error(session, Messages.REALM_NOT_ENABLED);
|
}
|
||||||
}
|
|
||||||
|
protected Response basicChecks(String samlRequest, String samlResponse) {
|
||||||
if (samlRequest == null && samlResponse == null) {
|
if (!checkSsl()) {
|
||||||
event.event(EventType.LOGIN);
|
event.event(EventType.LOGIN);
|
||||||
event.error(Errors.INVALID_REQUEST);
|
event.error(Errors.SSL_REQUIRED);
|
||||||
return ErrorPage.error(session, Messages.INVALID_REQUEST);
|
return ErrorPage.error(session, Messages.HTTPS_REQUIRED);
|
||||||
|
}
|
||||||
}
|
if (!realm.isEnabled()) {
|
||||||
return null;
|
event.event(EventType.LOGIN_ERROR);
|
||||||
}
|
event.error(Errors.REALM_DISABLED);
|
||||||
|
return ErrorPage.error(session, Messages.REALM_NOT_ENABLED);
|
||||||
protected abstract String getBindingType();
|
}
|
||||||
protected abstract void verifySignature(String key, SAMLDocumentHolder documentHolder) throws VerificationException;
|
|
||||||
protected abstract SAMLDocumentHolder extractRequestDocument(String samlRequest);
|
if (samlRequest == null && samlResponse == null) {
|
||||||
protected abstract SAMLDocumentHolder extractResponseDocument(String response);
|
event.event(EventType.LOGIN);
|
||||||
protected PublicKey getIDPKey() {
|
event.error(Errors.INVALID_REQUEST);
|
||||||
X509Certificate certificate = null;
|
return ErrorPage.error(session, Messages.INVALID_REQUEST);
|
||||||
try {
|
|
||||||
certificate = XMLSignatureUtil.getX509CertificateFromKeyInfoString(config.getSigningCertificate().replaceAll("\\s", ""));
|
}
|
||||||
} catch (ProcessingException e) {
|
return null;
|
||||||
throw new RuntimeException(e);
|
}
|
||||||
}
|
|
||||||
return certificate.getPublicKey();
|
protected abstract String getBindingType();
|
||||||
}
|
protected abstract void verifySignature(SAMLDocumentHolder documentHolder) throws VerificationException;
|
||||||
|
protected abstract SAMLDocumentHolder extractRequestDocument(String samlRequest);
|
||||||
public Response execute(String samlRequest, String samlResponse, String relayState) {
|
protected abstract SAMLDocumentHolder extractResponseDocument(String response);
|
||||||
event = new EventBuilder(realm, session, clientConnection);
|
protected PublicKey getIDPKey() {
|
||||||
Response response = basicChecks(samlRequest, samlResponse);
|
X509Certificate certificate = null;
|
||||||
if (response != null) return response;
|
try {
|
||||||
if (samlRequest != null) return handleSamlRequest(samlRequest, relayState);
|
certificate = XMLSignatureUtil.getX509CertificateFromKeyInfoString(config.getSigningCertificate().replaceAll("\\s", ""));
|
||||||
else return handleSamlResponse(samlResponse, relayState);
|
} catch (ProcessingException e) {
|
||||||
}
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
protected Response handleSamlRequest(String samlRequest, String relayState) {
|
return certificate.getPublicKey();
|
||||||
SAMLDocumentHolder holder = extractRequestDocument(samlRequest);
|
}
|
||||||
RequestAbstractType requestAbstractType = (RequestAbstractType) holder.getSamlObject();
|
|
||||||
// validate destination
|
public Response execute(String samlRequest, String samlResponse, String relayState) {
|
||||||
if (requestAbstractType.getDestination() != null && !uriInfo.getAbsolutePath().equals(requestAbstractType.getDestination())) {
|
event = new EventBuilder(realm, session, clientConnection);
|
||||||
event.event(EventType.IDENTITY_PROVIDER_RESPONSE);
|
Response response = basicChecks(samlRequest, samlResponse);
|
||||||
event.detail(Details.REASON, "invalid_destination");
|
if (response != null) return response;
|
||||||
event.error(Errors.INVALID_SAML_RESPONSE);
|
if (samlRequest != null) return handleSamlRequest(samlRequest, relayState);
|
||||||
return ErrorPage.error(session, Messages.INVALID_REQUEST);
|
else return handleSamlResponse(samlResponse, relayState);
|
||||||
}
|
}
|
||||||
if (config.isValidateSignature()) {
|
|
||||||
try {
|
protected Response handleSamlRequest(String samlRequest, String relayState) {
|
||||||
verifySignature(GeneralConstants.SAML_REQUEST_KEY, holder);
|
SAMLDocumentHolder holder = extractRequestDocument(samlRequest);
|
||||||
} catch (VerificationException e) {
|
RequestAbstractType requestAbstractType = (RequestAbstractType) holder.getSamlObject();
|
||||||
logger.error("validation failed", e);
|
// validate destination
|
||||||
event.event(EventType.IDENTITY_PROVIDER_RESPONSE);
|
if (!uriInfo.getAbsolutePath().equals(requestAbstractType.getDestination())) {
|
||||||
event.error(Errors.INVALID_SIGNATURE);
|
event.event(EventType.IDENTITY_PROVIDER_RESPONSE);
|
||||||
return ErrorPage.error(session, Messages.INVALID_REQUESTER);
|
event.error(Errors.INVALID_SAML_RESPONSE);
|
||||||
}
|
event.detail(Details.REASON, "invalid_destination");
|
||||||
}
|
return ErrorPage.error(session, Messages.INVALID_REQUEST);
|
||||||
|
}
|
||||||
if (requestAbstractType instanceof LogoutRequestType) {
|
if (config.isValidateSignature()) {
|
||||||
logger.debug("** logout request");
|
try {
|
||||||
event.event(EventType.LOGOUT);
|
verifySignature(holder);
|
||||||
LogoutRequestType logout = (LogoutRequestType) requestAbstractType;
|
} catch (VerificationException e) {
|
||||||
return logoutRequest(logout, relayState);
|
logger.error("validation failed", e);
|
||||||
|
event.event(EventType.IDENTITY_PROVIDER_RESPONSE);
|
||||||
} else {
|
event.error(Errors.INVALID_SIGNATURE);
|
||||||
event.event(EventType.LOGIN);
|
return ErrorPage.error(session, Messages.INVALID_REQUESTER);
|
||||||
event.error(Errors.INVALID_TOKEN);
|
}
|
||||||
return ErrorPage.error(session, Messages.INVALID_REQUEST);
|
}
|
||||||
}
|
|
||||||
}
|
if (requestAbstractType instanceof LogoutRequestType) {
|
||||||
|
logger.debug("** logout request");
|
||||||
protected Response logoutRequest(LogoutRequestType request, String relayState) {
|
event.event(EventType.LOGOUT);
|
||||||
String brokerUserId = config.getAlias() + "." + request.getNameID().getValue();
|
LogoutRequestType logout = (LogoutRequestType) requestAbstractType;
|
||||||
if (request.getSessionIndex() == null || request.getSessionIndex().isEmpty()) {
|
return logoutRequest(logout, relayState);
|
||||||
List<UserSessionModel> userSessions = session.sessions().getUserSessionByBrokerUserId(realm, brokerUserId);
|
|
||||||
for (UserSessionModel userSession : userSessions) {
|
} else {
|
||||||
if (userSession.getState() == UserSessionModel.State.LOGGING_OUT || userSession.getState() == UserSessionModel.State.LOGGED_OUT) {
|
event.event(EventType.LOGIN);
|
||||||
continue;
|
event.error(Errors.INVALID_TOKEN);
|
||||||
}
|
return ErrorPage.error(session, Messages.INVALID_REQUEST);
|
||||||
try {
|
}
|
||||||
AuthenticationManager.backchannelLogout(session, realm, userSession, uriInfo, clientConnection, headers, false);
|
}
|
||||||
} catch (Exception e) {
|
|
||||||
logger.warn("failed to do backchannel logout for userSession", e);
|
protected Response logoutRequest(LogoutRequestType request, String relayState) {
|
||||||
}
|
String brokerUserId = config.getAlias() + "." + request.getNameID().getValue();
|
||||||
}
|
if (request.getSessionIndex() == null || request.getSessionIndex().isEmpty()) {
|
||||||
|
List<UserSessionModel> userSessions = session.sessions().getUserSessionByBrokerUserId(realm, brokerUserId);
|
||||||
} else {
|
for (UserSessionModel userSession : userSessions) {
|
||||||
for (String sessionIndex : request.getSessionIndex()) {
|
try {
|
||||||
String brokerSessionId = brokerUserId + "." + sessionIndex;
|
AuthenticationManager.backchannelLogout(session, realm, userSession, uriInfo, clientConnection, headers, false);
|
||||||
UserSessionModel userSession = session.sessions().getUserSessionByBrokerSessionId(realm, brokerSessionId);
|
} catch (Exception e) {
|
||||||
if (userSession != null) {
|
logger.warn("failed to do backchannel logout for userSession", e);
|
||||||
if (userSession.getState() == UserSessionModel.State.LOGGING_OUT || userSession.getState() == UserSessionModel.State.LOGGED_OUT) {
|
}
|
||||||
continue;
|
}
|
||||||
}
|
|
||||||
try {
|
} else {
|
||||||
AuthenticationManager.backchannelLogout(session, realm, userSession, uriInfo, clientConnection, headers, false);
|
for (String sessionIndex : request.getSessionIndex()) {
|
||||||
} catch (Exception e) {
|
String brokerSessionId = brokerUserId + "." + sessionIndex;
|
||||||
logger.warn("failed to do backchannel logout for userSession", e);
|
UserSessionModel userSession = session.sessions().getUserSessionByBrokerSessionId(realm, brokerSessionId);
|
||||||
}
|
if (userSession != null) {
|
||||||
}
|
try {
|
||||||
}
|
AuthenticationManager.backchannelLogout(session, realm, userSession, uriInfo, clientConnection, headers, false);
|
||||||
}
|
} catch (Exception e) {
|
||||||
|
logger.warn("failed to do backchannel logout for userSession", e);
|
||||||
String issuerURL = getEntityId(uriInfo, realm);
|
}
|
||||||
SAML2LogoutResponseBuilder builder = new SAML2LogoutResponseBuilder();
|
}
|
||||||
builder.logoutRequestID(request.getID());
|
}
|
||||||
builder.destination(config.getSingleLogoutServiceUrl());
|
}
|
||||||
builder.issuer(issuerURL);
|
|
||||||
JaxrsSAML2BindingBuilder binding = new JaxrsSAML2BindingBuilder()
|
String issuerURL = getEntityId(uriInfo, realm);
|
||||||
.relayState(relayState);
|
SAML2LogoutResponseBuilder builder = new SAML2LogoutResponseBuilder();
|
||||||
if (config.isWantAuthnRequestsSigned()) {
|
builder.logoutRequestID(request.getID());
|
||||||
binding.signWith(realm.getPrivateKey(), realm.getPublicKey(), realm.getCertificate())
|
builder.destination(config.getSingleLogoutServiceUrl());
|
||||||
.signatureAlgorithm(provider.getSignatureAlgorithm())
|
builder.issuer(issuerURL);
|
||||||
.signDocument();
|
builder.relayState(relayState);
|
||||||
}
|
if (config.isWantAuthnRequestsSigned()) {
|
||||||
try {
|
builder.signWith(realm.getPrivateKey(), realm.getPublicKey(), realm.getCertificate())
|
||||||
if (config.isPostBindingResponse()) {
|
.signDocument();
|
||||||
return binding.postBinding(builder.buildDocument()).response(config.getSingleLogoutServiceUrl());
|
}
|
||||||
} else {
|
try {
|
||||||
return binding.redirectBinding(builder.buildDocument()).response(config.getSingleLogoutServiceUrl());
|
if (config.isPostBindingResponse()) {
|
||||||
}
|
return builder.postBinding().response();
|
||||||
} catch (ConfigurationException e) {
|
} else {
|
||||||
throw new RuntimeException(e);
|
return builder.redirectBinding().response();
|
||||||
} catch (ProcessingException e) {
|
}
|
||||||
throw new RuntimeException(e);
|
} catch (ConfigurationException e) {
|
||||||
} catch (IOException e) {
|
throw new RuntimeException(e);
|
||||||
throw new RuntimeException(e);
|
} catch (ProcessingException e) {
|
||||||
}
|
throw new RuntimeException(e);
|
||||||
|
} catch (IOException e) {
|
||||||
}
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
private String getEntityId(UriInfo uriInfo, RealmModel realm) {
|
|
||||||
return UriBuilder.fromUri(uriInfo.getBaseUri()).path("realms").path(realm.getName()).build().toString();
|
}
|
||||||
}
|
|
||||||
protected Response handleLoginResponse(String samlResponse, SAMLDocumentHolder holder, ResponseType responseType, String relayState) {
|
private String getEntityId(UriInfo uriInfo, RealmModel realm) {
|
||||||
|
return UriBuilder.fromUri(uriInfo.getBaseUri()).path("realms").path(realm.getName()).build().toString();
|
||||||
try {
|
}
|
||||||
AssertionType assertion = AssertionUtil.getAssertion(responseType, realm.getPrivateKey());
|
protected Response handleLoginResponse(String samlResponse, SAMLDocumentHolder holder, ResponseType responseType, String relayState) {
|
||||||
SubjectType subject = assertion.getSubject();
|
|
||||||
SubjectType.STSubType subType = subject.getSubType();
|
try {
|
||||||
NameIDType subjectNameID = (NameIDType) subType.getBaseID();
|
AssertionType assertion = getAssertion(responseType);
|
||||||
//Map<String, String> notes = new HashMap<>();
|
SubjectType subject = assertion.getSubject();
|
||||||
BrokeredIdentityContext identity = new BrokeredIdentityContext(subjectNameID.getValue());
|
SubjectType.STSubType subType = subject.getSubType();
|
||||||
identity.setCode(relayState);
|
NameIDType subjectNameID = (NameIDType) subType.getBaseID();
|
||||||
identity.getContextData().put(SAML_LOGIN_RESPONSE, responseType);
|
//Map<String, String> notes = new HashMap<>();
|
||||||
identity.getContextData().put(SAML_ASSERTION, assertion);
|
BrokeredIdentityContext identity = new BrokeredIdentityContext(subjectNameID.getValue());
|
||||||
|
identity.setCode(relayState);
|
||||||
identity.setUsername(subjectNameID.getValue());
|
identity.getContextData().put(SAML_LOGIN_RESPONSE, responseType);
|
||||||
|
identity.getContextData().put(SAML_ASSERTION, assertion);
|
||||||
//SAML Spec 2.2.2 Format is optional
|
|
||||||
if (subjectNameID.getFormat() != null && subjectNameID.getFormat().toString().equals(JBossSAMLURIConstants.NAMEID_FORMAT_EMAIL.get())) {
|
identity.setUsername(subjectNameID.getValue());
|
||||||
identity.setEmail(subjectNameID.getValue());
|
|
||||||
}
|
if (subjectNameID.getFormat().toString().equals(JBossSAMLURIConstants.NAMEID_FORMAT_EMAIL.get())) {
|
||||||
|
identity.setEmail(subjectNameID.getValue());
|
||||||
if (config.isStoreToken()) {
|
}
|
||||||
identity.setToken(samlResponse);
|
|
||||||
}
|
if (config.isStoreToken()) {
|
||||||
|
identity.setToken(samlResponse);
|
||||||
AuthnStatementType authn = null;
|
}
|
||||||
for (Object statement : assertion.getStatements()) {
|
|
||||||
if (statement instanceof AuthnStatementType) {
|
AuthnStatementType authn = null;
|
||||||
authn = (AuthnStatementType)statement;
|
for (Object statement : assertion.getStatements()) {
|
||||||
identity.getContextData().put(SAML_AUTHN_STATEMENT, authn);
|
if (statement instanceof AuthnStatementType) {
|
||||||
break;
|
authn = (AuthnStatementType)statement;
|
||||||
}
|
identity.getContextData().put(SAML_AUTHN_STATEMENT, authn);
|
||||||
}
|
break;
|
||||||
if (assertion.getAttributeStatements() != null ) {
|
}
|
||||||
for (AttributeStatementType attrStatement : assertion.getAttributeStatements()) {
|
}
|
||||||
for (AttributeStatementType.ASTChoiceType choice : attrStatement.getAttributes()) {
|
if (assertion.getAttributeStatements() != null ) {
|
||||||
AttributeType attribute = choice.getAttribute();
|
for (AttributeStatementType attrStatement : assertion.getAttributeStatements()) {
|
||||||
if (X500SAMLProfileConstants.EMAIL.getFriendlyName().equals(attribute.getFriendlyName())
|
for (AttributeStatementType.ASTChoiceType choice : attrStatement.getAttributes()) {
|
||||||
|| X500SAMLProfileConstants.EMAIL.get().equals(attribute.getName())) {
|
AttributeType attribute = choice.getAttribute();
|
||||||
if (!attribute.getAttributeValue().isEmpty()) identity.setEmail(attribute.getAttributeValue().get(0).toString());
|
if (X500SAMLProfileConstants.EMAIL.getFriendlyName().equals(attribute.getFriendlyName())
|
||||||
}
|
|| X500SAMLProfileConstants.EMAIL.get().equals(attribute.getName())) {
|
||||||
}
|
if (!attribute.getAttributeValue().isEmpty()) identity.setEmail(attribute.getAttributeValue().get(0).toString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
String brokerUserId = config.getAlias() + "." + subjectNameID.getValue();
|
|
||||||
identity.setBrokerUserId(brokerUserId);
|
}
|
||||||
identity.setIdpConfig(config);
|
String brokerUserId = config.getAlias() + "." + subjectNameID.getValue();
|
||||||
identity.setIdp(provider);
|
identity.setBrokerUserId(brokerUserId);
|
||||||
if (authn != null && authn.getSessionIndex() != null) {
|
identity.setIdpConfig(config);
|
||||||
identity.setBrokerSessionId(identity.getBrokerUserId() + "." + authn.getSessionIndex());
|
identity.setIdp(provider);
|
||||||
}
|
if (authn != null && authn.getSessionIndex() != null) {
|
||||||
|
identity.setBrokerSessionId(identity.getBrokerUserId() + "." + authn.getSessionIndex());
|
||||||
|
}
|
||||||
return callback.authenticated(identity);
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
return callback.authenticated(identity);
|
||||||
throw new IdentityBrokerException("Could not process response from SAML identity provider.", e);
|
|
||||||
}
|
} catch (Exception e) {
|
||||||
}
|
throw new IdentityBrokerException("Could not process response from SAML identity provider.", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public Response handleSamlResponse(String samlResponse, String relayState) {
|
|
||||||
SAMLDocumentHolder holder = extractResponseDocument(samlResponse);
|
private AssertionType getAssertion(ResponseType responseType) throws ProcessingException {
|
||||||
StatusResponseType statusResponse = (StatusResponseType)holder.getSamlObject();
|
List<ResponseType.RTChoiceType> assertions = responseType.getAssertions();
|
||||||
// validate destination
|
|
||||||
if (statusResponse.getDestination() != null && !uriInfo.getAbsolutePath().toString().equals(statusResponse.getDestination())) {
|
if (assertions.isEmpty()) {
|
||||||
event.event(EventType.IDENTITY_PROVIDER_RESPONSE);
|
throw new IdentityBrokerException("No assertion from response.");
|
||||||
event.detail(Details.REASON, "invalid_destination");
|
}
|
||||||
event.error(Errors.INVALID_SAML_RESPONSE);
|
|
||||||
return ErrorPage.error(session, Messages.INVALID_FEDERATED_IDENTITY_ACTION);
|
ResponseType.RTChoiceType rtChoiceType = assertions.get(0);
|
||||||
}
|
EncryptedAssertionType encryptedAssertion = rtChoiceType.getEncryptedAssertion();
|
||||||
if (config.isValidateSignature()) {
|
|
||||||
try {
|
if (encryptedAssertion != null) {
|
||||||
verifySignature(GeneralConstants.SAML_RESPONSE_KEY, holder);
|
decryptAssertion(responseType, realm.getPrivateKey());
|
||||||
} catch (VerificationException e) {
|
|
||||||
logger.error("validation failed", e);
|
}
|
||||||
event.event(EventType.IDENTITY_PROVIDER_RESPONSE);
|
return responseType.getAssertions().get(0).getAssertion();
|
||||||
event.error(Errors.INVALID_SIGNATURE);
|
}
|
||||||
return ErrorPage.error(session, Messages.INVALID_FEDERATED_IDENTITY_ACTION);
|
|
||||||
}
|
public Response handleSamlResponse(String samlResponse, String relayState) {
|
||||||
}
|
SAMLDocumentHolder holder = extractResponseDocument(samlResponse);
|
||||||
if (statusResponse instanceof ResponseType) {
|
StatusResponseType statusResponse = (StatusResponseType)holder.getSamlObject();
|
||||||
return handleLoginResponse(samlResponse, holder, (ResponseType)statusResponse, relayState);
|
// validate destination
|
||||||
|
if (!uriInfo.getAbsolutePath().toString().equals(statusResponse.getDestination())) {
|
||||||
} else {
|
event.event(EventType.IDENTITY_PROVIDER_RESPONSE);
|
||||||
// todo need to check that it is actually a LogoutResponse
|
event.error(Errors.INVALID_SAML_RESPONSE);
|
||||||
return handleLogoutResponse(holder, statusResponse, relayState);
|
event.detail(Details.REASON, "invalid_destination");
|
||||||
}
|
return ErrorPage.error(session, Messages.INVALID_FEDERATED_IDENTITY_ACTION);
|
||||||
//throw new RuntimeException("Unknown response type");
|
}
|
||||||
|
if (config.isValidateSignature()) {
|
||||||
}
|
try {
|
||||||
|
verifySignature(holder);
|
||||||
protected Response handleLogoutResponse(SAMLDocumentHolder holder, StatusResponseType responseType, String relayState) {
|
} catch (VerificationException e) {
|
||||||
if (relayState == null) {
|
logger.error("validation failed", e);
|
||||||
logger.error("no valid user session");
|
event.event(EventType.IDENTITY_PROVIDER_RESPONSE);
|
||||||
event.event(EventType.LOGOUT);
|
event.error(Errors.INVALID_SIGNATURE);
|
||||||
event.error(Errors.USER_SESSION_NOT_FOUND);
|
return ErrorPage.error(session, Messages.INVALID_FEDERATED_IDENTITY_ACTION);
|
||||||
return ErrorPage.error(session, Messages.IDENTITY_PROVIDER_UNEXPECTED_ERROR);
|
}
|
||||||
}
|
}
|
||||||
UserSessionModel userSession = session.sessions().getUserSession(realm, relayState);
|
if (statusResponse instanceof ResponseType) {
|
||||||
if (userSession == null) {
|
return handleLoginResponse(samlResponse, holder, (ResponseType)statusResponse, relayState);
|
||||||
logger.error("no valid user session");
|
|
||||||
event.event(EventType.LOGOUT);
|
} else {
|
||||||
event.error(Errors.USER_SESSION_NOT_FOUND);
|
// todo need to check that it is actually a LogoutResponse
|
||||||
return ErrorPage.error(session, Messages.IDENTITY_PROVIDER_UNEXPECTED_ERROR);
|
return handleLogoutResponse(holder, statusResponse, relayState);
|
||||||
}
|
}
|
||||||
if (userSession.getState() != UserSessionModel.State.LOGGING_OUT) {
|
//throw new RuntimeException("Unknown response type");
|
||||||
logger.error("usersession in different state");
|
|
||||||
event.event(EventType.LOGOUT);
|
}
|
||||||
event.error(Errors.USER_SESSION_NOT_FOUND);
|
|
||||||
return ErrorPage.error(session, Messages.SESSION_NOT_ACTIVE);
|
protected Response handleLogoutResponse(SAMLDocumentHolder holder, StatusResponseType responseType, String relayState) {
|
||||||
}
|
if (relayState == null) {
|
||||||
return AuthenticationManager.finishBrowserLogout(session, realm, userSession, uriInfo, clientConnection, headers);
|
logger.error("no valid user session");
|
||||||
}
|
event.event(EventType.LOGOUT);
|
||||||
|
event.error(Errors.USER_SESSION_NOT_FOUND);
|
||||||
|
return ErrorPage.error(session, Messages.IDENTITY_PROVIDER_UNEXPECTED_ERROR);
|
||||||
|
}
|
||||||
|
UserSessionModel userSession = session.sessions().getUserSession(realm, relayState);
|
||||||
|
if (userSession == null) {
|
||||||
}
|
logger.error("no valid user session");
|
||||||
|
event.event(EventType.LOGOUT);
|
||||||
protected class PostBinding extends Binding {
|
event.error(Errors.USER_SESSION_NOT_FOUND);
|
||||||
@Override
|
return ErrorPage.error(session, Messages.IDENTITY_PROVIDER_UNEXPECTED_ERROR);
|
||||||
protected void verifySignature(String key, SAMLDocumentHolder documentHolder) throws VerificationException {
|
}
|
||||||
SamlProtocolUtils.verifyDocumentSignature(documentHolder.getSamlDocument(), getIDPKey());
|
if (userSession.getState() != UserSessionModel.State.LOGGING_OUT) {
|
||||||
}
|
logger.error("usersession in different state");
|
||||||
|
event.event(EventType.LOGOUT);
|
||||||
@Override
|
event.error(Errors.USER_SESSION_NOT_FOUND);
|
||||||
protected SAMLDocumentHolder extractRequestDocument(String samlRequest) {
|
return ErrorPage.error(session, Messages.SESSION_NOT_ACTIVE);
|
||||||
return SAMLRequestParser.parseRequestPostBinding(samlRequest);
|
}
|
||||||
}
|
return AuthenticationManager.finishBrowserLogout(session, realm, userSession, uriInfo, clientConnection, headers);
|
||||||
@Override
|
}
|
||||||
protected SAMLDocumentHolder extractResponseDocument(String response) {
|
|
||||||
byte[] samlBytes = PostBindingUtil.base64Decode(response);
|
|
||||||
String xml = new String(samlBytes);
|
protected ResponseType decryptAssertion(ResponseType responseType, PrivateKey privateKey) throws ProcessingException {
|
||||||
return SAMLRequestParser.parseResponseDocument(samlBytes);
|
SAML2Response saml2Response = new SAML2Response();
|
||||||
}
|
|
||||||
|
try {
|
||||||
@Override
|
Document doc = saml2Response.convert(responseType);
|
||||||
protected String getBindingType() {
|
Element enc = DocumentUtil.getElement(doc, new QName(JBossSAMLConstants.ENCRYPTED_ASSERTION.get()));
|
||||||
return SamlProtocol.SAML_POST_BINDING;
|
|
||||||
}
|
if (enc == null) {
|
||||||
}
|
throw new IdentityBrokerException("No encrypted assertion found.");
|
||||||
|
}
|
||||||
protected class RedirectBinding extends Binding {
|
|
||||||
@Override
|
String oldID = enc.getAttribute(JBossSAMLConstants.ID.get());
|
||||||
protected void verifySignature(String key, SAMLDocumentHolder documentHolder) throws VerificationException {
|
Document newDoc = DocumentUtil.createDocument();
|
||||||
PublicKey publicKey = getIDPKey();
|
Node importedNode = newDoc.importNode(enc, true);
|
||||||
SamlProtocolUtils.verifyRedirectSignature(publicKey, uriInfo, key);
|
newDoc.appendChild(importedNode);
|
||||||
}
|
|
||||||
|
Element decryptedDocumentElement = XMLEncryptionUtil.decryptElementInDocument(newDoc, privateKey);
|
||||||
|
SAMLParser parser = new SAMLParser();
|
||||||
|
|
||||||
@Override
|
JAXPValidationUtil.checkSchemaValidation(decryptedDocumentElement);
|
||||||
protected SAMLDocumentHolder extractRequestDocument(String samlRequest) {
|
AssertionType assertion = (AssertionType) parser.parse(StaxParserUtil.getXMLEventReader(DocumentUtil
|
||||||
return SAMLRequestParser.parseRequestRedirectBinding(samlRequest);
|
.getNodeAsStream(decryptedDocumentElement)));
|
||||||
}
|
|
||||||
|
responseType.replaceAssertion(oldID, new ResponseType.RTChoiceType(assertion));
|
||||||
@Override
|
|
||||||
protected SAMLDocumentHolder extractResponseDocument(String response) {
|
return responseType;
|
||||||
return SAMLRequestParser.parseRequestRedirectBinding(response);
|
} catch (Exception e) {
|
||||||
}
|
throw new IdentityBrokerException("Could not decrypt assertion.", e);
|
||||||
|
}
|
||||||
@Override
|
}
|
||||||
protected String getBindingType() {
|
|
||||||
return SamlProtocol.SAML_REDIRECT_BINDING;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
protected class PostBinding extends Binding {
|
||||||
|
@Override
|
||||||
}
|
protected void verifySignature(SAMLDocumentHolder documentHolder) throws VerificationException {
|
||||||
|
SamlProtocolUtils.verifyDocumentSignature(documentHolder.getSamlDocument(), getIDPKey());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SAMLDocumentHolder extractRequestDocument(String samlRequest) {
|
||||||
|
return SAMLRequestParser.parseRequestPostBinding(samlRequest);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected SAMLDocumentHolder extractResponseDocument(String response) {
|
||||||
|
byte[] samlBytes = PostBindingUtil.base64Decode(response);
|
||||||
|
String xml = new String(samlBytes);
|
||||||
|
return SAMLRequestParser.parseResponseDocument(samlBytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getBindingType() {
|
||||||
|
return SamlProtocol.SAML_POST_BINDING;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected class RedirectBinding extends Binding {
|
||||||
|
@Override
|
||||||
|
protected void verifySignature(SAMLDocumentHolder documentHolder) throws VerificationException {
|
||||||
|
PublicKey publicKey = getIDPKey();
|
||||||
|
SamlProtocolUtils.verifyRedirectSignature(publicKey, uriInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SAMLDocumentHolder extractRequestDocument(String samlRequest) {
|
||||||
|
return SAMLRequestParser.parseRequestRedirectBinding(samlRequest);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected SAMLDocumentHolder extractResponseDocument(String response) {
|
||||||
|
return SAMLRequestParser.parseRequestRedirectBinding(response);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String getBindingType() {
|
||||||
|
return SamlProtocol.SAML_REDIRECT_BINDING;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -33,18 +33,20 @@ import org.keycloak.models.ClientSessionModel;
|
|||||||
import org.keycloak.models.FederatedIdentityModel;
|
import org.keycloak.models.FederatedIdentityModel;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.RealmModel;
|
||||||
import org.keycloak.models.UserSessionModel;
|
import org.keycloak.models.UserSessionModel;
|
||||||
import org.keycloak.protocol.saml.JaxrsSAML2BindingBuilder;
|
import org.keycloak.protocol.saml.SAML2AuthnRequestBuilder;
|
||||||
import org.keycloak.saml.SAML2AuthnRequestBuilder;
|
import org.keycloak.protocol.saml.SAML2LogoutRequestBuilder;
|
||||||
import org.keycloak.saml.SAML2LogoutRequestBuilder;
|
import org.keycloak.protocol.saml.SAML2NameIDPolicyBuilder;
|
||||||
import org.keycloak.saml.SAML2NameIDPolicyBuilder;
|
|
||||||
import org.keycloak.saml.SignatureAlgorithm;
|
|
||||||
import org.keycloak.saml.common.constants.GeneralConstants;
|
import org.keycloak.saml.common.constants.GeneralConstants;
|
||||||
import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
|
import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
|
||||||
|
import org.keycloak.saml.common.exceptions.ConfigurationException;
|
||||||
|
import org.keycloak.saml.common.exceptions.ParsingException;
|
||||||
|
import org.keycloak.saml.common.exceptions.ProcessingException;
|
||||||
|
|
||||||
import javax.ws.rs.core.MediaType;
|
import javax.ws.rs.core.MediaType;
|
||||||
import javax.ws.rs.core.Response;
|
import javax.ws.rs.core.Response;
|
||||||
import javax.ws.rs.core.UriBuilder;
|
import javax.ws.rs.core.UriBuilder;
|
||||||
import javax.ws.rs.core.UriInfo;
|
import javax.ws.rs.core.UriInfo;
|
||||||
|
import java.io.IOException;
|
||||||
import java.security.KeyPair;
|
import java.security.KeyPair;
|
||||||
import java.security.PrivateKey;
|
import java.security.PrivateKey;
|
||||||
import java.security.PublicKey;
|
import java.security.PublicKey;
|
||||||
@@ -90,8 +92,7 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
|
|||||||
.issuer(issuerURL)
|
.issuer(issuerURL)
|
||||||
.forceAuthn(getConfig().isForceAuthn())
|
.forceAuthn(getConfig().isForceAuthn())
|
||||||
.protocolBinding(protocolBinding)
|
.protocolBinding(protocolBinding)
|
||||||
.nameIdPolicy(SAML2NameIDPolicyBuilder.format(nameIDPolicyFormat));
|
.nameIdPolicy(SAML2NameIDPolicyBuilder.format(nameIDPolicyFormat))
|
||||||
JaxrsSAML2BindingBuilder binding = new JaxrsSAML2BindingBuilder()
|
|
||||||
.relayState(request.getState());
|
.relayState(request.getState());
|
||||||
|
|
||||||
if (getConfig().isWantAuthnRequestsSigned()) {
|
if (getConfig().isWantAuthnRequestsSigned()) {
|
||||||
@@ -108,15 +109,14 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
|
|||||||
|
|
||||||
KeyPair keypair = new KeyPair(publicKey, privateKey);
|
KeyPair keypair = new KeyPair(publicKey, privateKey);
|
||||||
|
|
||||||
binding.signWith(keypair);
|
authnRequestBuilder.signWith(keypair);
|
||||||
binding.signatureAlgorithm(getSignatureAlgorithm());
|
authnRequestBuilder.signDocument();
|
||||||
binding.signDocument();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getConfig().isPostBindingAuthnRequest()) {
|
if (getConfig().isPostBindingAuthnRequest()) {
|
||||||
return binding.postBinding(authnRequestBuilder.toDocument()).request(destinationUrl);
|
return authnRequestBuilder.postBinding().request();
|
||||||
} else {
|
} else {
|
||||||
return binding.redirectBinding(authnRequestBuilder.toDocument()).request(destinationUrl);
|
return authnRequestBuilder.redirectBinding().request();
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new IdentityBrokerException("Could not create authentication request.", e);
|
throw new IdentityBrokerException("Could not create authentication request.", e);
|
||||||
@@ -153,10 +153,9 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
|
|||||||
String singleLogoutServiceUrl = getConfig().getSingleLogoutServiceUrl();
|
String singleLogoutServiceUrl = getConfig().getSingleLogoutServiceUrl();
|
||||||
if (singleLogoutServiceUrl == null || singleLogoutServiceUrl.trim().equals("") || !getConfig().isBackchannelSupported()) return;
|
if (singleLogoutServiceUrl == null || singleLogoutServiceUrl.trim().equals("") || !getConfig().isBackchannelSupported()) return;
|
||||||
SAML2LogoutRequestBuilder logoutBuilder = buildLogoutRequest(userSession, uriInfo, realm, singleLogoutServiceUrl);
|
SAML2LogoutRequestBuilder logoutBuilder = buildLogoutRequest(userSession, uriInfo, realm, singleLogoutServiceUrl);
|
||||||
JaxrsSAML2BindingBuilder binding = buildLogoutBinding(userSession, realm);
|
|
||||||
try {
|
try {
|
||||||
int status = SimpleHttp.doPost(singleLogoutServiceUrl)
|
int status = SimpleHttp.doPost(singleLogoutServiceUrl)
|
||||||
.param(GeneralConstants.SAML_REQUEST_KEY, binding.postBinding(logoutBuilder.buildDocument()).encoded())
|
.param(GeneralConstants.SAML_REQUEST_KEY, logoutBuilder.postBinding().encoded())
|
||||||
.param(GeneralConstants.RELAY_STATE, userSession.getId()).asStatus();
|
.param(GeneralConstants.RELAY_STATE, userSession.getId()).asStatus();
|
||||||
boolean success = status >=200 && status < 400;
|
boolean success = status >=200 && status < 400;
|
||||||
if (!success) {
|
if (!success) {
|
||||||
@@ -179,8 +178,7 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
|
|||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
SAML2LogoutRequestBuilder logoutBuilder = buildLogoutRequest(userSession, uriInfo, realm, singleLogoutServiceUrl);
|
SAML2LogoutRequestBuilder logoutBuilder = buildLogoutRequest(userSession, uriInfo, realm, singleLogoutServiceUrl);
|
||||||
JaxrsSAML2BindingBuilder binding = buildLogoutBinding(userSession, realm);
|
return logoutBuilder.postBinding().request();
|
||||||
return binding.postBinding(logoutBuilder.buildDocument()).request(singleLogoutServiceUrl);
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
@@ -194,19 +192,13 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
|
|||||||
.issuer(getEntityId(uriInfo, realm))
|
.issuer(getEntityId(uriInfo, realm))
|
||||||
.sessionIndex(userSession.getNote(SAMLEndpoint.SAML_FEDERATED_SESSION_INDEX))
|
.sessionIndex(userSession.getNote(SAMLEndpoint.SAML_FEDERATED_SESSION_INDEX))
|
||||||
.userPrincipal(userSession.getNote(SAMLEndpoint.SAML_FEDERATED_SUBJECT), userSession.getNote(SAMLEndpoint.SAML_FEDERATED_SUBJECT_NAMEFORMAT))
|
.userPrincipal(userSession.getNote(SAMLEndpoint.SAML_FEDERATED_SUBJECT), userSession.getNote(SAMLEndpoint.SAML_FEDERATED_SUBJECT_NAMEFORMAT))
|
||||||
.destination(singleLogoutServiceUrl);
|
.destination(singleLogoutServiceUrl)
|
||||||
return logoutBuilder;
|
|
||||||
}
|
|
||||||
|
|
||||||
private JaxrsSAML2BindingBuilder buildLogoutBinding(UserSessionModel userSession, RealmModel realm) {
|
|
||||||
JaxrsSAML2BindingBuilder binding = new JaxrsSAML2BindingBuilder()
|
|
||||||
.relayState(userSession.getId());
|
.relayState(userSession.getId());
|
||||||
if (getConfig().isWantAuthnRequestsSigned()) {
|
if (getConfig().isWantAuthnRequestsSigned()) {
|
||||||
binding.signWith(realm.getPrivateKey(), realm.getPublicKey(), realm.getCertificate())
|
logoutBuilder.signWith(realm.getPrivateKey(), realm.getPublicKey(), realm.getCertificate())
|
||||||
.signatureAlgorithm(getSignatureAlgorithm())
|
|
||||||
.signDocument();
|
.signDocument();
|
||||||
}
|
}
|
||||||
return binding;
|
return logoutBuilder;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -228,7 +220,7 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
|
|||||||
|
|
||||||
|
|
||||||
String descriptor =
|
String descriptor =
|
||||||
"<EntityDescriptor xmlns=\"urn:oasis:names:tc:SAML:2.0:metadata\" entityID=\"" + getEntityId(uriInfo, realm) + "\">\n" +
|
"<EntityDescriptor entityID=\"" + getEntityId(uriInfo, realm) + "\">\n" +
|
||||||
" <SPSSODescriptor AuthnRequestsSigned=\"" + getConfig().isWantAuthnRequestsSigned() + "\"\n" +
|
" <SPSSODescriptor AuthnRequestsSigned=\"" + getConfig().isWantAuthnRequestsSigned() + "\"\n" +
|
||||||
" protocolSupportEnumeration=\"urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext\">\n" +
|
" protocolSupportEnumeration=\"urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol http://schemas.xmlsoap.org/ws/2003/07/secext\">\n" +
|
||||||
" <NameIDFormat>" + getConfig().getNameIDPolicyFormat() + "\n" +
|
" <NameIDFormat>" + getConfig().getNameIDPolicyFormat() + "\n" +
|
||||||
@@ -253,14 +245,4 @@ public class SAMLIdentityProvider extends AbstractIdentityProvider<SAMLIdentityP
|
|||||||
"</EntityDescriptor>\n";
|
"</EntityDescriptor>\n";
|
||||||
return Response.ok(descriptor, MediaType.APPLICATION_XML_TYPE).build();
|
return Response.ok(descriptor, MediaType.APPLICATION_XML_TYPE).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
public SignatureAlgorithm getSignatureAlgorithm() {
|
|
||||||
String alg = getConfig().getSignatureAlgorithm();
|
|
||||||
if (alg != null) {
|
|
||||||
SignatureAlgorithm algorithm = SignatureAlgorithm.valueOf(alg);
|
|
||||||
if (algorithm != null) return algorithm;
|
|
||||||
}
|
|
||||||
return SignatureAlgorithm.RSA_SHA256;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -87,14 +87,6 @@ public class SAMLIdentityProviderConfig extends IdentityProviderModel {
|
|||||||
getConfig().put("wantAuthnRequestsSigned", String.valueOf(wantAuthnRequestsSigned));
|
getConfig().put("wantAuthnRequestsSigned", String.valueOf(wantAuthnRequestsSigned));
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSignatureAlgorithm() {
|
|
||||||
return getConfig().get("signatureAlgorithm");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSignatureAlgorithm(String signatureAlgorithm) {
|
|
||||||
getConfig().put("signatureAlgorithm", signatureAlgorithm);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getEncryptionPublicKey() {
|
public String getEncryptionPublicKey() {
|
||||||
return getConfig().get("encryptionPublicKey");
|
return getConfig().get("encryptionPublicKey");
|
||||||
}
|
}
|
||||||
|
|||||||
+60
-69
@@ -18,17 +18,13 @@
|
|||||||
package org.keycloak.broker.saml;
|
package org.keycloak.broker.saml;
|
||||||
|
|
||||||
import org.keycloak.broker.provider.AbstractIdentityProviderFactory;
|
import org.keycloak.broker.provider.AbstractIdentityProviderFactory;
|
||||||
import org.keycloak.broker.saml.mappers.UsernameTemplateMapper;
|
|
||||||
import org.keycloak.dom.saml.v2.metadata.EndpointType;
|
import org.keycloak.dom.saml.v2.metadata.EndpointType;
|
||||||
import org.keycloak.dom.saml.v2.metadata.EntitiesDescriptorType;
|
import org.keycloak.dom.saml.v2.metadata.EntitiesDescriptorType;
|
||||||
import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType;
|
import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType;
|
||||||
import org.keycloak.dom.saml.v2.metadata.IDPSSODescriptorType;
|
import org.keycloak.dom.saml.v2.metadata.IDPSSODescriptorType;
|
||||||
import org.keycloak.dom.saml.v2.metadata.KeyDescriptorType;
|
import org.keycloak.dom.saml.v2.metadata.KeyDescriptorType;
|
||||||
import org.keycloak.dom.saml.v2.metadata.KeyTypes;
|
import org.keycloak.dom.saml.v2.metadata.KeyTypes;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
|
||||||
import org.keycloak.models.IdentityProviderModel;
|
import org.keycloak.models.IdentityProviderModel;
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.models.RealmModel;
|
|
||||||
import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
|
import org.keycloak.saml.common.constants.JBossSAMLURIConstants;
|
||||||
import org.keycloak.saml.common.exceptions.ParsingException;
|
import org.keycloak.saml.common.exceptions.ParsingException;
|
||||||
import org.keycloak.saml.common.util.DocumentUtil;
|
import org.keycloak.saml.common.util.DocumentUtil;
|
||||||
@@ -73,78 +69,74 @@ public class SAMLIdentityProviderFactory extends AbstractIdentityProviderFactory
|
|||||||
List<EntityDescriptorType.EDTChoiceType> choiceType = entityType.getChoiceType();
|
List<EntityDescriptorType.EDTChoiceType> choiceType = entityType.getChoiceType();
|
||||||
|
|
||||||
if (!choiceType.isEmpty()) {
|
if (!choiceType.isEmpty()) {
|
||||||
IDPSSODescriptorType idpDescriptor = null;
|
EntityDescriptorType.EDTChoiceType edtChoiceType = choiceType.get(0);
|
||||||
|
List<EntityDescriptorType.EDTDescriptorChoiceType> descriptors = edtChoiceType.getDescriptors();
|
||||||
|
|
||||||
//Metadata documents can contain multiple Descriptors (See ADFS metadata documents) such as RoleDescriptor, SPSSODescriptor, IDPSSODescriptor.
|
if (!descriptors.isEmpty()) {
|
||||||
//So we need to loop through to find the IDPSSODescriptor.
|
EntityDescriptorType.EDTDescriptorChoiceType edtDescriptorChoiceType = descriptors.get(0);
|
||||||
for(EntityDescriptorType.EDTChoiceType edtChoiceType : entityType.getChoiceType()) {
|
IDPSSODescriptorType idpDescriptor = edtDescriptorChoiceType.getIdpDescriptor();
|
||||||
List<EntityDescriptorType.EDTDescriptorChoiceType> descriptors = edtChoiceType.getDescriptors();
|
|
||||||
|
|
||||||
if(!descriptors.isEmpty() && descriptors.get(0).getIdpDescriptor() != null) {
|
if (idpDescriptor != null) {
|
||||||
idpDescriptor = descriptors.get(0).getIdpDescriptor();
|
SAMLIdentityProviderConfig samlIdentityProviderConfig = new SAMLIdentityProviderConfig();
|
||||||
}
|
String singleSignOnServiceUrl = null;
|
||||||
}
|
boolean postBinding = false;
|
||||||
|
for (EndpointType endpoint : idpDescriptor.getSingleSignOnService()) {
|
||||||
if (idpDescriptor != null) {
|
if (endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_POST_BINDING.get())) {
|
||||||
SAMLIdentityProviderConfig samlIdentityProviderConfig = new SAMLIdentityProviderConfig();
|
singleSignOnServiceUrl = endpoint.getLocation().toString();
|
||||||
String singleSignOnServiceUrl = null;
|
postBinding = true;
|
||||||
boolean postBinding = false;
|
break;
|
||||||
for (EndpointType endpoint : idpDescriptor.getSingleSignOnService()) {
|
} else if (endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_REDIRECT_BINDING.get())){
|
||||||
if (endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_POST_BINDING.get())) {
|
singleSignOnServiceUrl = endpoint.getLocation().toString();
|
||||||
singleSignOnServiceUrl = endpoint.getLocation().toString();
|
|
||||||
postBinding = true;
|
|
||||||
break;
|
|
||||||
} else if (endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_REDIRECT_BINDING.get())){
|
|
||||||
singleSignOnServiceUrl = endpoint.getLocation().toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
String singleLogoutServiceUrl = null;
|
|
||||||
for (EndpointType endpoint : idpDescriptor.getSingleLogoutService()) {
|
|
||||||
if (postBinding && endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_POST_BINDING.get())) {
|
|
||||||
singleLogoutServiceUrl = endpoint.getLocation().toString();
|
|
||||||
break;
|
|
||||||
} else if (!postBinding && endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_REDIRECT_BINDING.get())){
|
|
||||||
singleLogoutServiceUrl = endpoint.getLocation().toString();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
samlIdentityProviderConfig.setSingleLogoutServiceUrl(singleLogoutServiceUrl);
|
|
||||||
samlIdentityProviderConfig.setSingleSignOnServiceUrl(singleSignOnServiceUrl);
|
|
||||||
samlIdentityProviderConfig.setWantAuthnRequestsSigned(idpDescriptor.isWantAuthnRequestsSigned());
|
|
||||||
samlIdentityProviderConfig.setValidateSignature(idpDescriptor.isWantAuthnRequestsSigned());
|
|
||||||
samlIdentityProviderConfig.setPostBindingResponse(postBinding);
|
|
||||||
samlIdentityProviderConfig.setPostBindingAuthnRequest(postBinding);
|
|
||||||
|
|
||||||
List<KeyDescriptorType> keyDescriptor = idpDescriptor.getKeyDescriptor();
|
|
||||||
String defaultCertificate = null;
|
|
||||||
|
|
||||||
if (keyDescriptor != null) {
|
|
||||||
for (KeyDescriptorType keyDescriptorType : keyDescriptor) {
|
|
||||||
Element keyInfo = keyDescriptorType.getKeyInfo();
|
|
||||||
Element x509KeyInfo = DocumentUtil.getChildElement(keyInfo, new QName("dsig", "X509Certificate"));
|
|
||||||
|
|
||||||
if (KeyTypes.SIGNING.equals(keyDescriptorType.getUse())) {
|
|
||||||
samlIdentityProviderConfig.setSigningCertificate(x509KeyInfo.getTextContent());
|
|
||||||
} else if (KeyTypes.ENCRYPTION.equals(keyDescriptorType.getUse())) {
|
|
||||||
samlIdentityProviderConfig.setEncryptionPublicKey(x509KeyInfo.getTextContent());
|
|
||||||
} else if (keyDescriptorType.getUse() == null) {
|
|
||||||
defaultCertificate = x509KeyInfo.getTextContent();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
String singleLogoutServiceUrl = null;
|
||||||
|
for (EndpointType endpoint : idpDescriptor.getSingleLogoutService()) {
|
||||||
|
if (postBinding && endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_POST_BINDING.get())) {
|
||||||
|
singleLogoutServiceUrl = endpoint.getLocation().toString();
|
||||||
|
break;
|
||||||
|
} else if (!postBinding && endpoint.getBinding().toString().equals(JBossSAMLURIConstants.SAML_HTTP_REDIRECT_BINDING.get())){
|
||||||
|
singleLogoutServiceUrl = endpoint.getLocation().toString();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if (defaultCertificate != null) {
|
}
|
||||||
if (samlIdentityProviderConfig.getSigningCertificate() == null) {
|
samlIdentityProviderConfig.setSingleLogoutServiceUrl(singleLogoutServiceUrl);
|
||||||
samlIdentityProviderConfig.setSigningCertificate(defaultCertificate);
|
samlIdentityProviderConfig.setSingleSignOnServiceUrl(singleSignOnServiceUrl);
|
||||||
|
samlIdentityProviderConfig.setWantAuthnRequestsSigned(idpDescriptor.isWantAuthnRequestsSigned());
|
||||||
|
samlIdentityProviderConfig.setValidateSignature(idpDescriptor.isWantAuthnRequestsSigned());
|
||||||
|
samlIdentityProviderConfig.setPostBindingResponse(postBinding);
|
||||||
|
samlIdentityProviderConfig.setPostBindingAuthnRequest(postBinding);
|
||||||
|
|
||||||
|
List<KeyDescriptorType> keyDescriptor = idpDescriptor.getKeyDescriptor();
|
||||||
|
String defaultCertificate = null;
|
||||||
|
|
||||||
|
if (keyDescriptor != null) {
|
||||||
|
for (KeyDescriptorType keyDescriptorType : keyDescriptor) {
|
||||||
|
Element keyInfo = keyDescriptorType.getKeyInfo();
|
||||||
|
Element x509KeyInfo = DocumentUtil.getChildElement(keyInfo, new QName("dsig", "X509Certificate"));
|
||||||
|
|
||||||
|
if (KeyTypes.SIGNING.equals(keyDescriptorType.getUse())) {
|
||||||
|
samlIdentityProviderConfig.setSigningCertificate(x509KeyInfo.getTextContent());
|
||||||
|
} else if (KeyTypes.ENCRYPTION.equals(keyDescriptorType.getUse())) {
|
||||||
|
samlIdentityProviderConfig.setEncryptionPublicKey(x509KeyInfo.getTextContent());
|
||||||
|
} else if (keyDescriptorType.getUse() == null) {
|
||||||
|
defaultCertificate = x509KeyInfo.getTextContent();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (samlIdentityProviderConfig.getEncryptionPublicKey() == null) {
|
if (defaultCertificate != null) {
|
||||||
samlIdentityProviderConfig.setEncryptionPublicKey(defaultCertificate);
|
if (samlIdentityProviderConfig.getSigningCertificate() == null) {
|
||||||
}
|
samlIdentityProviderConfig.setSigningCertificate(defaultCertificate);
|
||||||
}
|
}
|
||||||
|
|
||||||
return samlIdentityProviderConfig.getConfig();
|
if (samlIdentityProviderConfig.getEncryptionPublicKey() == null) {
|
||||||
|
samlIdentityProviderConfig.setEncryptionPublicKey(defaultCertificate);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return samlIdentityProviderConfig.getConfig();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (ParsingException pe) {
|
} catch (ParsingException pe) {
|
||||||
@@ -158,5 +150,4 @@ public class SAMLIdentityProviderFactory extends AbstractIdentityProviderFactory
|
|||||||
public String getId() {
|
public String getId() {
|
||||||
return PROVIDER_ID;
|
return PROVIDER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+140
-140
@@ -1,140 +1,140 @@
|
|||||||
package org.keycloak.broker.saml.mappers;
|
package org.keycloak.broker.saml.mappers;
|
||||||
|
|
||||||
import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
|
import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
||||||
import org.keycloak.broker.provider.HardcodedRoleMapper;
|
import org.keycloak.broker.provider.HardcodedRoleMapper;
|
||||||
import org.keycloak.broker.provider.IdentityBrokerException;
|
import org.keycloak.broker.provider.IdentityBrokerException;
|
||||||
import org.keycloak.broker.saml.SAMLEndpoint;
|
import org.keycloak.broker.saml.SAMLEndpoint;
|
||||||
import org.keycloak.broker.saml.SAMLIdentityProviderFactory;
|
import org.keycloak.broker.saml.SAMLIdentityProviderFactory;
|
||||||
import org.keycloak.dom.saml.v2.assertion.AssertionType;
|
import org.keycloak.dom.saml.v2.assertion.AssertionType;
|
||||||
import org.keycloak.dom.saml.v2.assertion.AttributeStatementType;
|
import org.keycloak.dom.saml.v2.assertion.AttributeStatementType;
|
||||||
import org.keycloak.dom.saml.v2.assertion.AttributeType;
|
import org.keycloak.dom.saml.v2.assertion.AttributeType;
|
||||||
import org.keycloak.models.ClientModel;
|
import org.keycloak.models.ClientModel;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
import org.keycloak.models.IdentityProviderMapperModel;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.RealmModel;
|
||||||
import org.keycloak.models.RoleModel;
|
import org.keycloak.models.RoleModel;
|
||||||
import org.keycloak.models.UserModel;
|
import org.keycloak.models.UserModel;
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
import org.keycloak.provider.ProviderConfigProperty;
|
||||||
import org.keycloak.representations.JsonWebToken;
|
import org.keycloak.representations.JsonWebToken;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public class AttributeToRoleMapper extends AbstractIdentityProviderMapper {
|
public class AttributeToRoleMapper extends AbstractIdentityProviderMapper {
|
||||||
|
|
||||||
public static final String[] COMPATIBLE_PROVIDERS = {SAMLIdentityProviderFactory.PROVIDER_ID};
|
public static final String[] COMPATIBLE_PROVIDERS = {SAMLIdentityProviderFactory.PROVIDER_ID};
|
||||||
|
|
||||||
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
||||||
|
|
||||||
public static final String ATTRIBUTE_NAME = "attribute.name";
|
public static final String ATTRIBUTE_NAME = "attribute.name";
|
||||||
public static final String ATTRIBUTE_FRIENDLY_NAME = "attribute.friendly.name";
|
public static final String ATTRIBUTE_FRIENDLY_NAME = "attribute.friendly.name";
|
||||||
public static final String ATTRIBUTE_VALUE = "attribute.value";
|
public static final String ATTRIBUTE_VALUE = "attribute.value";
|
||||||
|
|
||||||
static {
|
static {
|
||||||
ProviderConfigProperty property;
|
ProviderConfigProperty property;
|
||||||
property = new ProviderConfigProperty();
|
property = new ProviderConfigProperty();
|
||||||
property.setName(ATTRIBUTE_NAME);
|
property.setName(ATTRIBUTE_NAME);
|
||||||
property.setLabel("Attribute Name");
|
property.setLabel("Attribute Name");
|
||||||
property.setHelpText("Name of attribute to search for in assertion. You can leave this blank and specify a friendly name instead.");
|
property.setHelpText("Name of attribute to search for in assertion. You can leave this blank and specify a friendly name instead.");
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
configProperties.add(property);
|
configProperties.add(property);
|
||||||
property = new ProviderConfigProperty();
|
property = new ProviderConfigProperty();
|
||||||
property.setName(ATTRIBUTE_FRIENDLY_NAME);
|
property.setName(ATTRIBUTE_FRIENDLY_NAME);
|
||||||
property.setLabel("Friendly Name");
|
property.setLabel("Friendly Name");
|
||||||
property.setHelpText("Friendly name of attribute to search for in assertion. You can leave this blank and specify a name instead.");
|
property.setHelpText("Friendly name of attribute to search for in assertion. You can leave this blank and specify a name instead.");
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
configProperties.add(property);
|
configProperties.add(property);
|
||||||
property = new ProviderConfigProperty();
|
property = new ProviderConfigProperty();
|
||||||
property.setName(ATTRIBUTE_VALUE);
|
property.setName(ATTRIBUTE_VALUE);
|
||||||
property.setLabel("Attribute Value");
|
property.setLabel("Attribute Value");
|
||||||
property.setHelpText("Value the attribute must have. If the attribute is a list, then the value must be contained in the list.");
|
property.setHelpText("Value the attribute must have. If the attribute is a list, then the value must be contained in the list.");
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
configProperties.add(property);
|
configProperties.add(property);
|
||||||
property = new ProviderConfigProperty();
|
property = new ProviderConfigProperty();
|
||||||
property.setName(HardcodedRoleMapper.ROLE);
|
property.setName(HardcodedRoleMapper.ROLE);
|
||||||
property.setLabel("Role");
|
property.setLabel("Role");
|
||||||
property.setHelpText("Role to grant to user. Click 'Select Role' button to browse roles, or just type it in the textbox. To reference an application role the syntax is appname.approle, i.e. myapp.myrole");
|
property.setHelpText("Role to grant to user. To reference an application role the syntax is appname.approle, i.e. myapp.myrole");
|
||||||
property.setType(ProviderConfigProperty.ROLE_TYPE);
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
configProperties.add(property);
|
configProperties.add(property);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String PROVIDER_ID = "saml-role-idp-mapper";
|
public static final String PROVIDER_ID = "saml-role-idp-mapper";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
public List<ProviderConfigProperty> getConfigProperties() {
|
||||||
return configProperties;
|
return configProperties;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return PROVIDER_ID;
|
return PROVIDER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String[] getCompatibleProviders() {
|
public String[] getCompatibleProviders() {
|
||||||
return COMPATIBLE_PROVIDERS;
|
return COMPATIBLE_PROVIDERS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getDisplayCategory() {
|
public String getDisplayCategory() {
|
||||||
return "Role Mapper";
|
return "Role Mapper";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getDisplayType() {
|
public String getDisplayType() {
|
||||||
return "SAML Attribute to Role";
|
return "SAML Attribute to Role";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
String roleName = mapperModel.getConfig().get(HardcodedRoleMapper.ROLE);
|
String roleName = mapperModel.getConfig().get(HardcodedRoleMapper.ROLE);
|
||||||
if (isAttributePresent(mapperModel, context)) {
|
if (isAttributePresent(mapperModel, context)) {
|
||||||
RoleModel role = HardcodedRoleMapper.getRoleFromString(realm, roleName);
|
RoleModel role = HardcodedRoleMapper.getRoleFromString(realm, roleName);
|
||||||
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
||||||
user.grantRole(role);
|
user.grantRole(role);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected boolean isAttributePresent(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
protected boolean isAttributePresent(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
String name = mapperModel.getConfig().get(ATTRIBUTE_NAME);
|
String name = mapperModel.getConfig().get(ATTRIBUTE_NAME);
|
||||||
if (name != null && name.trim().equals("")) name = null;
|
if (name != null && name.trim().equals("")) name = null;
|
||||||
String friendly = mapperModel.getConfig().get(ATTRIBUTE_FRIENDLY_NAME);
|
String friendly = mapperModel.getConfig().get(ATTRIBUTE_FRIENDLY_NAME);
|
||||||
if (friendly != null && friendly.trim().equals("")) friendly = null;
|
if (friendly != null && friendly.trim().equals("")) friendly = null;
|
||||||
String desiredValue = mapperModel.getConfig().get(ATTRIBUTE_VALUE);
|
String desiredValue = mapperModel.getConfig().get(ATTRIBUTE_VALUE);
|
||||||
AssertionType assertion = (AssertionType)context.getContextData().get(SAMLEndpoint.SAML_ASSERTION);
|
AssertionType assertion = (AssertionType)context.getContextData().get(SAMLEndpoint.SAML_ASSERTION);
|
||||||
for (AttributeStatementType statement : assertion.getAttributeStatements()) {
|
for (AttributeStatementType statement : assertion.getAttributeStatements()) {
|
||||||
for (AttributeStatementType.ASTChoiceType choice : statement.getAttributes()) {
|
for (AttributeStatementType.ASTChoiceType choice : statement.getAttributes()) {
|
||||||
AttributeType attr = choice.getAttribute();
|
AttributeType attr = choice.getAttribute();
|
||||||
if (name != null && !name.equals(attr.getName())) continue;
|
if (name != null && !name.equals(attr.getName())) continue;
|
||||||
if (friendly != null && !name.equals(attr.getFriendlyName())) continue;
|
if (friendly != null && !name.equals(attr.getFriendlyName())) continue;
|
||||||
for (Object val : attr.getAttributeValue()) {
|
for (Object val : attr.getAttributeValue()) {
|
||||||
if (val.equals(desiredValue)) return true;
|
if (val.equals(desiredValue)) return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
String roleName = mapperModel.getConfig().get(HardcodedRoleMapper.ROLE);
|
String roleName = mapperModel.getConfig().get(HardcodedRoleMapper.ROLE);
|
||||||
if (!isAttributePresent(mapperModel, context)) {
|
if (!isAttributePresent(mapperModel, context)) {
|
||||||
RoleModel role = HardcodedRoleMapper.getRoleFromString(realm, roleName);
|
RoleModel role = HardcodedRoleMapper.getRoleFromString(realm, roleName);
|
||||||
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
if (role == null) throw new IdentityBrokerException("Unable to find role: " + roleName);
|
||||||
user.deleteRoleMapping(role);
|
user.deleteRoleMapping(role);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getHelpText() {
|
public String getHelpText() {
|
||||||
return "If a claim exists, grant the user the specified realm or application role.";
|
return "If a claim exists, grant the user the specified realm or application role.";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+132
-129
@@ -1,129 +1,132 @@
|
|||||||
package org.keycloak.broker.saml.mappers;
|
package org.keycloak.broker.saml.mappers;
|
||||||
|
|
||||||
import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
|
import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
||||||
import org.keycloak.broker.saml.SAMLEndpoint;
|
import org.keycloak.broker.provider.IdentityBrokerException;
|
||||||
import org.keycloak.broker.saml.SAMLIdentityProviderFactory;
|
import org.keycloak.broker.saml.SAMLEndpoint;
|
||||||
import org.keycloak.dom.saml.v2.assertion.AssertionType;
|
import org.keycloak.broker.saml.SAMLIdentityProviderFactory;
|
||||||
import org.keycloak.dom.saml.v2.assertion.AttributeStatementType;
|
import org.keycloak.dom.saml.v2.assertion.AssertionType;
|
||||||
import org.keycloak.dom.saml.v2.assertion.AttributeType;
|
import org.keycloak.dom.saml.v2.assertion.AttributeStatementType;
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
import org.keycloak.dom.saml.v2.assertion.AttributeType;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.ClientModel;
|
||||||
import org.keycloak.models.RealmModel;
|
import org.keycloak.models.IdentityProviderMapperModel;
|
||||||
import org.keycloak.models.UserModel;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
import org.keycloak.models.RealmModel;
|
||||||
|
import org.keycloak.models.RoleModel;
|
||||||
import java.util.ArrayList;
|
import org.keycloak.models.UserModel;
|
||||||
import java.util.List;
|
import org.keycloak.provider.ProviderConfigProperty;
|
||||||
|
|
||||||
/**
|
import java.util.ArrayList;
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
import java.util.List;
|
||||||
* @version $Revision: 1 $
|
|
||||||
*/
|
/**
|
||||||
public class UserAttributeMapper extends AbstractIdentityProviderMapper {
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
|
* @version $Revision: 1 $
|
||||||
public static final String[] COMPATIBLE_PROVIDERS = {SAMLIdentityProviderFactory.PROVIDER_ID};
|
*/
|
||||||
|
public class UserAttributeMapper extends AbstractIdentityProviderMapper {
|
||||||
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
|
||||||
|
public static final String[] COMPATIBLE_PROVIDERS = {SAMLIdentityProviderFactory.PROVIDER_ID};
|
||||||
public static final String ATTRIBUTE_NAME = "attribute.name";
|
|
||||||
public static final String ATTRIBUTE_FRIENDLY_NAME = "attribute.friendly.name";
|
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
||||||
public static final String USER_ATTRIBUTE = "user.attribute";
|
|
||||||
|
public static final String ATTRIBUTE_NAME = "attribute.name";
|
||||||
static {
|
public static final String ATTRIBUTE_FRIENDLY_NAME = "attribute.friendly.name";
|
||||||
ProviderConfigProperty property;
|
public static final String USER_ATTRIBUTE = "user.attribute";
|
||||||
property = new ProviderConfigProperty();
|
|
||||||
property.setName(ATTRIBUTE_NAME);
|
static {
|
||||||
property.setLabel("Attribute Name");
|
ProviderConfigProperty property;
|
||||||
property.setHelpText("Name of attribute to search for in assertion. You can leave this blank and specify a friendly name instead.");
|
property = new ProviderConfigProperty();
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
property.setName(ATTRIBUTE_NAME);
|
||||||
configProperties.add(property);
|
property.setLabel("Attribute Name");
|
||||||
property = new ProviderConfigProperty();
|
property.setHelpText("Name of attribute to search for in assertion. You can leave this blank and specify a friendly name instead.");
|
||||||
property.setName(ATTRIBUTE_FRIENDLY_NAME);
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
property.setLabel("Friendly Name");
|
configProperties.add(property);
|
||||||
property.setHelpText("Friendly name of attribute to search for in assertion. You can leave this blank and specify a name instead.");
|
property = new ProviderConfigProperty();
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
property.setName(ATTRIBUTE_FRIENDLY_NAME);
|
||||||
configProperties.add(property);
|
property.setLabel("Friendly Name");
|
||||||
property = new ProviderConfigProperty();
|
property.setHelpText("Friendly name of attribute to search for in assertion. You can leave this blank and specify a name instead.");
|
||||||
property.setName(USER_ATTRIBUTE);
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
property.setLabel("User Attribute Name");
|
configProperties.add(property);
|
||||||
property.setHelpText("User attribute name to store saml attribute.");
|
property = new ProviderConfigProperty();
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
property.setName(USER_ATTRIBUTE);
|
||||||
configProperties.add(property);
|
property.setLabel("User Attribute Name");
|
||||||
}
|
property.setHelpText("User attribute name to store saml attribute.");
|
||||||
|
property.setType(ProviderConfigProperty.STRING_TYPE);
|
||||||
public static final String PROVIDER_ID = "saml-user-attribute-idp-mapper";
|
configProperties.add(property);
|
||||||
|
}
|
||||||
@Override
|
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
public static final String PROVIDER_ID = "saml-user-attribute-idp-mapper";
|
||||||
return configProperties;
|
|
||||||
}
|
@Override
|
||||||
|
public List<ProviderConfigProperty> getConfigProperties() {
|
||||||
@Override
|
return configProperties;
|
||||||
public String getId() {
|
}
|
||||||
return PROVIDER_ID;
|
|
||||||
}
|
@Override
|
||||||
|
public String getId() {
|
||||||
@Override
|
return PROVIDER_ID;
|
||||||
public String[] getCompatibleProviders() {
|
}
|
||||||
return COMPATIBLE_PROVIDERS;
|
|
||||||
}
|
@Override
|
||||||
|
public String[] getCompatibleProviders() {
|
||||||
@Override
|
return COMPATIBLE_PROVIDERS;
|
||||||
public String getDisplayCategory() {
|
}
|
||||||
return "Attribute Importer";
|
|
||||||
}
|
@Override
|
||||||
|
public String getDisplayCategory() {
|
||||||
@Override
|
return "Attribute Importer";
|
||||||
public String getDisplayType() {
|
}
|
||||||
return "Attribute Importer";
|
|
||||||
}
|
@Override
|
||||||
|
public String getDisplayType() {
|
||||||
@Override
|
return "Attribute Importer";
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
}
|
||||||
String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
|
|
||||||
Object value = getAttribute(mapperModel, context);
|
@Override
|
||||||
if (value != null) {
|
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
user.setSingleAttribute(attribute, value.toString());
|
String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
|
||||||
}
|
Object value = getAttribute(mapperModel, context);
|
||||||
}
|
if (value != null) {
|
||||||
|
user.setAttribute(attribute, value.toString());
|
||||||
protected String getAttribute(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
}
|
||||||
String name = mapperModel.getConfig().get(ATTRIBUTE_NAME);
|
}
|
||||||
if (name != null && name.trim().equals("")) name = null;
|
|
||||||
String friendly = mapperModel.getConfig().get(ATTRIBUTE_FRIENDLY_NAME);
|
protected String getAttribute(IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
if (friendly != null && friendly.trim().equals("")) friendly = null;
|
String name = mapperModel.getConfig().get(ATTRIBUTE_NAME);
|
||||||
AssertionType assertion = (AssertionType)context.getContextData().get(SAMLEndpoint.SAML_ASSERTION);
|
if (name != null && name.trim().equals("")) name = null;
|
||||||
for (AttributeStatementType statement : assertion.getAttributeStatements()) {
|
String friendly = mapperModel.getConfig().get(ATTRIBUTE_FRIENDLY_NAME);
|
||||||
for (AttributeStatementType.ASTChoiceType choice : statement.getAttributes()) {
|
if (friendly != null && friendly.trim().equals("")) friendly = null;
|
||||||
AttributeType attr = choice.getAttribute();
|
AssertionType assertion = (AssertionType)context.getContextData().get(SAMLEndpoint.SAML_ASSERTION);
|
||||||
if (name != null && !name.equals(attr.getName())) continue;
|
for (AttributeStatementType statement : assertion.getAttributeStatements()) {
|
||||||
if (friendly != null && !friendly.equals(attr.getFriendlyName())) continue;
|
for (AttributeStatementType.ASTChoiceType choice : statement.getAttributes()) {
|
||||||
|
AttributeType attr = choice.getAttribute();
|
||||||
List<Object> attributeValue = attr.getAttributeValue();
|
if (name != null && !name.equals(attr.getName())) continue;
|
||||||
if (attributeValue == null || attributeValue.isEmpty()) return null;
|
if (friendly != null && !name.equals(attr.getFriendlyName())) continue;
|
||||||
return attributeValue.get(0).toString();
|
|
||||||
}
|
List<Object> attributeValue = attr.getAttributeValue();
|
||||||
}
|
if (attributeValue == null || attributeValue.isEmpty()) return null;
|
||||||
return null;
|
return attributeValue.get(0).toString();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
@Override
|
return null;
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
}
|
||||||
String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
|
|
||||||
Object value = getAttribute(mapperModel, context);
|
@Override
|
||||||
String current = user.getFirstAttribute(attribute);
|
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
||||||
if (value != null && !value.equals(current)) {
|
String attribute = mapperModel.getConfig().get(USER_ATTRIBUTE);
|
||||||
user.setSingleAttribute(attribute, value.toString());
|
Object value = getAttribute(mapperModel, context);
|
||||||
} else if (value == null) {
|
String current = user.getAttribute(attribute);
|
||||||
user.removeAttribute(attribute);
|
if (value != null && !value.equals(current)) {
|
||||||
}
|
user.setAttribute(attribute, value.toString());
|
||||||
|
} else if (value == null) {
|
||||||
}
|
user.removeAttribute(attribute);
|
||||||
|
}
|
||||||
@Override
|
|
||||||
public String getHelpText() {
|
}
|
||||||
return "Import declared saml attribute if it exists in assertion into the specified user attribute.";
|
|
||||||
}
|
@Override
|
||||||
|
public String getHelpText() {
|
||||||
}
|
return "Import declared saml attribute if it exists in assertion into the specified user attribute.";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
-133
@@ -1,133 +0,0 @@
|
|||||||
package org.keycloak.broker.saml.mappers;
|
|
||||||
|
|
||||||
import org.keycloak.broker.provider.AbstractIdentityProviderMapper;
|
|
||||||
import org.keycloak.broker.provider.BrokeredIdentityContext;
|
|
||||||
import org.keycloak.broker.saml.SAMLEndpoint;
|
|
||||||
import org.keycloak.broker.saml.SAMLIdentityProviderFactory;
|
|
||||||
import org.keycloak.dom.saml.v2.assertion.AssertionType;
|
|
||||||
import org.keycloak.dom.saml.v2.assertion.AttributeStatementType;
|
|
||||||
import org.keycloak.dom.saml.v2.assertion.AttributeType;
|
|
||||||
import org.keycloak.dom.saml.v2.assertion.NameIDType;
|
|
||||||
import org.keycloak.dom.saml.v2.assertion.SubjectType;
|
|
||||||
import org.keycloak.models.IdentityProviderMapperModel;
|
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.models.RealmModel;
|
|
||||||
import org.keycloak.models.UserModel;
|
|
||||||
import org.keycloak.models.utils.KeycloakModelUtils;
|
|
||||||
import org.keycloak.provider.ProviderConfigProperty;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
|
||||||
* @version $Revision: 1 $
|
|
||||||
*/
|
|
||||||
public class UsernameTemplateMapper extends AbstractIdentityProviderMapper {
|
|
||||||
|
|
||||||
public static final String[] COMPATIBLE_PROVIDERS = {SAMLIdentityProviderFactory.PROVIDER_ID};
|
|
||||||
|
|
||||||
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
|
|
||||||
|
|
||||||
public static final String TEMPLATE = "template";
|
|
||||||
|
|
||||||
static {
|
|
||||||
ProviderConfigProperty property;
|
|
||||||
property = new ProviderConfigProperty();
|
|
||||||
property.setName(TEMPLATE);
|
|
||||||
property.setLabel("Template");
|
|
||||||
property.setHelpText("Template to use to format the username to import. Substitutions are enclosed in ${}. For example: '${ALIAS}.${NAMEID}'. ALIAS is the provider alias. NAMEID is that SAML name id assertion. ATTRIBUTE.<NAME> references a SAML attribute where name is the attribute name or friendly name.");
|
|
||||||
property.setType(ProviderConfigProperty.STRING_TYPE);
|
|
||||||
property.setDefaultValue("${ALIAS}.${NAMEID}");
|
|
||||||
configProperties.add(property);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static final String PROVIDER_ID = "saml-username-idp-mapper";
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<ProviderConfigProperty> getConfigProperties() {
|
|
||||||
return configProperties;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getId() {
|
|
||||||
return PROVIDER_ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String[] getCompatibleProviders() {
|
|
||||||
return COMPATIBLE_PROVIDERS;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayCategory() {
|
|
||||||
return "Preprocessor";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getDisplayType() {
|
|
||||||
return "Username Template Importer";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void importNewUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateBrokeredUser(KeycloakSession session, RealmModel realm, UserModel user, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
|
|
||||||
}
|
|
||||||
static Pattern substitution = Pattern.compile("\\$\\{([^}]+)\\}");
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void preprocessFederatedIdentity(KeycloakSession session, RealmModel realm, IdentityProviderMapperModel mapperModel, BrokeredIdentityContext context) {
|
|
||||||
AssertionType assertion = (AssertionType)context.getContextData().get(SAMLEndpoint.SAML_ASSERTION);
|
|
||||||
String template = mapperModel.getConfig().get(TEMPLATE);
|
|
||||||
Matcher m = substitution.matcher(template);
|
|
||||||
StringBuffer sb = new StringBuffer();
|
|
||||||
while (m.find()) {
|
|
||||||
String variable = m.group(1);
|
|
||||||
if (variable.equals("ALIAS")) {
|
|
||||||
m.appendReplacement(sb, context.getIdpConfig().getAlias());
|
|
||||||
} else if (variable.equals("UUID")) {
|
|
||||||
m.appendReplacement(sb, KeycloakModelUtils.generateId());
|
|
||||||
} else if (variable.equals("NAMEID")) {
|
|
||||||
SubjectType subject = assertion.getSubject();
|
|
||||||
SubjectType.STSubType subType = subject.getSubType();
|
|
||||||
NameIDType subjectNameID = (NameIDType) subType.getBaseID();
|
|
||||||
m.appendReplacement(sb, subjectNameID.getValue());
|
|
||||||
} else if (variable.startsWith("ATTRIBUTE.")) {
|
|
||||||
String name = variable.substring("ATTRIBUTE.".length());
|
|
||||||
String value = "";
|
|
||||||
for (AttributeStatementType statement : assertion.getAttributeStatements()) {
|
|
||||||
for (AttributeStatementType.ASTChoiceType choice : statement.getAttributes()) {
|
|
||||||
AttributeType attr = choice.getAttribute();
|
|
||||||
if (name.equals(attr.getName()) || name.equals(attr.getFriendlyName())) {
|
|
||||||
List<Object> attributeValue = attr.getAttributeValue();
|
|
||||||
if (attributeValue != null && !attributeValue.isEmpty()) {
|
|
||||||
value = attributeValue.get(0).toString();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
m.appendReplacement(sb, value);
|
|
||||||
} else {
|
|
||||||
m.appendReplacement(sb, m.group(1));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
m.appendTail(sb);
|
|
||||||
context.setModelUsername(sb.toString());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getHelpText() {
|
|
||||||
return "Format the username to import.";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
+2
-3
@@ -1,3 +1,2 @@
|
|||||||
org.keycloak.broker.saml.mappers.AttributeToRoleMapper
|
org.keycloak.broker.saml.mappers.AttributeToRoleMapper
|
||||||
org.keycloak.broker.saml.mappers.UserAttributeMapper
|
org.keycloak.broker.saml.mappers.UserAttributeMapper
|
||||||
org.keycloak.broker.saml.mappers.UsernameTemplateMapper
|
|
||||||
@@ -1,275 +0,0 @@
|
|||||||
package org.keycloak.client.registration;
|
|
||||||
|
|
||||||
import org.apache.http.HttpHeaders;
|
|
||||||
import org.apache.http.HttpRequest;
|
|
||||||
import org.apache.http.HttpResponse;
|
|
||||||
import org.apache.http.client.HttpClient;
|
|
||||||
import org.apache.http.client.methods.HttpDelete;
|
|
||||||
import org.apache.http.client.methods.HttpGet;
|
|
||||||
import org.apache.http.client.methods.HttpPost;
|
|
||||||
import org.apache.http.client.methods.HttpPut;
|
|
||||||
import org.apache.http.entity.StringEntity;
|
|
||||||
import org.apache.http.impl.client.CloseableHttpClient;
|
|
||||||
import org.apache.http.impl.client.HttpClients;
|
|
||||||
import org.keycloak.representations.idm.ClientRepresentation;
|
|
||||||
import org.keycloak.common.util.Base64;
|
|
||||||
import org.keycloak.util.JsonSerialization;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
|
|
||||||
*/
|
|
||||||
public class ClientRegistration {
|
|
||||||
|
|
||||||
private String clientRegistrationUrl;
|
|
||||||
private HttpClient httpClient;
|
|
||||||
private Auth auth;
|
|
||||||
|
|
||||||
public static ClientRegistrationBuilder create() {
|
|
||||||
return new ClientRegistrationBuilder();
|
|
||||||
}
|
|
||||||
|
|
||||||
private ClientRegistration() {
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientRepresentation create(ClientRepresentation client) throws ClientRegistrationException {
|
|
||||||
String content = serialize(client);
|
|
||||||
InputStream resultStream = doPost(content);
|
|
||||||
return deserialize(resultStream, ClientRepresentation.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientRepresentation get() throws ClientRegistrationException {
|
|
||||||
if (auth instanceof ClientIdSecretAuth) {
|
|
||||||
String clientId = ((ClientIdSecretAuth) auth).clientId;
|
|
||||||
return get(clientId);
|
|
||||||
} else {
|
|
||||||
throw new ClientRegistrationException("Requires client authentication");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientRepresentation get(String clientId) throws ClientRegistrationException {
|
|
||||||
InputStream resultStream = doGet(clientId);
|
|
||||||
return resultStream != null ? deserialize(resultStream, ClientRepresentation.class) : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void update(ClientRepresentation client) throws ClientRegistrationException {
|
|
||||||
String content = serialize(client);
|
|
||||||
doPut(content, client.getClientId());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void delete() throws ClientRegistrationException {
|
|
||||||
if (auth instanceof ClientIdSecretAuth) {
|
|
||||||
String clientId = ((ClientIdSecretAuth) auth).clientId;
|
|
||||||
delete(clientId);
|
|
||||||
} else {
|
|
||||||
throw new ClientRegistrationException("Requires client authentication");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void delete(String clientId) throws ClientRegistrationException {
|
|
||||||
doDelete(clientId);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void close() throws ClientRegistrationException {
|
|
||||||
if (httpClient instanceof CloseableHttpClient) {
|
|
||||||
try {
|
|
||||||
((CloseableHttpClient) httpClient).close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new ClientRegistrationException("Failed to close http client", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private InputStream doPost(String content) throws ClientRegistrationException {
|
|
||||||
try {
|
|
||||||
HttpPost request = new HttpPost(clientRegistrationUrl);
|
|
||||||
|
|
||||||
request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
|
|
||||||
request.setHeader(HttpHeaders.ACCEPT, "application/json");
|
|
||||||
request.setEntity(new StringEntity(content));
|
|
||||||
|
|
||||||
auth.addAuth(request);
|
|
||||||
|
|
||||||
HttpResponse response = httpClient.execute(request);
|
|
||||||
InputStream responseStream = null;
|
|
||||||
if (response.getEntity() != null) {
|
|
||||||
responseStream = response.getEntity().getContent();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response.getStatusLine().getStatusCode() == 201) {
|
|
||||||
return responseStream;
|
|
||||||
} else {
|
|
||||||
responseStream.close();
|
|
||||||
throw new HttpErrorException(response.getStatusLine());
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new ClientRegistrationException("Failed to send request", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private InputStream doGet(String endpoint) throws ClientRegistrationException {
|
|
||||||
try {
|
|
||||||
HttpGet request = new HttpGet(clientRegistrationUrl + "/" + endpoint);
|
|
||||||
|
|
||||||
request.setHeader(HttpHeaders.ACCEPT, "application/json");
|
|
||||||
|
|
||||||
auth.addAuth(request);
|
|
||||||
|
|
||||||
HttpResponse response = httpClient.execute(request);
|
|
||||||
InputStream responseStream = null;
|
|
||||||
if (response.getEntity() != null) {
|
|
||||||
responseStream = response.getEntity().getContent();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response.getStatusLine().getStatusCode() == 200) {
|
|
||||||
return responseStream;
|
|
||||||
} else if (response.getStatusLine().getStatusCode() == 404) {
|
|
||||||
responseStream.close();
|
|
||||||
return null;
|
|
||||||
} else {
|
|
||||||
responseStream.close();
|
|
||||||
throw new HttpErrorException(response.getStatusLine());
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new ClientRegistrationException("Failed to send request", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void doPut(String content, String endpoint) throws ClientRegistrationException {
|
|
||||||
try {
|
|
||||||
HttpPut request = new HttpPut(clientRegistrationUrl + "/" + endpoint);
|
|
||||||
|
|
||||||
request.setHeader(HttpHeaders.CONTENT_TYPE, "application/json");
|
|
||||||
request.setHeader(HttpHeaders.ACCEPT, "application/json");
|
|
||||||
request.setEntity(new StringEntity(content));
|
|
||||||
|
|
||||||
auth.addAuth(request);
|
|
||||||
|
|
||||||
HttpResponse response = httpClient.execute(request);
|
|
||||||
if (response.getEntity() != null) {
|
|
||||||
response.getEntity().getContent().close();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response.getStatusLine().getStatusCode() != 200) {
|
|
||||||
throw new HttpErrorException(response.getStatusLine());
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new ClientRegistrationException("Failed to send request", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void doDelete(String endpoint) throws ClientRegistrationException {
|
|
||||||
try {
|
|
||||||
HttpDelete request = new HttpDelete(clientRegistrationUrl + "/" + endpoint);
|
|
||||||
|
|
||||||
auth.addAuth(request);
|
|
||||||
|
|
||||||
HttpResponse response = httpClient.execute(request);
|
|
||||||
if (response.getEntity() != null) {
|
|
||||||
response.getEntity().getContent().close();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response.getStatusLine().getStatusCode() != 200) {
|
|
||||||
throw new HttpErrorException(response.getStatusLine());
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new ClientRegistrationException("Failed to send request", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String serialize(ClientRepresentation client) throws ClientRegistrationException {
|
|
||||||
try {
|
|
||||||
return JsonSerialization.writeValueAsString(client);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new ClientRegistrationException("Failed to write json object", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private <T> T deserialize(InputStream inputStream, Class<T> clazz) throws ClientRegistrationException {
|
|
||||||
try {
|
|
||||||
return JsonSerialization.readValue(inputStream, clazz);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new ClientRegistrationException("Failed to read json object", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ClientRegistrationBuilder {
|
|
||||||
|
|
||||||
private String realm;
|
|
||||||
|
|
||||||
private String authServerUrl;
|
|
||||||
|
|
||||||
private Auth auth;
|
|
||||||
|
|
||||||
private HttpClient httpClient;
|
|
||||||
|
|
||||||
public ClientRegistrationBuilder realm(String realm) {
|
|
||||||
this.realm = realm;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
public ClientRegistrationBuilder authServerUrl(String authServerUrl) {
|
|
||||||
this.authServerUrl = authServerUrl;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientRegistrationBuilder auth(String token) {
|
|
||||||
this.auth = new TokenAuth(token);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientRegistrationBuilder auth(String clientId, String clientSecret) {
|
|
||||||
this.auth = new ClientIdSecretAuth(clientId, clientSecret);
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientRegistrationBuilder httpClient(HttpClient httpClient) {
|
|
||||||
this.httpClient = httpClient;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientRegistration build() {
|
|
||||||
ClientRegistration clientRegistration = new ClientRegistration();
|
|
||||||
clientRegistration.clientRegistrationUrl = authServerUrl + "/realms/" + realm + "/client-registration/default";
|
|
||||||
|
|
||||||
clientRegistration.httpClient = httpClient != null ? httpClient : HttpClients.createDefault();
|
|
||||||
clientRegistration.auth = auth;
|
|
||||||
|
|
||||||
return clientRegistration;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface Auth {
|
|
||||||
void addAuth(HttpRequest httpRequest);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class AuthorizationHeaderAuth implements Auth {
|
|
||||||
private String credentials;
|
|
||||||
|
|
||||||
public AuthorizationHeaderAuth(String credentials) {
|
|
||||||
this.credentials = credentials;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addAuth(HttpRequest httpRequest) {
|
|
||||||
httpRequest.setHeader(HttpHeaders.AUTHORIZATION, credentials);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class TokenAuth extends AuthorizationHeaderAuth {
|
|
||||||
public TokenAuth(String token) {
|
|
||||||
super("Bearer " + token);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ClientIdSecretAuth extends AuthorizationHeaderAuth {
|
|
||||||
private String clientId;
|
|
||||||
|
|
||||||
public ClientIdSecretAuth(String clientId, String clientSecret) {
|
|
||||||
super("Basic " + Base64.encodeBytes((clientId + ":" + clientSecret).getBytes()));
|
|
||||||
this.clientId = clientId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
-16
@@ -1,16 +0,0 @@
|
|||||||
package org.keycloak.client.registration;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
|
|
||||||
*/
|
|
||||||
public class ClientRegistrationException extends Exception {
|
|
||||||
|
|
||||||
public ClientRegistrationException(String s, Throwable throwable) {
|
|
||||||
super(s, throwable);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ClientRegistrationException(String s) {
|
|
||||||
super(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package org.keycloak.client.registration;
|
|
||||||
|
|
||||||
import org.apache.http.StatusLine;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
|
|
||||||
*/
|
|
||||||
public class HttpErrorException extends IOException {
|
|
||||||
|
|
||||||
private StatusLine statusLine;
|
|
||||||
|
|
||||||
public HttpErrorException(StatusLine statusLine) {
|
|
||||||
this.statusLine = statusLine;
|
|
||||||
}
|
|
||||||
|
|
||||||
public StatusLine getStatusLine() {
|
|
||||||
return statusLine;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>keycloak-parent</artifactId>
|
|
||||||
<groupId>org.keycloak</groupId>
|
|
||||||
<version>1.6.0.Final</version>
|
|
||||||
<relativePath>../pom.xml</relativePath>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
|
||||||
<artifactId>keycloak-common</artifactId>
|
|
||||||
<name>Keycloak Common</name>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
<description>Common library and dependencies shared with server and all adapters</description>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<timestamp>${maven.build.timestamp}</timestamp>
|
|
||||||
<maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
|
|
||||||
<keycloak.osgi.export>
|
|
||||||
org.keycloak.common.*
|
|
||||||
</keycloak.osgi.export>
|
|
||||||
<keycloak.osgi.import>
|
|
||||||
*;resolution:=optional
|
|
||||||
</keycloak.osgi.import>
|
|
||||||
</properties>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bouncycastle</groupId>
|
|
||||||
<artifactId>bcprov-jdk15on</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.bouncycastle</groupId>
|
|
||||||
<artifactId>bcpkix-jdk15on</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>junit</groupId>
|
|
||||||
<artifactId>junit</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<build>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<directory>src/main/resources</directory>
|
|
||||||
<filtering>true</filtering>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<source>${maven.compiler.source}</source>
|
|
||||||
<target>${maven.compiler.target}</target>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
<!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
|
|
||||||
<plugin>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<configuration>
|
|
||||||
<archive>
|
|
||||||
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
|
||||||
</archive>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.felix</groupId>
|
|
||||||
<artifactId>maven-bundle-plugin</artifactId>
|
|
||||||
<extensions>true</extensions>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>bundle-manifest</id>
|
|
||||||
<phase>process-classes</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>manifest</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
<configuration>
|
|
||||||
<instructions>
|
|
||||||
<Bundle-ClassPath>.</Bundle-ClassPath>
|
|
||||||
<Bundle-Name>${project.name}</Bundle-Name>
|
|
||||||
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
|
|
||||||
<Import-Package>${keycloak.osgi.import}</Import-Package>
|
|
||||||
<Export-Package>${keycloak.osgi.export}</Export-Package>
|
|
||||||
</instructions>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
package org.keycloak.common;
|
|
||||||
|
|
||||||
import org.keycloak.common.util.Time;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
|
||||||
* @version $Revision: 1 $
|
|
||||||
*/
|
|
||||||
public class Version {
|
|
||||||
public static final String UNKNOWN = "UNKNOWN";
|
|
||||||
public static String VERSION;
|
|
||||||
public static String RESOURCES_VERSION;
|
|
||||||
public static String BUILD_TIME;
|
|
||||||
|
|
||||||
static {
|
|
||||||
Properties props = new Properties();
|
|
||||||
InputStream is = Version.class.getResourceAsStream("/keycloak-version.properties");
|
|
||||||
try {
|
|
||||||
props.load(is);
|
|
||||||
Version.VERSION = props.getProperty("version");
|
|
||||||
Version.BUILD_TIME = props.getProperty("build-time");
|
|
||||||
Version.RESOURCES_VERSION = Version.VERSION.toLowerCase();
|
|
||||||
if (Version.RESOURCES_VERSION.endsWith("-snapshot")) {
|
|
||||||
Version.RESOURCES_VERSION = Version.RESOURCES_VERSION.replace("-snapshot", "-" + Time.currentTime());
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
Version.VERSION= Version.UNKNOWN;
|
|
||||||
Version.BUILD_TIME= Version.UNKNOWN;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
package org.keycloak.common.constants;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
|
|
||||||
*/
|
|
||||||
public interface ServiceAccountConstants {
|
|
||||||
|
|
||||||
String CLIENT_AUTH = "client_auth";
|
|
||||||
|
|
||||||
String SERVICE_ACCOUNT_USER_PREFIX = "service-account-";
|
|
||||||
|
|
||||||
String CLIENT_ID_PROTOCOL_MAPPER = "Client ID";
|
|
||||||
String CLIENT_HOST_PROTOCOL_MAPPER = "Client Host";
|
|
||||||
String CLIENT_ADDRESS_PROTOCOL_MAPPER = "Client IP Address";
|
|
||||||
String CLIENT_ID = "clientId";
|
|
||||||
String CLIENT_HOST = "clientHost";
|
|
||||||
String CLIENT_ADDRESS = "clientAddress";
|
|
||||||
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,56 +0,0 @@
|
|||||||
package org.keycloak.common.util;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.security.KeyStore;
|
|
||||||
import java.security.PrivateKey;
|
|
||||||
|
|
||||||
import org.keycloak.common.constants.GenericConstants;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
|
||||||
* @version $Revision: 1 $
|
|
||||||
*/
|
|
||||||
public class KeystoreUtil {
|
|
||||||
static {
|
|
||||||
BouncyIntegration.init();
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum KeystoreFormat {
|
|
||||||
JKS,
|
|
||||||
PKCS12
|
|
||||||
}
|
|
||||||
|
|
||||||
public static KeyStore loadKeyStore(String filename, String password) throws Exception {
|
|
||||||
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
|
|
||||||
InputStream trustStream = (filename.startsWith(GenericConstants.PROTOCOL_CLASSPATH))
|
|
||||||
?KeystoreUtil.class.getResourceAsStream(filename.replace(GenericConstants.PROTOCOL_CLASSPATH, ""))
|
|
||||||
:new FileInputStream(new File(filename));
|
|
||||||
trustStore.load(trustStream, password.toCharArray());
|
|
||||||
trustStream.close();
|
|
||||||
return trustStore;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PrivateKey loadPrivateKeyFromKeystore(String keystoreFile, String storePassword, String keyPassword, String keyAlias, KeystoreFormat format) {
|
|
||||||
InputStream stream = FindFile.findFile(keystoreFile);
|
|
||||||
|
|
||||||
try {
|
|
||||||
KeyStore keyStore = null;
|
|
||||||
if (format == KeystoreFormat.JKS) {
|
|
||||||
keyStore = KeyStore.getInstance(format.toString());
|
|
||||||
} else {
|
|
||||||
keyStore = KeyStore.getInstance(format.toString(), "BC");
|
|
||||||
}
|
|
||||||
|
|
||||||
keyStore.load(stream, storePassword.toCharArray());
|
|
||||||
PrivateKey key = (PrivateKey) keyStore.getKey(keyAlias, keyPassword.toCharArray());
|
|
||||||
if (key == null) {
|
|
||||||
throw new RuntimeException("Couldn't load key with alias '" + keyAlias + "' from keystore");
|
|
||||||
}
|
|
||||||
return key;
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException("Failed to load private key: " + e.getMessage(), e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package org.keycloak.common.util;
|
|
||||||
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
|
|
||||||
*/
|
|
||||||
public class SystemEnvProperties extends Properties {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getProperty(String key) {
|
|
||||||
if (key.startsWith("env.")) {
|
|
||||||
return System.getenv().get(key.substring(4));
|
|
||||||
} else {
|
|
||||||
return System.getProperty(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getProperty(String key, String defaultValue) {
|
|
||||||
String value = getProperty(key);
|
|
||||||
return value != null ? value : defaultValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
version=${product.version}
|
|
||||||
build-time=${product.build-time}
|
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|||||||
+12
-1
@@ -90,7 +90,18 @@ public class DefaultFileConnectionProviderFactory implements FileConnectionProvi
|
|||||||
ImportUtils.importFromStream(session, JsonSerialization.mapper, fis, Strategy.IGNORE_EXISTING);
|
ImportUtils.importFromStream(session, JsonSerialization.mapper, fis, Strategy.IGNORE_EXISTING);
|
||||||
session.realms().getMigrationModel().setStoredVersion(model.getModelVersion());
|
session.realms().getMigrationModel().setStoredVersion(model.getModelVersion());
|
||||||
|
|
||||||
ImportUtils.importRealms(session, model.getRealms(), Strategy.IGNORE_EXISTING);
|
List<RealmRepresentation> realmReps = new ArrayList<RealmRepresentation>();
|
||||||
|
for (RealmRepresentation realmRep : model.getRealms()) {
|
||||||
|
if (Config.getAdminRealm().equals(realmRep.getRealm())) {
|
||||||
|
realmReps.add(0, realmRep);
|
||||||
|
} else {
|
||||||
|
realmReps.add(realmRep);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (RealmRepresentation realmRep : realmReps) {
|
||||||
|
ImportUtils.importRealm(session, realmRep, Strategy.IGNORE_EXISTING);
|
||||||
|
}
|
||||||
|
|
||||||
} catch (IOException ioe) {
|
} catch (IOException ioe) {
|
||||||
logger.error("Unable to read model file " + kcdata.getAbsolutePath(), ioe);
|
logger.error("Unable to read model file " + kcdata.getAbsolutePath(), ioe);
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -9,11 +9,6 @@ import org.keycloak.provider.Spi;
|
|||||||
*/
|
*/
|
||||||
public class FileConnectionSpi implements Spi {
|
public class FileConnectionSpi implements Spi {
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInternal() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return "connectionsFile";
|
return "connectionsFile";
|
||||||
|
|||||||
@@ -1,30 +1,30 @@
|
|||||||
package org.keycloak.connections.file;
|
package org.keycloak.connections.file;
|
||||||
|
|
||||||
import org.keycloak.representations.idm.RealmRepresentation;
|
import org.keycloak.representations.idm.RealmRepresentation;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public class Model {
|
public class Model {
|
||||||
private String modelVersion;
|
private String modelVersion;
|
||||||
private List<RealmRepresentation> realms;
|
private List<RealmRepresentation> realms;
|
||||||
|
|
||||||
public String getModelVersion() {
|
public String getModelVersion() {
|
||||||
return modelVersion;
|
return modelVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setModelVersion(String modelVersion) {
|
public void setModelVersion(String modelVersion) {
|
||||||
this.modelVersion = modelVersion;
|
this.modelVersion = modelVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<RealmRepresentation> getRealms() {
|
public List<RealmRepresentation> getRealms() {
|
||||||
return realms;
|
return realms;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRealms(List<RealmRepresentation> realms) {
|
public void setRealms(List<RealmRepresentation> realms) {
|
||||||
this.realms = realms;
|
this.realms = realms;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,36 +1,36 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>keycloak-connections-http-client</artifactId>
|
<artifactId>keycloak-connections-http-client</artifactId>
|
||||||
<name>Keycloak Connections Apache HttpClient</name>
|
<name>Keycloak Connections Apache HttpClient</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-core</artifactId>
|
<artifactId>keycloak-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-model-api</artifactId>
|
<artifactId>keycloak-model-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpclient</artifactId>
|
<artifactId>httpclient</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jboss.logging</groupId>
|
<groupId>org.jboss.logging</groupId>
|
||||||
<artifactId>jboss-logging</artifactId>
|
<artifactId>jboss-logging</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
+2
-2
@@ -12,8 +12,8 @@ import org.jboss.logging.Logger;
|
|||||||
import org.keycloak.Config;
|
import org.keycloak.Config;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.KeycloakSessionFactory;
|
import org.keycloak.models.KeycloakSessionFactory;
|
||||||
import org.keycloak.common.util.EnvUtil;
|
import org.keycloak.util.EnvUtil;
|
||||||
import org.keycloak.common.util.KeystoreUtil;
|
import org.keycloak.util.KeystoreUtil;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
|||||||
+280
-280
@@ -1,281 +1,281 @@
|
|||||||
package org.keycloak.connections.httpclient;
|
package org.keycloak.connections.httpclient;
|
||||||
|
|
||||||
import org.apache.http.client.config.RequestConfig;
|
import org.apache.http.client.config.RequestConfig;
|
||||||
import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
|
import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
|
||||||
import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
|
import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
|
||||||
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
|
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
|
||||||
import org.apache.http.conn.ssl.SSLContexts;
|
import org.apache.http.conn.ssl.SSLContexts;
|
||||||
import org.apache.http.conn.ssl.StrictHostnameVerifier;
|
import org.apache.http.conn.ssl.StrictHostnameVerifier;
|
||||||
import org.apache.http.conn.ssl.X509HostnameVerifier;
|
import org.apache.http.conn.ssl.X509HostnameVerifier;
|
||||||
import org.apache.http.impl.client.CloseableHttpClient;
|
import org.apache.http.impl.client.CloseableHttpClient;
|
||||||
import org.apache.http.impl.client.HttpClients;
|
import org.apache.http.impl.client.HttpClients;
|
||||||
|
|
||||||
import javax.net.ssl.HostnameVerifier;
|
import javax.net.ssl.HostnameVerifier;
|
||||||
import javax.net.ssl.SSLContext;
|
import javax.net.ssl.SSLContext;
|
||||||
import javax.net.ssl.SSLException;
|
import javax.net.ssl.SSLException;
|
||||||
import javax.net.ssl.SSLSession;
|
import javax.net.ssl.SSLSession;
|
||||||
import javax.net.ssl.SSLSocket;
|
import javax.net.ssl.SSLSocket;
|
||||||
import javax.net.ssl.TrustManager;
|
import javax.net.ssl.TrustManager;
|
||||||
import javax.net.ssl.X509TrustManager;
|
import javax.net.ssl.X509TrustManager;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.security.KeyManagementException;
|
import java.security.KeyManagementException;
|
||||||
import java.security.KeyStore;
|
import java.security.KeyStore;
|
||||||
import java.security.KeyStoreException;
|
import java.security.KeyStoreException;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
import java.security.SecureRandom;
|
import java.security.SecureRandom;
|
||||||
import java.security.UnrecoverableKeyException;
|
import java.security.UnrecoverableKeyException;
|
||||||
import java.security.cert.CertificateException;
|
import java.security.cert.CertificateException;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Abstraction for creating HttpClients. Allows SSL configuration.
|
* Abstraction for creating HttpClients. Allows SSL configuration.
|
||||||
*
|
*
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public class HttpClientBuilder {
|
public class HttpClientBuilder {
|
||||||
public static enum HostnameVerificationPolicy {
|
public static enum HostnameVerificationPolicy {
|
||||||
/**
|
/**
|
||||||
* Hostname verification is not done on the server's certificate
|
* Hostname verification is not done on the server's certificate
|
||||||
*/
|
*/
|
||||||
ANY,
|
ANY,
|
||||||
/**
|
/**
|
||||||
* Allows wildcards in subdomain names i.e. *.foo.com
|
* Allows wildcards in subdomain names i.e. *.foo.com
|
||||||
*/
|
*/
|
||||||
WILDCARD,
|
WILDCARD,
|
||||||
/**
|
/**
|
||||||
* CN must match hostname connecting to
|
* CN must match hostname connecting to
|
||||||
*/
|
*/
|
||||||
STRICT
|
STRICT
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
private static class PassthroughTrustManager implements X509TrustManager {
|
private static class PassthroughTrustManager implements X509TrustManager {
|
||||||
public void checkClientTrusted(X509Certificate[] chain,
|
public void checkClientTrusted(X509Certificate[] chain,
|
||||||
String authType) throws CertificateException {
|
String authType) throws CertificateException {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void checkServerTrusted(X509Certificate[] chain,
|
public void checkServerTrusted(X509Certificate[] chain,
|
||||||
String authType) throws CertificateException {
|
String authType) throws CertificateException {
|
||||||
}
|
}
|
||||||
|
|
||||||
public X509Certificate[] getAcceptedIssuers() {
|
public X509Certificate[] getAcceptedIssuers() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected KeyStore truststore;
|
protected KeyStore truststore;
|
||||||
protected KeyStore clientKeyStore;
|
protected KeyStore clientKeyStore;
|
||||||
protected String clientPrivateKeyPassword;
|
protected String clientPrivateKeyPassword;
|
||||||
protected boolean disableTrustManager;
|
protected boolean disableTrustManager;
|
||||||
protected HostnameVerificationPolicy policy = HostnameVerificationPolicy.WILDCARD;
|
protected HostnameVerificationPolicy policy = HostnameVerificationPolicy.WILDCARD;
|
||||||
protected SSLContext sslContext;
|
protected SSLContext sslContext;
|
||||||
protected int connectionPoolSize = 100;
|
protected int connectionPoolSize = 100;
|
||||||
protected int maxPooledPerRoute = 0;
|
protected int maxPooledPerRoute = 0;
|
||||||
protected long connectionTTL = -1;
|
protected long connectionTTL = -1;
|
||||||
protected TimeUnit connectionTTLUnit = TimeUnit.MILLISECONDS;
|
protected TimeUnit connectionTTLUnit = TimeUnit.MILLISECONDS;
|
||||||
protected HostnameVerifier verifier = null;
|
protected HostnameVerifier verifier = null;
|
||||||
protected long socketTimeout = -1;
|
protected long socketTimeout = -1;
|
||||||
protected TimeUnit socketTimeoutUnits = TimeUnit.MILLISECONDS;
|
protected TimeUnit socketTimeoutUnits = TimeUnit.MILLISECONDS;
|
||||||
protected long establishConnectionTimeout = -1;
|
protected long establishConnectionTimeout = -1;
|
||||||
protected TimeUnit establishConnectionTimeoutUnits = TimeUnit.MILLISECONDS;
|
protected TimeUnit establishConnectionTimeoutUnits = TimeUnit.MILLISECONDS;
|
||||||
protected boolean disableCookies = false;
|
protected boolean disableCookies = false;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Socket inactivity timeout
|
* Socket inactivity timeout
|
||||||
*
|
*
|
||||||
* @param timeout
|
* @param timeout
|
||||||
* @param unit
|
* @param unit
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public HttpClientBuilder socketTimeout(long timeout, TimeUnit unit)
|
public HttpClientBuilder socketTimeout(long timeout, TimeUnit unit)
|
||||||
{
|
{
|
||||||
this.socketTimeout = timeout;
|
this.socketTimeout = timeout;
|
||||||
this.socketTimeoutUnits = unit;
|
this.socketTimeoutUnits = unit;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* When trying to make an initial socket connection, what is the timeout?
|
* When trying to make an initial socket connection, what is the timeout?
|
||||||
*
|
*
|
||||||
* @param timeout
|
* @param timeout
|
||||||
* @param unit
|
* @param unit
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public HttpClientBuilder establishConnectionTimeout(long timeout, TimeUnit unit)
|
public HttpClientBuilder establishConnectionTimeout(long timeout, TimeUnit unit)
|
||||||
{
|
{
|
||||||
this.establishConnectionTimeout = timeout;
|
this.establishConnectionTimeout = timeout;
|
||||||
this.establishConnectionTimeoutUnits = unit;
|
this.establishConnectionTimeoutUnits = unit;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public HttpClientBuilder connectionTTL(long ttl, TimeUnit unit) {
|
public HttpClientBuilder connectionTTL(long ttl, TimeUnit unit) {
|
||||||
this.connectionTTL = ttl;
|
this.connectionTTL = ttl;
|
||||||
this.connectionTTLUnit = unit;
|
this.connectionTTLUnit = unit;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public HttpClientBuilder maxPooledPerRoute(int maxPooledPerRoute) {
|
public HttpClientBuilder maxPooledPerRoute(int maxPooledPerRoute) {
|
||||||
this.maxPooledPerRoute = maxPooledPerRoute;
|
this.maxPooledPerRoute = maxPooledPerRoute;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public HttpClientBuilder connectionPoolSize(int connectionPoolSize) {
|
public HttpClientBuilder connectionPoolSize(int connectionPoolSize) {
|
||||||
this.connectionPoolSize = connectionPoolSize;
|
this.connectionPoolSize = connectionPoolSize;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Disable trust management and hostname verification. <i>NOTE</i> this is a security
|
* Disable trust management and hostname verification. <i>NOTE</i> this is a security
|
||||||
* hole, so only set this option if you cannot or do not want to verify the identity of the
|
* hole, so only set this option if you cannot or do not want to verify the identity of the
|
||||||
* host you are communicating with.
|
* host you are communicating with.
|
||||||
*/
|
*/
|
||||||
public HttpClientBuilder disableTrustManager() {
|
public HttpClientBuilder disableTrustManager() {
|
||||||
this.disableTrustManager = true;
|
this.disableTrustManager = true;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Disable cookie management.
|
* Disable cookie management.
|
||||||
*/
|
*/
|
||||||
public HttpClientBuilder disableCookies(boolean disable) {
|
public HttpClientBuilder disableCookies(boolean disable) {
|
||||||
this.disableTrustManager = disable;
|
this.disableTrustManager = disable;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SSL policy used to verify hostnames
|
* SSL policy used to verify hostnames
|
||||||
*
|
*
|
||||||
* @param policy
|
* @param policy
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public HttpClientBuilder hostnameVerification(HostnameVerificationPolicy policy) {
|
public HttpClientBuilder hostnameVerification(HostnameVerificationPolicy policy) {
|
||||||
this.policy = policy;
|
this.policy = policy;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public HttpClientBuilder sslContext(SSLContext sslContext) {
|
public HttpClientBuilder sslContext(SSLContext sslContext) {
|
||||||
this.sslContext = sslContext;
|
this.sslContext = sslContext;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public HttpClientBuilder trustStore(KeyStore truststore) {
|
public HttpClientBuilder trustStore(KeyStore truststore) {
|
||||||
this.truststore = truststore;
|
this.truststore = truststore;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public HttpClientBuilder keyStore(KeyStore keyStore, String password) {
|
public HttpClientBuilder keyStore(KeyStore keyStore, String password) {
|
||||||
this.clientKeyStore = keyStore;
|
this.clientKeyStore = keyStore;
|
||||||
this.clientPrivateKeyPassword = password;
|
this.clientPrivateKeyPassword = password;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public HttpClientBuilder keyStore(KeyStore keyStore, char[] password) {
|
public HttpClientBuilder keyStore(KeyStore keyStore, char[] password) {
|
||||||
this.clientKeyStore = keyStore;
|
this.clientKeyStore = keyStore;
|
||||||
this.clientPrivateKeyPassword = new String(password);
|
this.clientPrivateKeyPassword = new String(password);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static class VerifierWrapper implements X509HostnameVerifier {
|
static class VerifierWrapper implements X509HostnameVerifier {
|
||||||
protected HostnameVerifier verifier;
|
protected HostnameVerifier verifier;
|
||||||
|
|
||||||
VerifierWrapper(HostnameVerifier verifier) {
|
VerifierWrapper(HostnameVerifier verifier) {
|
||||||
this.verifier = verifier;
|
this.verifier = verifier;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void verify(String host, SSLSocket ssl) throws IOException {
|
public void verify(String host, SSLSocket ssl) throws IOException {
|
||||||
if (!verifier.verify(host, ssl.getSession())) throw new SSLException("Hostname verification failure");
|
if (!verifier.verify(host, ssl.getSession())) throw new SSLException("Hostname verification failure");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void verify(String host, X509Certificate cert) throws SSLException {
|
public void verify(String host, X509Certificate cert) throws SSLException {
|
||||||
throw new SSLException("This verification path not implemented");
|
throw new SSLException("This verification path not implemented");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void verify(String host, String[] cns, String[] subjectAlts) throws SSLException {
|
public void verify(String host, String[] cns, String[] subjectAlts) throws SSLException {
|
||||||
throw new SSLException("This verification path not implemented");
|
throw new SSLException("This verification path not implemented");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean verify(String s, SSLSession sslSession) {
|
public boolean verify(String s, SSLSession sslSession) {
|
||||||
return verifier.verify(s, sslSession);
|
return verifier.verify(s, sslSession);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public CloseableHttpClient build() {
|
public CloseableHttpClient build() {
|
||||||
X509HostnameVerifier verifier = null;
|
X509HostnameVerifier verifier = null;
|
||||||
if (this.verifier != null) verifier = new VerifierWrapper(this.verifier);
|
if (this.verifier != null) verifier = new VerifierWrapper(this.verifier);
|
||||||
else {
|
else {
|
||||||
switch (policy) {
|
switch (policy) {
|
||||||
case ANY:
|
case ANY:
|
||||||
verifier = new AllowAllHostnameVerifier();
|
verifier = new AllowAllHostnameVerifier();
|
||||||
break;
|
break;
|
||||||
case WILDCARD:
|
case WILDCARD:
|
||||||
verifier = new BrowserCompatHostnameVerifier();
|
verifier = new BrowserCompatHostnameVerifier();
|
||||||
break;
|
break;
|
||||||
case STRICT:
|
case STRICT:
|
||||||
verifier = new StrictHostnameVerifier();
|
verifier = new StrictHostnameVerifier();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
SSLConnectionSocketFactory sslsf = null;
|
SSLConnectionSocketFactory sslsf = null;
|
||||||
SSLContext theContext = sslContext;
|
SSLContext theContext = sslContext;
|
||||||
if (disableTrustManager) {
|
if (disableTrustManager) {
|
||||||
theContext = SSLContext.getInstance("TLS");
|
theContext = SSLContext.getInstance("TLS");
|
||||||
theContext.init(null, new TrustManager[]{new PassthroughTrustManager()},
|
theContext.init(null, new TrustManager[]{new PassthroughTrustManager()},
|
||||||
new SecureRandom());
|
new SecureRandom());
|
||||||
verifier = new AllowAllHostnameVerifier();
|
verifier = new AllowAllHostnameVerifier();
|
||||||
sslsf = new SSLConnectionSocketFactory(theContext, verifier);
|
sslsf = new SSLConnectionSocketFactory(theContext, verifier);
|
||||||
} else if (theContext != null) {
|
} else if (theContext != null) {
|
||||||
sslsf = new SSLConnectionSocketFactory(theContext, verifier);
|
sslsf = new SSLConnectionSocketFactory(theContext, verifier);
|
||||||
} else if (clientKeyStore != null || truststore != null) {
|
} else if (clientKeyStore != null || truststore != null) {
|
||||||
theContext = createSslContext("TLS", clientKeyStore, clientPrivateKeyPassword, truststore, null);
|
theContext = createSslContext("TLS", clientKeyStore, clientPrivateKeyPassword, truststore, null);
|
||||||
sslsf = new SSLConnectionSocketFactory(theContext, verifier);
|
sslsf = new SSLConnectionSocketFactory(theContext, verifier);
|
||||||
} else {
|
} else {
|
||||||
final SSLContext tlsContext = SSLContext.getInstance("TLS");
|
final SSLContext tlsContext = SSLContext.getInstance("TLS");
|
||||||
tlsContext.init(null, null, null);
|
tlsContext.init(null, null, null);
|
||||||
sslsf = new SSLConnectionSocketFactory(tlsContext, verifier);
|
sslsf = new SSLConnectionSocketFactory(tlsContext, verifier);
|
||||||
}
|
}
|
||||||
RequestConfig requestConfig = RequestConfig.custom()
|
RequestConfig requestConfig = RequestConfig.custom()
|
||||||
.setConnectTimeout((int) establishConnectionTimeout)
|
.setConnectTimeout((int) establishConnectionTimeout)
|
||||||
.setSocketTimeout((int) socketTimeout).build();
|
.setSocketTimeout((int) socketTimeout).build();
|
||||||
|
|
||||||
org.apache.http.impl.client.HttpClientBuilder builder = HttpClients.custom()
|
org.apache.http.impl.client.HttpClientBuilder builder = HttpClients.custom()
|
||||||
.setDefaultRequestConfig(requestConfig)
|
.setDefaultRequestConfig(requestConfig)
|
||||||
.setSSLSocketFactory(sslsf)
|
.setSSLSocketFactory(sslsf)
|
||||||
.setMaxConnTotal(connectionPoolSize)
|
.setMaxConnTotal(connectionPoolSize)
|
||||||
.setMaxConnPerRoute(maxPooledPerRoute);
|
.setMaxConnPerRoute(maxPooledPerRoute);
|
||||||
if (disableCookies) builder.disableCookieManagement();
|
if (disableCookies) builder.disableCookieManagement();
|
||||||
return builder.build();
|
return builder.build();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private SSLContext createSslContext(
|
private SSLContext createSslContext(
|
||||||
final String algorithm,
|
final String algorithm,
|
||||||
final KeyStore keystore,
|
final KeyStore keystore,
|
||||||
final String keyPassword,
|
final String keyPassword,
|
||||||
final KeyStore truststore,
|
final KeyStore truststore,
|
||||||
final SecureRandom random)
|
final SecureRandom random)
|
||||||
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
|
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
|
||||||
return SSLContexts.custom()
|
return SSLContexts.custom()
|
||||||
.useProtocol(algorithm)
|
.useProtocol(algorithm)
|
||||||
.setSecureRandom(random)
|
.setSecureRandom(random)
|
||||||
.loadKeyMaterial(keystore, keyPassword != null ? keyPassword.toCharArray() : null)
|
.loadKeyMaterial(keystore, keyPassword != null ? keyPassword.toCharArray() : null)
|
||||||
.loadTrustMaterial(truststore)
|
.loadTrustMaterial(truststore)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
-5
@@ -9,11 +9,6 @@ import org.keycloak.provider.Spi;
|
|||||||
*/
|
*/
|
||||||
public class HttpClientSpi implements Spi {
|
public class HttpClientSpi implements Spi {
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInternal() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return "connectionsHttpClient";
|
return "connectionsHttpClient";
|
||||||
|
|||||||
@@ -1,32 +1,31 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>keycloak-connections-infinispan</artifactId>
|
<artifactId>keycloak-connections-infinispan</artifactId>
|
||||||
<name>Keycloak Connections Infinispan</name>
|
<name>Keycloak Connections Infinispan</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-core</artifactId>
|
<artifactId>keycloak-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-model-api</artifactId>
|
<artifactId>keycloak-model-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.infinispan</groupId>
|
<groupId>org.infinispan</groupId>
|
||||||
<artifactId>infinispan-core</artifactId>
|
<artifactId>infinispan-core</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
</dependencies>
|
</project>
|
||||||
</project>
|
|
||||||
-13
@@ -66,19 +66,6 @@ public class DefaultInfinispanConnectionProviderFactory implements InfinispanCon
|
|||||||
} else {
|
} else {
|
||||||
initEmbedded();
|
initEmbedded();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Backwards compatibility
|
|
||||||
if (cacheManager.getCacheConfiguration(InfinispanConnectionProvider.OFFLINE_SESSION_CACHE_NAME) == null) {
|
|
||||||
logger.warnf("No configuration provided for '%s' cache. Using '%s' configuration as template",
|
|
||||||
InfinispanConnectionProvider.OFFLINE_SESSION_CACHE_NAME, InfinispanConnectionProvider.SESSION_CACHE_NAME);
|
|
||||||
|
|
||||||
Configuration sessionCacheConfig = cacheManager.getCacheConfiguration(InfinispanConnectionProvider.SESSION_CACHE_NAME);
|
|
||||||
if (sessionCacheConfig != null) {
|
|
||||||
ConfigurationBuilder confBuilder = new ConfigurationBuilder().read(sessionCacheConfig);
|
|
||||||
Configuration offlineSessionConfig = confBuilder.build();
|
|
||||||
cacheManager.defineConfiguration(InfinispanConnectionProvider.OFFLINE_SESSION_CACHE_NAME, offlineSessionConfig);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -11,7 +11,6 @@ public interface InfinispanConnectionProvider extends Provider {
|
|||||||
static final String REALM_CACHE_NAME = "realms";
|
static final String REALM_CACHE_NAME = "realms";
|
||||||
static final String USER_CACHE_NAME = "users";
|
static final String USER_CACHE_NAME = "users";
|
||||||
static final String SESSION_CACHE_NAME = "sessions";
|
static final String SESSION_CACHE_NAME = "sessions";
|
||||||
static final String OFFLINE_SESSION_CACHE_NAME = "offlineSessions";
|
|
||||||
static final String LOGIN_FAILURE_CACHE_NAME = "loginFailures";
|
static final String LOGIN_FAILURE_CACHE_NAME = "loginFailures";
|
||||||
|
|
||||||
<K, V> Cache<K, V> getCache(String name);
|
<K, V> Cache<K, V> getCache(String name);
|
||||||
|
|||||||
-5
@@ -9,11 +9,6 @@ import org.keycloak.provider.Spi;
|
|||||||
*/
|
*/
|
||||||
public class InfinispanConnectionSpi implements Spi {
|
public class InfinispanConnectionSpi implements Spi {
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInternal() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return "connectionsInfinispan";
|
return "connectionsInfinispan";
|
||||||
|
|||||||
@@ -1,76 +1,76 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>keycloak-connections-jpa-liquibase</artifactId>
|
<artifactId>keycloak-connections-jpa-liquibase</artifactId>
|
||||||
<name>Keycloak Connections JPA Liquibase Updater</name>
|
<name>Keycloak Connections JPA Liquibase Updater</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-connections-jpa</artifactId>
|
<artifactId>keycloak-connections-jpa</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-model-api</artifactId>
|
<artifactId>keycloak-model-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.liquibase</groupId>
|
<groupId>org.liquibase</groupId>
|
||||||
<artifactId>liquibase-core</artifactId>
|
<artifactId>liquibase-core</artifactId>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.yaml</groupId>
|
<groupId>org.yaml</groupId>
|
||||||
<artifactId>snakeyaml</artifactId>
|
<artifactId>snakeyaml</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jboss.logging</groupId>
|
<groupId>org.jboss.logging</groupId>
|
||||||
<artifactId>jboss-logging</artifactId>
|
<artifactId>jboss-logging</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-services</artifactId>
|
<artifactId>keycloak-services</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.h2database</groupId>
|
<groupId>com.h2database</groupId>
|
||||||
<artifactId>h2</artifactId>
|
<artifactId>h2</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.liquibase</groupId>
|
<groupId>org.liquibase</groupId>
|
||||||
<artifactId>liquibase-maven-plugin</artifactId>
|
<artifactId>liquibase-maven-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<changeLogFile>META-INF/jpa-changelog-master.xml</changeLogFile>
|
<changeLogFile>META-INF/jpa-changelog-master.xml</changeLogFile>
|
||||||
|
|
||||||
<url>${project.url}</url>
|
<url>${url}</url>
|
||||||
<driver>${driver}</driver>
|
<driver>${driver}</driver>
|
||||||
<username>${username}</username>
|
<username>${username}</username>
|
||||||
<password>${password}</password>
|
<password>${password}</password>
|
||||||
|
|
||||||
<referenceUrl>${referenceUrl}</referenceUrl>
|
<referenceUrl>${referenceUrl}</referenceUrl>
|
||||||
<referenceDriver>${driver}</referenceDriver>
|
<referenceDriver>${driver}</referenceDriver>
|
||||||
<referenceUsername>${username}</referenceUsername>
|
<referenceUsername>${username}</referenceUsername>
|
||||||
<referencePassword>${password}</referencePassword>
|
<referencePassword>${password}</referencePassword>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<username>sa</username>
|
<username>sa</username>
|
||||||
<password></password>
|
<password></password>
|
||||||
<driver>org.h2.Driver</driver>
|
<driver>org.h2.Driver</driver>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
+8
-15
@@ -46,26 +46,26 @@ public class LiquibaseJpaUpdaterProvider implements JpaUpdaterProvider {
|
|||||||
private static final String CHANGELOG = "META-INF/jpa-changelog-master.xml";
|
private static final String CHANGELOG = "META-INF/jpa-changelog-master.xml";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getCurrentVersionSql(String defaultSchema) {
|
public String getCurrentVersionSql() {
|
||||||
return "SELECT ID from " + getTable("DATABASECHANGELOG", defaultSchema) + " ORDER BY DATEEXECUTED DESC LIMIT 1";
|
return "SELECT ID from DATABASECHANGELOG ORDER BY DATEEXECUTED DESC LIMIT 1";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update(KeycloakSession session, Connection connection, String defaultSchema) {
|
public void update(KeycloakSession session, Connection connection) {
|
||||||
logger.debug("Starting database update");
|
logger.debug("Starting database update");
|
||||||
|
|
||||||
// Need ThreadLocal as liquibase doesn't seem to have API to inject custom objects into tasks
|
// Need ThreadLocal as liquibase doesn't seem to have API to inject custom objects into tasks
|
||||||
ThreadLocalSessionContext.setCurrentSession(session);
|
ThreadLocalSessionContext.setCurrentSession(session);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Liquibase liquibase = getLiquibase(connection, defaultSchema);
|
Liquibase liquibase = getLiquibase(connection);
|
||||||
|
|
||||||
List<ChangeSet> changeSets = liquibase.listUnrunChangeSets((Contexts) null);
|
List<ChangeSet> changeSets = liquibase.listUnrunChangeSets((Contexts) null);
|
||||||
if (!changeSets.isEmpty()) {
|
if (!changeSets.isEmpty()) {
|
||||||
if (changeSets.get(0).getId().equals(FIRST_VERSION)) {
|
if (changeSets.get(0).getId().equals(FIRST_VERSION)) {
|
||||||
Statement statement = connection.createStatement();
|
Statement statement = connection.createStatement();
|
||||||
try {
|
try {
|
||||||
statement.executeQuery("SELECT id FROM " + getTable("REALM", defaultSchema));
|
statement.executeQuery("SELECT id FROM REALM");
|
||||||
|
|
||||||
logger.infov("Updating database from {0} to {1}", FIRST_VERSION, changeSets.get(changeSets.size() - 1).getId());
|
logger.infov("Updating database from {0} to {1}", FIRST_VERSION, changeSets.get(changeSets.size() - 1).getId());
|
||||||
liquibase.markNextChangeSetRan(null);
|
liquibase.markNextChangeSetRan(null);
|
||||||
@@ -93,9 +93,9 @@ public class LiquibaseJpaUpdaterProvider implements JpaUpdaterProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void validate(Connection connection, String defaultSchema) {
|
public void validate(Connection connection) {
|
||||||
try {
|
try {
|
||||||
Liquibase liquibase = getLiquibase(connection, defaultSchema);
|
Liquibase liquibase = getLiquibase(connection);
|
||||||
|
|
||||||
liquibase.validate();
|
liquibase.validate();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -103,7 +103,7 @@ public class LiquibaseJpaUpdaterProvider implements JpaUpdaterProvider {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Liquibase getLiquibase(Connection connection, String defaultSchema) throws Exception {
|
private Liquibase getLiquibase(Connection connection) throws Exception {
|
||||||
ServiceLocator sl = ServiceLocator.getInstance();
|
ServiceLocator sl = ServiceLocator.getInstance();
|
||||||
|
|
||||||
if (!System.getProperties().containsKey("liquibase.scan.packages")) {
|
if (!System.getProperties().containsKey("liquibase.scan.packages")) {
|
||||||
@@ -125,9 +125,6 @@ public class LiquibaseJpaUpdaterProvider implements JpaUpdaterProvider {
|
|||||||
|
|
||||||
LogFactory.setInstance(new LogWrapper());
|
LogFactory.setInstance(new LogWrapper());
|
||||||
Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(connection));
|
Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(connection));
|
||||||
if (defaultSchema != null) {
|
|
||||||
database.setDefaultSchemaName(defaultSchema);
|
|
||||||
}
|
|
||||||
return new Liquibase(CHANGELOG, new ClassLoaderResourceAccessor(getClass().getClassLoader()), database);
|
return new Liquibase(CHANGELOG, new ClassLoaderResourceAccessor(getClass().getClassLoader()), database);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -231,8 +228,4 @@ public class LiquibaseJpaUpdaterProvider implements JpaUpdaterProvider {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getTable(String table, String defaultSchema) {
|
|
||||||
return defaultSchema != null ? defaultSchema + "." + table : table;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
+1
-2
@@ -12,7 +12,6 @@ import liquibase.statement.SqlStatement;
|
|||||||
import liquibase.statement.core.UpdateStatement;
|
import liquibase.statement.core.UpdateStatement;
|
||||||
import liquibase.structure.core.Schema;
|
import liquibase.structure.core.Schema;
|
||||||
import liquibase.structure.core.Table;
|
import liquibase.structure.core.Table;
|
||||||
import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider;
|
|
||||||
import org.keycloak.models.utils.KeycloakModelUtils;
|
import org.keycloak.models.utils.KeycloakModelUtils;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
@@ -37,7 +36,7 @@ public class AddRealmCodeSecret implements CustomSqlChange {
|
|||||||
|
|
||||||
String correctedTableName = database.correctObjectName("REALM", Table.class);
|
String correctedTableName = database.correctObjectName("REALM", Table.class);
|
||||||
if (SnapshotGeneratorFactory.getInstance().has(new Table().setName(correctedTableName), database)) {
|
if (SnapshotGeneratorFactory.getInstance().has(new Table().setName(correctedTableName), database)) {
|
||||||
ResultSet resultSet = connection.createStatement().executeQuery("SELECT ID FROM " + LiquibaseJpaUpdaterProvider.getTable(correctedTableName, database.getDefaultSchemaName()) + " WHERE CODE_SECRET IS NULL");
|
ResultSet resultSet = connection.createStatement().executeQuery("SELECT ID FROM REALM WHERE CODE_SECRET IS NULL");
|
||||||
while (resultSet.next()) {
|
while (resultSet.next()) {
|
||||||
String id = resultSet.getString(1);
|
String id = resultSet.getString(1);
|
||||||
|
|
||||||
|
|||||||
+1
-7
@@ -16,7 +16,6 @@ import liquibase.snapshot.SnapshotGeneratorFactory;
|
|||||||
import liquibase.statement.SqlStatement;
|
import liquibase.statement.SqlStatement;
|
||||||
import liquibase.structure.core.Table;
|
import liquibase.structure.core.Table;
|
||||||
import org.jboss.logging.Logger;
|
import org.jboss.logging.Logger;
|
||||||
import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider;
|
|
||||||
import org.keycloak.connections.jpa.updater.liquibase.ThreadLocalSessionContext;
|
import org.keycloak.connections.jpa.updater.liquibase.ThreadLocalSessionContext;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.services.DefaultKeycloakSessionFactory;
|
import org.keycloak.services.DefaultKeycloakSessionFactory;
|
||||||
@@ -89,7 +88,7 @@ public abstract class CustomKeycloakTask implements CustomSqlChange {
|
|||||||
try {
|
try {
|
||||||
String correctedTableName = database.correctObjectName("REALM", Table.class);
|
String correctedTableName = database.correctObjectName("REALM", Table.class);
|
||||||
if (SnapshotGeneratorFactory.getInstance().has(new Table().setName(correctedTableName), database)) {
|
if (SnapshotGeneratorFactory.getInstance().has(new Table().setName(correctedTableName), database)) {
|
||||||
ResultSet resultSet = connection.createStatement().executeQuery("SELECT ID FROM " + getTableName(correctedTableName));
|
ResultSet resultSet = connection.createStatement().executeQuery("SELECT ID FROM REALM");
|
||||||
try {
|
try {
|
||||||
return (resultSet.next());
|
return (resultSet.next());
|
||||||
} finally {
|
} finally {
|
||||||
@@ -109,9 +108,4 @@ public abstract class CustomKeycloakTask implements CustomSqlChange {
|
|||||||
protected abstract void generateStatementsImpl() throws CustomChangeException;
|
protected abstract void generateStatementsImpl() throws CustomChangeException;
|
||||||
|
|
||||||
protected abstract String getTaskId();
|
protected abstract String getTaskId();
|
||||||
|
|
||||||
// get Table name for sql selects
|
|
||||||
protected String getTableName(String tableName) {
|
|
||||||
return LiquibaseJpaUpdaterProvider.getTable(tableName, database.getDefaultSchemaName());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+8
-13
@@ -11,7 +11,6 @@ import liquibase.statement.core.InsertStatement;
|
|||||||
import liquibase.statement.core.UpdateStatement;
|
import liquibase.statement.core.UpdateStatement;
|
||||||
import liquibase.structure.core.Table;
|
import liquibase.structure.core.Table;
|
||||||
import org.keycloak.Config;
|
import org.keycloak.Config;
|
||||||
import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider;
|
|
||||||
import org.keycloak.migration.MigrationProvider;
|
import org.keycloak.migration.MigrationProvider;
|
||||||
import org.keycloak.models.AdminRoles;
|
import org.keycloak.models.AdminRoles;
|
||||||
import org.keycloak.models.ClaimMask;
|
import org.keycloak.models.ClaimMask;
|
||||||
@@ -50,10 +49,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
|
|||||||
String identityProviderTableName = database.correctObjectName("IDENTITY_PROVIDER", Table.class);
|
String identityProviderTableName = database.correctObjectName("IDENTITY_PROVIDER", Table.class);
|
||||||
String idpConfigTableName = database.correctObjectName("IDENTITY_PROVIDER_CONFIG", Table.class);
|
String idpConfigTableName = database.correctObjectName("IDENTITY_PROVIDER_CONFIG", Table.class);
|
||||||
|
|
||||||
String realmSocialConfigTable = getTableName("REALM_SOCIAL_CONFIG");
|
PreparedStatement statement = jdbcConnection.prepareStatement("select RSC.NAME, VALUE, REALM_ID, UPDATE_PROFILE_ON_SOC_LOGIN from REALM_SOCIAL_CONFIG RSC,REALM where RSC.REALM_ID = REALM.ID ORDER BY RSC.REALM_ID, RSC.NAME");
|
||||||
String realmTableName = getTableName("REALM");
|
|
||||||
PreparedStatement statement = jdbcConnection.prepareStatement("select RSC.NAME, VALUE, REALM_ID, UPDATE_PROFILE_ON_SOC_LOGIN from " + realmSocialConfigTable + " RSC," + realmTableName +
|
|
||||||
" REALM where RSC.REALM_ID = REALM.ID ORDER BY RSC.REALM_ID, RSC.NAME");
|
|
||||||
try {
|
try {
|
||||||
ResultSet resultSet = statement.executeQuery();
|
ResultSet resultSet = statement.executeQuery();
|
||||||
try {
|
try {
|
||||||
@@ -128,7 +124,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
|
|||||||
|
|
||||||
protected void convertSocialToIdFedUsers() throws SQLException, DatabaseException {
|
protected void convertSocialToIdFedUsers() throws SQLException, DatabaseException {
|
||||||
String federatedIdentityTableName = database.correctObjectName("FEDERATED_IDENTITY", Table.class);
|
String federatedIdentityTableName = database.correctObjectName("FEDERATED_IDENTITY", Table.class);
|
||||||
PreparedStatement statement = jdbcConnection.prepareStatement("select REALM_ID, USER_ID, SOCIAL_PROVIDER, SOCIAL_USER_ID, SOCIAL_USERNAME from " + getTableName("USER_SOCIAL_LINK"));
|
PreparedStatement statement = jdbcConnection.prepareStatement("select REALM_ID, USER_ID, SOCIAL_PROVIDER, SOCIAL_USER_ID, SOCIAL_USERNAME from USER_SOCIAL_LINK");
|
||||||
try {
|
try {
|
||||||
ResultSet resultSet = statement.executeQuery();
|
ResultSet resultSet = statement.executeQuery();
|
||||||
try {
|
try {
|
||||||
@@ -174,7 +170,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
|
|||||||
String adminRoleId = getAdminRoleId();
|
String adminRoleId = getAdminRoleId();
|
||||||
String masterRealmId = Config.getAdminRealm();
|
String masterRealmId = Config.getAdminRealm();
|
||||||
|
|
||||||
PreparedStatement statement = jdbcConnection.prepareStatement("select NAME from " + getTableName("REALM"));
|
PreparedStatement statement = jdbcConnection.prepareStatement("select NAME from REALM");
|
||||||
try {
|
try {
|
||||||
ResultSet resultSet = statement.executeQuery();
|
ResultSet resultSet = statement.executeQuery();
|
||||||
try {
|
try {
|
||||||
@@ -182,7 +178,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
|
|||||||
String realmName = resultSet.getString("NAME");
|
String realmName = resultSet.getString("NAME");
|
||||||
String masterAdminAppName = realmName + "-realm";
|
String masterAdminAppName = realmName + "-realm";
|
||||||
|
|
||||||
PreparedStatement statement2 = jdbcConnection.prepareStatement("select ID from " + getTableName("CLIENT") + " where REALM_ID = ? AND NAME = ?");
|
PreparedStatement statement2 = jdbcConnection.prepareStatement("select ID from CLIENT where REALM_ID = ? AND NAME = ?");
|
||||||
statement2.setString(1, masterRealmId);
|
statement2.setString(1, masterRealmId);
|
||||||
statement2.setString(2, masterAdminAppName);
|
statement2.setString(2, masterAdminAppName);
|
||||||
|
|
||||||
@@ -213,7 +209,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private String getAdminRoleId() throws SQLException, DatabaseException {
|
private String getAdminRoleId() throws SQLException, DatabaseException {
|
||||||
PreparedStatement statement = jdbcConnection.prepareStatement("select ID from " + getTableName("KEYCLOAK_ROLE") + " where NAME = ? AND REALM = ?");
|
PreparedStatement statement = jdbcConnection.prepareStatement("select ID from KEYCLOAK_ROLE where NAME = ? AND REALM = ?");
|
||||||
statement.setString(1, AdminRoles.ADMIN);
|
statement.setString(1, AdminRoles.ADMIN);
|
||||||
statement.setString(2, Config.getAdminRealm());
|
statement.setString(2, Config.getAdminRealm());
|
||||||
|
|
||||||
@@ -235,8 +231,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
|
|||||||
|
|
||||||
|
|
||||||
protected void addNewRealmAdminRoles() throws SQLException, DatabaseException {
|
protected void addNewRealmAdminRoles() throws SQLException, DatabaseException {
|
||||||
PreparedStatement statement = jdbcConnection.prepareStatement("select CLIENT.ID REALM_ADMIN_APP_ID, CLIENT.REALM_ID REALM_ID, KEYCLOAK_ROLE.ID ADMIN_ROLE_ID from " +
|
PreparedStatement statement = jdbcConnection.prepareStatement("select CLIENT.ID REALM_ADMIN_APP_ID, CLIENT.REALM_ID REALM_ID, KEYCLOAK_ROLE.ID ADMIN_ROLE_ID from CLIENT,KEYCLOAK_ROLE where KEYCLOAK_ROLE.APPLICATION = CLIENT.ID AND CLIENT.NAME = 'realm-management' AND KEYCLOAK_ROLE.NAME = ?");
|
||||||
getTableName("CLIENT") + " CLIENT," + getTableName("KEYCLOAK_ROLE") + " KEYCLOAK_ROLE where KEYCLOAK_ROLE.APPLICATION = CLIENT.ID AND CLIENT.NAME = 'realm-management' AND KEYCLOAK_ROLE.NAME = ?");
|
|
||||||
statement.setString(1, AdminRoles.REALM_ADMIN);
|
statement.setString(1, AdminRoles.REALM_ADMIN);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -285,7 +280,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
|
|||||||
String protocolMapperTableName = database.correctObjectName("PROTOCOL_MAPPER", Table.class);
|
String protocolMapperTableName = database.correctObjectName("PROTOCOL_MAPPER", Table.class);
|
||||||
String protocolMapperCfgTableName = database.correctObjectName("PROTOCOL_MAPPER_CONFIG", Table.class);
|
String protocolMapperCfgTableName = database.correctObjectName("PROTOCOL_MAPPER_CONFIG", Table.class);
|
||||||
|
|
||||||
PreparedStatement statement = jdbcConnection.prepareStatement("select ID, NAME, ALLOWED_CLAIMS_MASK from " + getTableName("CLIENT"));
|
PreparedStatement statement = jdbcConnection.prepareStatement("select ID, NAME, ALLOWED_CLAIMS_MASK from CLIENT");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
ResultSet resultSet = statement.executeQuery();
|
ResultSet resultSet = statement.executeQuery();
|
||||||
@@ -298,7 +293,7 @@ public class JpaUpdate1_2_0_Beta1 extends CustomKeycloakTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Object acmObj = resultSet.getObject("ALLOWED_CLAIMS_MASK");
|
Object acmObj = resultSet.getObject("ALLOWED_CLAIMS_MASK");
|
||||||
long mask = (acmObj != null) ? ((Number) acmObj).longValue() : ClaimMask.ALL;
|
long mask = (acmObj != null) ? (Long) acmObj : ClaimMask.ALL;
|
||||||
|
|
||||||
MigrationProvider migrationProvider = this.kcSession.getProvider(MigrationProvider.class);
|
MigrationProvider migrationProvider = this.kcSession.getProvider(MigrationProvider.class);
|
||||||
List<ProtocolMapperRepresentation> protocolMappers = migrationProvider.getMappersForClaimMask(mask);
|
List<ProtocolMapperRepresentation> protocolMappers = migrationProvider.getMappersForClaimMask(mask);
|
||||||
|
|||||||
+1
-4
@@ -3,7 +3,6 @@ package org.keycloak.connections.jpa.updater.liquibase.custom;
|
|||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
|
|
||||||
import liquibase.datatype.DataTypeFactory;
|
|
||||||
import liquibase.exception.CustomChangeException;
|
import liquibase.exception.CustomChangeException;
|
||||||
import liquibase.statement.core.InsertStatement;
|
import liquibase.statement.core.InsertStatement;
|
||||||
import liquibase.structure.core.Table;
|
import liquibase.structure.core.Table;
|
||||||
@@ -18,9 +17,7 @@ public class JpaUpdate1_2_0_CR1 extends CustomKeycloakTask {
|
|||||||
String realmClientTableName = database.correctObjectName("REALM_CLIENT", Table.class);
|
String realmClientTableName = database.correctObjectName("REALM_CLIENT", Table.class);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
String trueValue = DataTypeFactory.getInstance().getTrueBooleanValue(database);
|
PreparedStatement statement = jdbcConnection.prepareStatement("select CLIENT.REALM_ID, CLIENT.ID CLIENT_ID from CLIENT where CLIENT.CONSENT_REQUIRED = true");
|
||||||
PreparedStatement statement = jdbcConnection.prepareStatement("select CLIENT.REALM_ID, CLIENT.ID CLIENT_ID from " + getTableName("CLIENT") + " CLIENT where CLIENT.CONSENT_REQUIRED = " + trueValue);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
ResultSet resultSet = statement.executeQuery();
|
ResultSet resultSet = statement.executeQuery();
|
||||||
try {
|
try {
|
||||||
|
|||||||
-54
@@ -1,54 +0,0 @@
|
|||||||
package org.keycloak.connections.jpa.updater.liquibase.custom;
|
|
||||||
|
|
||||||
import java.sql.PreparedStatement;
|
|
||||||
import java.sql.ResultSet;
|
|
||||||
|
|
||||||
import liquibase.datatype.DataTypeFactory;
|
|
||||||
import liquibase.exception.CustomChangeException;
|
|
||||||
import liquibase.statement.core.InsertStatement;
|
|
||||||
import liquibase.statement.core.UpdateStatement;
|
|
||||||
import liquibase.structure.core.Table;
|
|
||||||
import org.keycloak.models.utils.KeycloakModelUtils;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
|
|
||||||
*/
|
|
||||||
public class JpaUpdate1_4_0_Final extends CustomKeycloakTask {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void generateStatementsImpl() throws CustomChangeException {
|
|
||||||
String userAttributeTableName = database.correctObjectName("USER_ATTRIBUTE", Table.class);
|
|
||||||
|
|
||||||
try {
|
|
||||||
PreparedStatement statement = jdbcConnection.prepareStatement("select NAME, USER_ID from " + getTableName("USER_ATTRIBUTE"));
|
|
||||||
|
|
||||||
try {
|
|
||||||
ResultSet resultSet = statement.executeQuery();
|
|
||||||
try {
|
|
||||||
while (resultSet.next()) {
|
|
||||||
String name = resultSet.getString(1);
|
|
||||||
String userId = resultSet.getString(2);
|
|
||||||
|
|
||||||
UpdateStatement updateStatement = new UpdateStatement(null, null, userAttributeTableName)
|
|
||||||
.addNewColumnValue("ID", KeycloakModelUtils.generateId())
|
|
||||||
.setWhereClause("NAME='" + name + "' AND USER_ID='" + userId + "'");
|
|
||||||
statements.add(updateStatement);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
resultSet.close();
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
statement.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
confirmationMessage.append("Updated " + statements.size() + " attributes in USER_ATTRIBUTE table");
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new CustomChangeException(getTaskId() + ": Exception when updating data from previous version", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected String getTaskId() {
|
|
||||||
return "Update 1.4.0.Final";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
|
|
||||||
<changeSet author="keycloak" id="1.2.0.Final">
|
|
||||||
<!-- KEYCLOAK-1277 -->
|
|
||||||
<update tableName="CLIENT">
|
|
||||||
<column name="DIRECT_GRANTS_ONLY" valueBoolean="false"/>
|
|
||||||
<where>DIRECT_GRANTS_ONLY is null</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT">
|
|
||||||
<column name="BEARER_ONLY" valueBoolean="false"/>
|
|
||||||
<where>BEARER_ONLY is null</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT">
|
|
||||||
<column name="SURROGATE_AUTH_REQUIRED" valueBoolean="false"/>
|
|
||||||
<where>SURROGATE_AUTH_REQUIRED is null</where>
|
|
||||||
</update>
|
|
||||||
</changeSet>
|
|
||||||
</databaseChangeLog>
|
|
||||||
@@ -1,200 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
|
|
||||||
<changeSet author="bburke@redhat.com" id="1.3.0">
|
|
||||||
<delete tableName="CLIENT_SESSION_ROLE"/>
|
|
||||||
<delete tableName="CLIENT_SESSION_PROT_MAPPER"/>
|
|
||||||
<delete tableName="CLIENT_SESSION_NOTE"/>
|
|
||||||
<delete tableName="CLIENT_SESSION"/>
|
|
||||||
<delete tableName="USER_SESSION_NOTE"/>
|
|
||||||
<delete tableName="USER_SESSION"/>
|
|
||||||
<createTable tableName="ADMIN_EVENT_ENTITY">
|
|
||||||
<column name="ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="ADMIN_EVENT_TIME" type="BIGINT"/>
|
|
||||||
<column name="REALM_ID" type="VARCHAR(255)"/>
|
|
||||||
<column name="OPERATION_TYPE" type="VARCHAR(255)"/>
|
|
||||||
<column name="AUTH_REALM_ID" type="VARCHAR(255)"/>
|
|
||||||
<column name="AUTH_CLIENT_ID" type="VARCHAR(255)"/>
|
|
||||||
<column name="AUTH_USER_ID" type="VARCHAR(255)"/>
|
|
||||||
<column name="IP_ADDRESS" type="VARCHAR(255)"/>
|
|
||||||
<column name="RESOURCE_PATH" type="VARCHAR(2550)"/>
|
|
||||||
<column name="REPRESENTATION" type="TEXT(25500)"/>
|
|
||||||
<column name="ERROR" type="VARCHAR(255)"/>
|
|
||||||
</createTable>
|
|
||||||
<createTable tableName="AUTHENTICATOR">
|
|
||||||
<column name="ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="ALIAS" type="VARCHAR(255)"/>
|
|
||||||
<column name="REALM_ID" type="VARCHAR(36)"/>
|
|
||||||
<column name="PROVIDER_ID" type="VARCHAR(255)"/>
|
|
||||||
</createTable>
|
|
||||||
<createTable tableName="AUTHENTICATION_FLOW">
|
|
||||||
<column name="ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="ALIAS" type="VARCHAR(255)"/>
|
|
||||||
<column name="DESCRIPTION" type="VARCHAR(255)"/>
|
|
||||||
<column name="REALM_ID" type="VARCHAR(36)"/>
|
|
||||||
</createTable>
|
|
||||||
<createTable tableName="AUTHENTICATION_EXECUTION">
|
|
||||||
<column name="ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="ALIAS" type="VARCHAR(255)"/>
|
|
||||||
<column name="AUTHENTICATOR" type="VARCHAR(36)"/>
|
|
||||||
<column name="REALM_ID" type="VARCHAR(36)"/>
|
|
||||||
<column name="FLOW_ID" type="VARCHAR(36)"/>
|
|
||||||
<column name="REQUIREMENT" type="INT"/>
|
|
||||||
<column name="PRIORITY" type="INT"/>
|
|
||||||
<column name="USER_SETUP_ALLOWED" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="AUTHENTICATOR_FLOW" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</createTable>
|
|
||||||
<createTable tableName="AUTHENTICATOR_CONFIG">
|
|
||||||
<column name="AUTHENTICATOR_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="VALUE" type="CLOB"/>
|
|
||||||
<column name="NAME" type="VARCHAR(255)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</createTable>
|
|
||||||
<createTable tableName="USER_FEDERATION_MAPPER">
|
|
||||||
<column name="ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="NAME" type="VARCHAR(255)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="FEDERATION_PROVIDER_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="FEDERATION_MAPPER_TYPE" type="VARCHAR(255)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="REALM_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</createTable>
|
|
||||||
<createTable tableName="USER_FEDERATION_MAPPER_CONFIG">
|
|
||||||
<column name="USER_FEDERATION_MAPPER_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="VALUE" type="VARCHAR(255)"/>
|
|
||||||
<column name="NAME" type="VARCHAR(255)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</createTable>
|
|
||||||
|
|
||||||
<addColumn tableName="REALM">
|
|
||||||
<column name="ADMIN_EVENTS_ENABLED" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="ADMIN_EVENTS_DETAILS_ENABLED" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="EDIT_USERNAME_ALLOWED" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
<createTable tableName="CLIENT_SESSION_AUTH_STATUS">
|
|
||||||
<column name="AUTHENTICATOR" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="STATUS" type="INT"/>
|
|
||||||
<column name="CLIENT_SESSION" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</createTable>
|
|
||||||
<addColumn tableName="CLIENT_SESSION">
|
|
||||||
<column name="AUTH_USER_ID" type="VARCHAR(36)"/>
|
|
||||||
</addColumn>
|
|
||||||
<addColumn tableName="IDENTITY_PROVIDER">
|
|
||||||
<column name="TRUST_EMAIL" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="UPDATE_PROFILE_FIRST_LGN_MD" type="VARCHAR(255)" defaultValue="on">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
<!-- migrate value from UPDATE_PROFILE_FIRST_LOGIN to UPDATE_PROFILE_FIRST_LGN_MD then drop it -->
|
|
||||||
<update tableName="IDENTITY_PROVIDER">
|
|
||||||
<column name="UPDATE_PROFILE_FIRST_LGN_MD" value="off"/>
|
|
||||||
<where>UPDATE_PROFILE_FIRST_LOGIN = :value</where>
|
|
||||||
<whereParams>
|
|
||||||
<param valueBoolean="false" />
|
|
||||||
</whereParams>
|
|
||||||
</update>
|
|
||||||
<dropDefaultValue tableName="IDENTITY_PROVIDER" columnName="UPDATE_PROFILE_FIRST_LOGIN" />
|
|
||||||
<dropColumn tableName="IDENTITY_PROVIDER" columnName="UPDATE_PROFILE_FIRST_LOGIN"/>
|
|
||||||
|
|
||||||
<addColumn tableName="USER_REQUIRED_ACTION">
|
|
||||||
<column name="REQUIRED_ACTION" type="VARCHAR(255)" defaultValue=" ">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
<!-- VERIFY_EMAIL, UPDATE_PROFILE, CONFIGURE_TOTP, UPDATE_PASSWORD -->
|
|
||||||
<update tableName="USER_REQUIRED_ACTION">
|
|
||||||
<column name="REQUIRED_ACTION" value="VERIFY_EMAIL"/>
|
|
||||||
<where>ACTION = 0</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="USER_REQUIRED_ACTION">
|
|
||||||
<column name="REQUIRED_ACTION" value="UPDATE_PROFILE"/>
|
|
||||||
<where>ACTION = 1</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="USER_REQUIRED_ACTION">
|
|
||||||
<column name="REQUIRED_ACTION" value="CONFIGURE_TOTP"/>
|
|
||||||
<where>ACTION = 2</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="USER_REQUIRED_ACTION">
|
|
||||||
<column name="REQUIRED_ACTION" value="UPDATE_PASSWORD"/>
|
|
||||||
<where>ACTION = 3</where>
|
|
||||||
</update>
|
|
||||||
<addPrimaryKey columnNames="ID" constraintName="CONSTRAINT_AUTH_PK" tableName="AUTHENTICATOR"/>
|
|
||||||
<addPrimaryKey columnNames="ID" constraintName="CONSTRAINT_AUTH_FLOW_PK" tableName="AUTHENTICATION_FLOW"/>
|
|
||||||
<addPrimaryKey columnNames="ID" constraintName="CONSTRAINT_AUTH_EXEC_PK" tableName="AUTHENTICATION_EXECUTION"/>
|
|
||||||
<addPrimaryKey columnNames="AUTHENTICATOR_ID, NAME" constraintName="CONSTRAINT_AUTH_CFG_PK" tableName="AUTHENTICATOR_CONFIG"/>
|
|
||||||
<dropPrimaryKey constraintName="CONSTRAINT_2" tableName="USER_REQUIRED_ACTION"/>
|
|
||||||
<dropColumn tableName="USER_REQUIRED_ACTION" columnName="ACTION"/>
|
|
||||||
<addPrimaryKey columnNames="REQUIRED_ACTION, USER_ID" constraintName="CONSTRAINT_REQUIRED_ACTION" tableName="USER_REQUIRED_ACTION"/>
|
|
||||||
<addPrimaryKey columnNames="CLIENT_SESSION, AUTHENTICATOR" constraintName="CONSTRAINT_AUTH_STATUS_PK" tableName="CLIENT_SESSION_AUTH_STATUS"/>
|
|
||||||
<addPrimaryKey columnNames="ID" constraintName="CONSTRAINT_FEDMAPPERPM" tableName="USER_FEDERATION_MAPPER"/>
|
|
||||||
<addPrimaryKey columnNames="USER_FEDERATION_MAPPER_ID, NAME" constraintName="CONSTRAINT_FEDMAPPER_CFG_PM" tableName="USER_FEDERATION_MAPPER_CONFIG"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="CLIENT_SESSION" baseTableName="CLIENT_SESSION_AUTH_STATUS" constraintName="AUTH_STATUS_CONSTRAINT" referencedColumnNames="ID" referencedTableName="CLIENT_SESSION"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="REALM_ID" baseTableName="AUTHENTICATOR" constraintName="FK_AUTH_REALM" referencedColumnNames="ID" referencedTableName="REALM"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="REALM_ID" baseTableName="AUTHENTICATION_FLOW" constraintName="FK_AUTH_FLOW_REALM" referencedColumnNames="ID" referencedTableName="REALM"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="REALM_ID" baseTableName="AUTHENTICATION_EXECUTION" constraintName="FK_AUTH_EXEC_REALM" referencedColumnNames="ID" referencedTableName="REALM"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="FLOW_ID" baseTableName="AUTHENTICATION_EXECUTION" constraintName="FK_AUTH_EXEC_FLOW" referencedColumnNames="ID" referencedTableName="AUTHENTICATION_FLOW"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="REALM_ID" baseTableName="USER_FEDERATION_MAPPER" constraintName="FK_FEDMAPPERPM_REALM" referencedColumnNames="ID" referencedTableName="REALM"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="FEDERATION_PROVIDER_ID" baseTableName="USER_FEDERATION_MAPPER" constraintName="FK_FEDMAPPERPM_FEDPRV" referencedColumnNames="ID" referencedTableName="USER_FEDERATION_PROVIDER"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="USER_FEDERATION_MAPPER_ID" baseTableName="USER_FEDERATION_MAPPER_CONFIG" constraintName="FK_FEDMAPPER_CFG" referencedColumnNames="ID" referencedTableName="USER_FEDERATION_MAPPER"/>
|
|
||||||
|
|
||||||
<dropDefaultValue tableName="REALM" columnName="PASSWORD_CRED_GRANT_ALLOWED" />
|
|
||||||
<dropColumn tableName="REALM" columnName="PASSWORD_CRED_GRANT_ALLOWED"/>
|
|
||||||
|
|
||||||
<!-- KEYCLOAK-1298 Change constraint names to be upper-cased -->
|
|
||||||
<dropForeignKeyConstraint baseTableName="PROTOCOL_MAPPER_CONFIG" constraintName="FK_PMConfig" />
|
|
||||||
<dropPrimaryKey constraintName="CONSTRAINT_PMConfig" tableName="PROTOCOL_MAPPER_CONFIG"/>
|
|
||||||
<addPrimaryKey columnNames="PROTOCOL_MAPPER_ID, NAME" constraintName="CONSTRAINT_PMCONFIG" tableName="PROTOCOL_MAPPER_CONFIG"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="PROTOCOL_MAPPER_ID" baseTableName="PROTOCOL_MAPPER_CONFIG" constraintName="FK_PMCONFIG" referencedColumnNames="ID" referencedTableName="PROTOCOL_MAPPER"/>
|
|
||||||
|
|
||||||
<dropForeignKeyConstraint baseTableName="IDP_MAPPER_CONFIG" constraintName="FK_IDPMConfig" />
|
|
||||||
<dropPrimaryKey constraintName="CONSTRAINT_IDPMConfig" tableName="IDP_MAPPER_CONFIG"/>
|
|
||||||
<addPrimaryKey columnNames="IDP_MAPPER_ID, NAME" constraintName="CONSTRAINT_IDPMCONFIG" tableName="IDP_MAPPER_CONFIG"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="IDP_MAPPER_ID" baseTableName="IDP_MAPPER_CONFIG" constraintName="FK_IDPMCONFIG" referencedColumnNames="ID" referencedTableName="IDENTITY_PROVIDER_MAPPER"/>
|
|
||||||
|
|
||||||
<!-- Sybase specific hacks -->
|
|
||||||
<modifySql dbms="sybase">
|
|
||||||
<replace replace="[USER_REQUIRED_ACTION] DROP PRIMARY KEY" with="[USER_REQUIRED_ACTION] DROP CONSTRAINT CONSTRAINT_2" />
|
|
||||||
<replace replace="[PROTOCOL_MAPPER_CONFIG] DROP PRIMARY KEY" with="[PROTOCOL_MAPPER_CONFIG] DROP CONSTRAINT CONSTRAINT_PMConfig" />
|
|
||||||
<replace replace="[IDP_MAPPER_CONFIG] DROP PRIMARY KEY" with="[IDP_MAPPER_CONFIG] DROP CONSTRAINT CONSTRAINT_IDPMConfig" />
|
|
||||||
<regExpReplace replace=".*(SET DEFAULT NULL)" with="SELECT 1" />
|
|
||||||
</modifySql>
|
|
||||||
|
|
||||||
</changeSet>
|
|
||||||
</databaseChangeLog>
|
|
||||||
@@ -1,156 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
|
|
||||||
<changeSet author="bburke@redhat.com" id="1.4.0">
|
|
||||||
<delete tableName="CLIENT_SESSION_AUTH_STATUS"/>
|
|
||||||
<delete tableName="CLIENT_SESSION_ROLE"/>
|
|
||||||
<delete tableName="CLIENT_SESSION_PROT_MAPPER"/>
|
|
||||||
<delete tableName="CLIENT_SESSION_NOTE"/>
|
|
||||||
<delete tableName="CLIENT_SESSION"/>
|
|
||||||
<delete tableName="USER_SESSION_NOTE"/>
|
|
||||||
<delete tableName="USER_SESSION"/>
|
|
||||||
|
|
||||||
<addColumn tableName="CLIENT">
|
|
||||||
<column name="SERVICE_ACCOUNTS_ENABLED" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
<addColumn tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
<addColumn tableName="AUTHENTICATION_FLOW">
|
|
||||||
<column name="PROVIDER_ID" type="VARCHAR(36)" defaultValue="basic-flow">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="TOP_LEVEL" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="BUILT_IN" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
<addColumn tableName="AUTHENTICATION_EXECUTION">
|
|
||||||
<column name="AUTH_FLOW_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="AUTH_CONFIG" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
<addColumn tableName="USER_ATTRIBUTE">
|
|
||||||
<column name="ID" type="VARCHAR(36)" defaultValue="sybase-needs-something-here">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
|
|
||||||
<dropColumn tableName="AUTHENTICATOR" columnName="PROVIDER_ID"/>
|
|
||||||
<renameTable oldTableName="AUTHENTICATOR_CONFIG" newTableName="AUTHENTICATOR_CONFIG_ENTRY"/>
|
|
||||||
<renameTable oldTableName="AUTHENTICATOR" newTableName="AUTHENTICATOR_CONFIG"/>
|
|
||||||
<!-- OAUTH_GRANT,
|
|
||||||
CODE_TO_TOKEN,
|
|
||||||
VERIFY_EMAIL,
|
|
||||||
UPDATE_PROFILE,
|
|
||||||
CONFIGURE_TOTP,
|
|
||||||
UPDATE_PASSWORD,
|
|
||||||
RECOVER_PASSWORD,
|
|
||||||
AUTHENTICATE,
|
|
||||||
SOCIAL_CALLBACK,
|
|
||||||
LOGGED_OUT -->
|
|
||||||
<update tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" value="OAUTH_GRANT"/>
|
|
||||||
<where>ACTION = 0</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" value="CODE_TO_TOKEN"/>
|
|
||||||
<where>ACTION = 1</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" value="VERIFY_EMAIL"/>
|
|
||||||
<where>ACTION = 2</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" value="UPDATE_PROFILE"/>
|
|
||||||
<where>ACTION = 3</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" value="CONFIGURE_TOTP"/>
|
|
||||||
<where>ACTION = 4</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" value="UPDATE_PASSWORD"/>
|
|
||||||
<where>ACTION = 5</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" value="RECOVER_PASSWORD"/>
|
|
||||||
<where>ACTION = 6</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" value="AUTHENTICATE"/>
|
|
||||||
<where>ACTION = 7</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" value="SOCIAL_CALLBACK"/>
|
|
||||||
<where>ACTION = 8</where>
|
|
||||||
</update>
|
|
||||||
<update tableName="CLIENT_SESSION">
|
|
||||||
<column name="CURRENT_ACTION" value="LOGGED_OUT"/>
|
|
||||||
<where>ACTION = 9</where>
|
|
||||||
</update>
|
|
||||||
|
|
||||||
<createTable tableName="CLIENT_USER_SESSION_NOTE">
|
|
||||||
<column name="NAME" type="VARCHAR(255)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="VALUE" type="VARCHAR(2048)"/>
|
|
||||||
<column name="CLIENT_SESSION" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</createTable>
|
|
||||||
<createTable tableName="REQUIRED_ACTION_PROVIDER">
|
|
||||||
<column name="ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="ALIAS" type="VARCHAR(255)"/>
|
|
||||||
<column name="NAME" type="VARCHAR(255)"/>
|
|
||||||
<column name="REALM_ID" type="VARCHAR(36)"/>
|
|
||||||
<column name="ENABLED" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="DEFAULT_ACTION" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="PROVIDER_ID" type="VARCHAR(255)"/>
|
|
||||||
</createTable>
|
|
||||||
<createTable tableName="REQUIRED_ACTION_CONFIG">
|
|
||||||
<column name="REQUIRED_ACTION_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="VALUE" type="CLOB"/>
|
|
||||||
<column name="NAME" type="VARCHAR(255)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</createTable>
|
|
||||||
|
|
||||||
<customChange class="org.keycloak.connections.jpa.updater.liquibase.custom.JpaUpdate1_4_0_Final"/>
|
|
||||||
|
|
||||||
<dropPrimaryKey constraintName="CONSTRAINT_6" tableName="USER_ATTRIBUTE"/>
|
|
||||||
<addPrimaryKey columnNames="ID" constraintName="CONSTRAINT_USER_ATTRIBUTE_PK" tableName="USER_ATTRIBUTE"/>
|
|
||||||
<addPrimaryKey columnNames="ID" constraintName="CONSTRAINT_REQ_ACT_PRV_PK" tableName="REQUIRED_ACTION_PROVIDER"/>
|
|
||||||
<addPrimaryKey columnNames="REQUIRED_ACTION_ID, NAME" constraintName="CONSTRAINT_REQ_ACT_CFG_PK" tableName="REQUIRED_ACTION_CONFIG"/>
|
|
||||||
<addPrimaryKey columnNames="CLIENT_SESSION, NAME" constraintName="CONSTR_CL_USR_SES_NOTE" tableName="CLIENT_USER_SESSION_NOTE"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="REALM_ID" baseTableName="REQUIRED_ACTION_PROVIDER" constraintName="FK_REQ_ACT_REALM" referencedColumnNames="ID" referencedTableName="REALM"/>
|
|
||||||
<addForeignKeyConstraint baseColumnNames="CLIENT_SESSION" baseTableName="CLIENT_USER_SESSION_NOTE" constraintName="FK_CL_USR_SES_NOTE" referencedColumnNames="ID" referencedTableName="CLIENT_SESSION"/>
|
|
||||||
<dropColumn tableName="CLIENT_SESSION" columnName="ACTION"/>
|
|
||||||
<addColumn tableName="USER_ENTITY">
|
|
||||||
<column name="CREATED_TIMESTAMP" type="BIGINT"/>
|
|
||||||
<column name="SERVICE_ACCOUNT_CLIENT_LINK" type="VARCHAR(36)"/>
|
|
||||||
</addColumn>
|
|
||||||
|
|
||||||
<!-- Sybase specific hacks -->
|
|
||||||
<modifySql dbms="sybase">
|
|
||||||
<replace replace="[USER_ATTRIBUTE] DROP PRIMARY KEY" with="[USER_ATTRIBUTE] DROP CONSTRAINT CONSTRAINT_6" />
|
|
||||||
</modifySql>
|
|
||||||
|
|
||||||
</changeSet>
|
|
||||||
</databaseChangeLog>
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
|
|
||||||
<changeSet author="bburke@redhat.com" id="1.5.0">
|
|
||||||
<delete tableName="CLIENT_SESSION_AUTH_STATUS"/>
|
|
||||||
<delete tableName="CLIENT_SESSION_ROLE"/>
|
|
||||||
<delete tableName="CLIENT_SESSION_PROT_MAPPER"/>
|
|
||||||
<delete tableName="CLIENT_SESSION_NOTE"/>
|
|
||||||
<delete tableName="CLIENT_SESSION"/>
|
|
||||||
<delete tableName="USER_SESSION_NOTE"/>
|
|
||||||
<delete tableName="USER_SESSION"/>
|
|
||||||
|
|
||||||
<dropDefaultValue tableName="AUTHENTICATION_EXECUTION" columnName="USER_SETUP_ALLOWED" />
|
|
||||||
<dropColumn tableName="AUTHENTICATION_EXECUTION" columnName="USER_SETUP_ALLOWED"/>
|
|
||||||
<addColumn tableName="CREDENTIAL">
|
|
||||||
<column name="COUNTER" type="INT" defaultValueNumeric="0">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="DIGITS" type="INT" defaultValueNumeric="6">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="PERIOD" type="INT" defaultValueNumeric="30">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="ALGORITHM" type="VARCHAR(36)" defaultValue="HmacSHA1">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
<addColumn tableName="REALM">
|
|
||||||
<column name="OTP_POLICY_COUNTER" type="INT" defaultValueNumeric="0">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="OTP_POLICY_WINDOW" type="INT" defaultValueNumeric="1">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="OTP_POLICY_PERIOD" type="INT" defaultValueNumeric="30">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="OTP_POLICY_DIGITS" type="INT" defaultValueNumeric="6">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="OTP_POLICY_ALG" type="VARCHAR(36)" defaultValue="HmacSHA1">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="OTP_POLICY_TYPE" type="VARCHAR(36)" defaultValue="totp">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="BROWSER_FLOW" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="REGISTRATION_FLOW" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="DIRECT_GRANT_FLOW" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="RESET_CREDENTIALS_FLOW" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
<column name="CLIENT_AUTH_FLOW" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
|
|
||||||
<addColumn tableName="CLIENT">
|
|
||||||
<column name="CLIENT_AUTHENTICATOR_TYPE" type="VARCHAR(255)">
|
|
||||||
<constraints nullable="true"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
|
|
||||||
<!-- Sybase specific hacks -->
|
|
||||||
<modifySql dbms="sybase">
|
|
||||||
<regExpReplace replace=".*(SET DEFAULT NULL)" with="SELECT 1" />
|
|
||||||
</modifySql>
|
|
||||||
|
|
||||||
</changeSet>
|
|
||||||
</databaseChangeLog>
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
|
|
||||||
<changeSet author="mposolda@redhat.com" id="1.6.0">
|
|
||||||
|
|
||||||
<addColumn tableName="REALM">
|
|
||||||
<column name="OFFLINE_SESSION_IDLE_TIMEOUT" type="INT" defaultValueNumeric="0"/>
|
|
||||||
<column name="REVOKE_REFRESH_TOKEN" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
|
|
||||||
<addColumn tableName="KEYCLOAK_ROLE">
|
|
||||||
<column name="SCOPE_PARAM_REQUIRED" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
</addColumn>
|
|
||||||
|
|
||||||
<addColumn tableName="CLIENT">
|
|
||||||
<column name="ROOT_URL" type="VARCHAR(255)"/>
|
|
||||||
<column name="DESCRIPTION" type="VARCHAR(255)"/>
|
|
||||||
</addColumn>
|
|
||||||
|
|
||||||
<createTable tableName="OFFLINE_USER_SESSION">
|
|
||||||
<column name="USER_SESSION_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="USER_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="REALM_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="LAST_SESSION_REFRESH" type="INT"/>
|
|
||||||
<column name="OFFLINE" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="DATA" type="CLOB"/>
|
|
||||||
</createTable>
|
|
||||||
|
|
||||||
<createTable tableName="OFFLINE_CLIENT_SESSION">
|
|
||||||
<column name="CLIENT_SESSION_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="USER_SESSION_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="CLIENT_ID" type="VARCHAR(36)">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="OFFLINE" type="BOOLEAN" defaultValueBoolean="false">
|
|
||||||
<constraints nullable="false"/>
|
|
||||||
</column>
|
|
||||||
<column name="TIMESTAMP" type="INT"/>
|
|
||||||
<column name="DATA" type="CLOB"/>
|
|
||||||
</createTable>
|
|
||||||
|
|
||||||
<addPrimaryKey columnNames="USER_SESSION_ID, OFFLINE" constraintName="CONSTRAINT_OFFLINE_US_SES_PK" tableName="OFFLINE_USER_SESSION"/>
|
|
||||||
<addPrimaryKey columnNames="CLIENT_SESSION_ID, OFFLINE" constraintName="CONSTRAINT_OFFLINE_CL_SES_PK" tableName="OFFLINE_CLIENT_SESSION"/>
|
|
||||||
</changeSet>
|
|
||||||
</databaseChangeLog>
|
|
||||||
@@ -5,9 +5,4 @@
|
|||||||
<include file="META-INF/jpa-changelog-1.1.0.Final.xml"/>
|
<include file="META-INF/jpa-changelog-1.1.0.Final.xml"/>
|
||||||
<include file="META-INF/jpa-changelog-1.2.0.Beta1.xml"/>
|
<include file="META-INF/jpa-changelog-1.2.0.Beta1.xml"/>
|
||||||
<include file="META-INF/jpa-changelog-1.2.0.CR1.xml"/>
|
<include file="META-INF/jpa-changelog-1.2.0.CR1.xml"/>
|
||||||
<include file="META-INF/jpa-changelog-1.2.0.Final.xml"/>
|
|
||||||
<include file="META-INF/jpa-changelog-1.3.0.xml"/>
|
|
||||||
<include file="META-INF/jpa-changelog-1.4.0.xml"/>
|
|
||||||
<include file="META-INF/jpa-changelog-1.5.0.xml"/>
|
|
||||||
<include file="META-INF/jpa-changelog-1.6.0.xml"/>
|
|
||||||
</databaseChangeLog>
|
</databaseChangeLog>
|
||||||
+36
-36
@@ -1,36 +1,36 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>keycloak-connections-jpa</artifactId>
|
<artifactId>keycloak-connections-jpa</artifactId>
|
||||||
<name>Keycloak Connections JPA</name>
|
<name>Keycloak Connections JPA</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-core</artifactId>
|
<artifactId>keycloak-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-model-api</artifactId>
|
<artifactId>keycloak-model-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.hibernate.javax.persistence</groupId>
|
<groupId>org.hibernate.javax.persistence</groupId>
|
||||||
<artifactId>${hibernate.javax.persistence.artifactId}</artifactId>
|
<artifactId>hibernate-jpa-2.0-api</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.hibernate</groupId>
|
<groupId>org.hibernate</groupId>
|
||||||
<artifactId>hibernate-entitymanager</artifactId>
|
<artifactId>hibernate-entitymanager</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
+76
-104
@@ -4,7 +4,6 @@ import org.hibernate.ejb.AvailableSettings;
|
|||||||
import org.jboss.logging.Logger;
|
import org.jboss.logging.Logger;
|
||||||
import org.keycloak.Config;
|
import org.keycloak.Config;
|
||||||
import org.keycloak.connections.jpa.updater.JpaUpdaterProvider;
|
import org.keycloak.connections.jpa.updater.JpaUpdaterProvider;
|
||||||
import org.keycloak.connections.jpa.util.JpaUtils;
|
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
import org.keycloak.models.KeycloakSessionFactory;
|
import org.keycloak.models.KeycloakSessionFactory;
|
||||||
|
|
||||||
@@ -14,12 +13,10 @@ import javax.persistence.EntityManagerFactory;
|
|||||||
import javax.persistence.Persistence;
|
import javax.persistence.Persistence;
|
||||||
import javax.sql.DataSource;
|
import javax.sql.DataSource;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.DatabaseMetaData;
|
|
||||||
import java.sql.DriverManager;
|
import java.sql.DriverManager;
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -32,8 +29,6 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide
|
|||||||
private volatile EntityManagerFactory emf;
|
private volatile EntityManagerFactory emf;
|
||||||
|
|
||||||
private Config.Scope config;
|
private Config.Scope config;
|
||||||
|
|
||||||
private Map<String,String> operationalInfo;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JpaConnectionProvider create(KeycloakSession session) {
|
public JpaConnectionProvider create(KeycloakSession session) {
|
||||||
@@ -75,123 +70,105 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide
|
|||||||
|
|
||||||
Connection connection = null;
|
Connection connection = null;
|
||||||
|
|
||||||
|
String unitName = config.get("unitName");
|
||||||
String databaseSchema = config.get("databaseSchema");
|
String databaseSchema = config.get("databaseSchema");
|
||||||
|
|
||||||
Map<String, Object> properties = new HashMap<String, Object>();
|
Map<String, Object> properties = new HashMap<String, Object>();
|
||||||
|
|
||||||
String unitName = "keycloak-default";
|
// Only load config from keycloak-server.json if unitName is not specified
|
||||||
|
if (unitName == null) {
|
||||||
|
unitName = "keycloak-default";
|
||||||
|
|
||||||
String dataSource = config.get("dataSource");
|
String dataSource = config.get("dataSource");
|
||||||
if (dataSource != null) {
|
if (dataSource != null) {
|
||||||
if (config.getBoolean("jta", false)) {
|
if (config.getBoolean("jta", false)) {
|
||||||
properties.put(AvailableSettings.JTA_DATASOURCE, dataSource);
|
properties.put(AvailableSettings.JTA_DATASOURCE, dataSource);
|
||||||
|
} else {
|
||||||
|
properties.put(AvailableSettings.NON_JTA_DATASOURCE, dataSource);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
properties.put(AvailableSettings.NON_JTA_DATASOURCE, dataSource);
|
properties.put(AvailableSettings.JDBC_URL, config.get("url"));
|
||||||
}
|
properties.put(AvailableSettings.JDBC_DRIVER, config.get("driver"));
|
||||||
} else {
|
|
||||||
properties.put(AvailableSettings.JDBC_URL, config.get("url"));
|
|
||||||
properties.put(AvailableSettings.JDBC_DRIVER, config.get("driver"));
|
|
||||||
|
|
||||||
String user = config.get("user");
|
String user = config.get("user");
|
||||||
if (user != null) {
|
if (user != null) {
|
||||||
properties.put(AvailableSettings.JDBC_USER, user);
|
properties.put(AvailableSettings.JDBC_USER, user);
|
||||||
|
}
|
||||||
|
String password = config.get("password");
|
||||||
|
if (password != null) {
|
||||||
|
properties.put(AvailableSettings.JDBC_PASSWORD, password);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
String password = config.get("password");
|
|
||||||
if (password != null) {
|
String driverDialect = config.get("driverDialect");
|
||||||
properties.put(AvailableSettings.JDBC_PASSWORD, password);
|
if (driverDialect != null && driverDialect.length() > 0) {
|
||||||
|
properties.put("hibernate.dialect", driverDialect);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
String driverDialect = config.get("driverDialect");
|
if (databaseSchema != null) {
|
||||||
if (driverDialect != null && driverDialect.length() > 0) {
|
if (databaseSchema.equals("development-update")) {
|
||||||
properties.put("hibernate.dialect", driverDialect);
|
properties.put("hibernate.hbm2ddl.auto", "update");
|
||||||
}
|
databaseSchema = null;
|
||||||
|
} else if (databaseSchema.equals("development-validate")) {
|
||||||
|
properties.put("hibernate.hbm2ddl.auto", "validate");
|
||||||
|
databaseSchema = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
String schema = config.get("schema");
|
properties.put("hibernate.show_sql", config.getBoolean("showSql", false));
|
||||||
if (schema != null) {
|
properties.put("hibernate.format_sql", config.getBoolean("formatSql", true));
|
||||||
properties.put(JpaUtils.HIBERNATE_DEFAULT_SCHEMA, schema);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (databaseSchema != null) {
|
if (databaseSchema != null) {
|
||||||
if (databaseSchema.equals("development-update")) {
|
logger.trace("Updating database");
|
||||||
properties.put("hibernate.hbm2ddl.auto", "update");
|
|
||||||
databaseSchema = null;
|
JpaUpdaterProvider updater = session.getProvider(JpaUpdaterProvider.class);
|
||||||
} else if (databaseSchema.equals("development-validate")) {
|
if (updater == null) {
|
||||||
properties.put("hibernate.hbm2ddl.auto", "validate");
|
throw new RuntimeException("Can't update database: JPA updater provider not found");
|
||||||
databaseSchema = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
connection = getConnection();
|
||||||
|
|
||||||
|
if (databaseSchema.equals("update")) {
|
||||||
|
String currentVersion = null;
|
||||||
|
try {
|
||||||
|
ResultSet resultSet = connection.createStatement().executeQuery(updater.getCurrentVersionSql());
|
||||||
|
if (resultSet.next()) {
|
||||||
|
currentVersion = resultSet.getString(1);
|
||||||
|
}
|
||||||
|
} catch (SQLException e) {
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentVersion == null || !JpaUpdaterProvider.LAST_VERSION.equals(currentVersion)) {
|
||||||
|
updater.update(session, connection);
|
||||||
|
} else {
|
||||||
|
logger.debug("Database is up to date");
|
||||||
|
}
|
||||||
|
} else if (databaseSchema.equals("validate")) {
|
||||||
|
updater.validate(connection);
|
||||||
|
} else {
|
||||||
|
throw new RuntimeException("Invalid value for databaseSchema: " + databaseSchema);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.trace("Database update completed");
|
||||||
}
|
}
|
||||||
|
|
||||||
properties.put("hibernate.show_sql", config.getBoolean("showSql", false));
|
logger.trace("Creating EntityManagerFactory");
|
||||||
properties.put("hibernate.format_sql", config.getBoolean("formatSql", true));
|
emf = Persistence.createEntityManagerFactory(unitName, properties);
|
||||||
|
logger.trace("EntityManagerFactory created");
|
||||||
|
|
||||||
connection = getConnection();
|
// Close after creating EntityManagerFactory to prevent in-mem databases from closing
|
||||||
try{
|
if (connection != null) {
|
||||||
prepareOperationalInfo(connection);
|
try {
|
||||||
|
connection.close();
|
||||||
if (databaseSchema != null) {
|
} catch (SQLException e) {
|
||||||
logger.trace("Updating database");
|
logger.warn(e);
|
||||||
|
}
|
||||||
JpaUpdaterProvider updater = session.getProvider(JpaUpdaterProvider.class);
|
|
||||||
if (updater == null) {
|
|
||||||
throw new RuntimeException("Can't update database: JPA updater provider not found");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (databaseSchema.equals("update")) {
|
|
||||||
String currentVersion = null;
|
|
||||||
try {
|
|
||||||
ResultSet resultSet = connection.createStatement().executeQuery(updater.getCurrentVersionSql(schema));
|
|
||||||
if (resultSet.next()) {
|
|
||||||
currentVersion = resultSet.getString(1);
|
|
||||||
}
|
|
||||||
} catch (SQLException e) {
|
|
||||||
}
|
|
||||||
|
|
||||||
if (currentVersion == null || !JpaUpdaterProvider.LAST_VERSION.equals(currentVersion)) {
|
|
||||||
updater.update(session, connection, schema);
|
|
||||||
} else {
|
|
||||||
logger.debug("Database is up to date");
|
|
||||||
}
|
|
||||||
} else if (databaseSchema.equals("validate")) {
|
|
||||||
updater.validate(connection, schema);
|
|
||||||
} else {
|
|
||||||
throw new RuntimeException("Invalid value for databaseSchema: " + databaseSchema);
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.trace("Database update completed");
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.trace("Creating EntityManagerFactory");
|
|
||||||
emf = Persistence.createEntityManagerFactory(unitName, properties);
|
|
||||||
logger.trace("EntityManagerFactory created");
|
|
||||||
|
|
||||||
} finally {
|
|
||||||
// Close after creating EntityManagerFactory to prevent in-mem databases from closing
|
|
||||||
if (connection != null) {
|
|
||||||
try {
|
|
||||||
connection.close();
|
|
||||||
} catch (SQLException e) {
|
|
||||||
logger.warn(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void prepareOperationalInfo(Connection connection) {
|
|
||||||
try {
|
|
||||||
operationalInfo = new LinkedHashMap<>();
|
|
||||||
DatabaseMetaData md = connection.getMetaData();
|
|
||||||
operationalInfo.put("databaseUrl",md.getURL());
|
|
||||||
operationalInfo.put("databaseUser", md.getUserName());
|
|
||||||
operationalInfo.put("databaseProduct", md.getDatabaseProductName() + " " + md.getDatabaseProductVersion());
|
|
||||||
operationalInfo.put("databaseDriver", md.getDriverName() + " " + md.getDriverVersion());
|
|
||||||
} catch (SQLException e) {
|
|
||||||
logger.warn("Unable to prepare operational info due database exception: " + e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private Connection getConnection() {
|
private Connection getConnection() {
|
||||||
try {
|
try {
|
||||||
@@ -207,10 +184,5 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide
|
|||||||
throw new RuntimeException("Failed to connect to database", e);
|
throw new RuntimeException("Failed to connect to database", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Map<String,String> getOperationalInfo() {
|
|
||||||
return operationalInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
+2
-3
@@ -1,10 +1,9 @@
|
|||||||
package org.keycloak.connections.jpa;
|
package org.keycloak.connections.jpa;
|
||||||
|
|
||||||
import org.keycloak.provider.ServerInfoAwareProviderFactory;
|
import org.keycloak.provider.ProviderFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
|
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
|
||||||
*/
|
*/
|
||||||
public interface JpaConnectionProviderFactory extends ServerInfoAwareProviderFactory<JpaConnectionProvider> {
|
public interface JpaConnectionProviderFactory extends ProviderFactory<JpaConnectionProvider> {
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -9,11 +9,6 @@ import org.keycloak.provider.Spi;
|
|||||||
*/
|
*/
|
||||||
public class JpaConnectionSpi implements Spi {
|
public class JpaConnectionSpi implements Spi {
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInternal() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return "connectionsJpa";
|
return "connectionsJpa";
|
||||||
|
|||||||
+53
-53
@@ -1,53 +1,53 @@
|
|||||||
package org.keycloak.connections.jpa;
|
package org.keycloak.connections.jpa;
|
||||||
|
|
||||||
import org.keycloak.models.KeycloakTransaction;
|
import org.keycloak.models.KeycloakTransaction;
|
||||||
|
|
||||||
import javax.persistence.EntityManager;
|
import javax.persistence.EntityManager;
|
||||||
import javax.persistence.PersistenceException;
|
import javax.persistence.PersistenceException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
|
||||||
* @version $Revision: 1 $
|
* @version $Revision: 1 $
|
||||||
*/
|
*/
|
||||||
public class JpaKeycloakTransaction implements KeycloakTransaction {
|
public class JpaKeycloakTransaction implements KeycloakTransaction {
|
||||||
|
|
||||||
protected EntityManager em;
|
protected EntityManager em;
|
||||||
|
|
||||||
public JpaKeycloakTransaction(EntityManager em) {
|
public JpaKeycloakTransaction(EntityManager em) {
|
||||||
this.em = em;
|
this.em = em;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void begin() {
|
public void begin() {
|
||||||
em.getTransaction().begin();
|
em.getTransaction().begin();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void commit() {
|
public void commit() {
|
||||||
try {
|
try {
|
||||||
em.getTransaction().commit();
|
em.getTransaction().commit();
|
||||||
} catch (PersistenceException e) {
|
} catch (PersistenceException e) {
|
||||||
throw PersistenceExceptionConverter.convert(e.getCause() != null ? e.getCause() : e);
|
throw PersistenceExceptionConverter.convert(e.getCause() != null ? e.getCause() : e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void rollback() {
|
public void rollback() {
|
||||||
em.getTransaction().rollback();
|
em.getTransaction().rollback();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setRollbackOnly() {
|
public void setRollbackOnly() {
|
||||||
em.getTransaction().setRollbackOnly();
|
em.getTransaction().setRollbackOnly();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean getRollbackOnly() {
|
public boolean getRollbackOnly() {
|
||||||
return em.getTransaction().getRollbackOnly();
|
return em.getTransaction().getRollbackOnly();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isActive() {
|
public boolean isActive() {
|
||||||
return em.getTransaction().isActive();
|
return em.getTransaction().isActive();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+4
-4
@@ -12,12 +12,12 @@ public interface JpaUpdaterProvider extends Provider {
|
|||||||
|
|
||||||
public String FIRST_VERSION = "1.0.0.Final";
|
public String FIRST_VERSION = "1.0.0.Final";
|
||||||
|
|
||||||
public String LAST_VERSION = "1.6.0";
|
public String LAST_VERSION = "1.2.0.RC1";
|
||||||
|
|
||||||
public String getCurrentVersionSql(String defaultSchema);
|
public String getCurrentVersionSql();
|
||||||
|
|
||||||
public void update(KeycloakSession session, Connection connection, String defaultSchema);
|
public void update(KeycloakSession session, Connection connection);
|
||||||
|
|
||||||
public void validate(Connection connection, String defaultSchema);
|
public void validate(Connection connection);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -9,11 +9,6 @@ import org.keycloak.provider.Spi;
|
|||||||
*/
|
*/
|
||||||
public class JpaUpdaterSpi implements Spi {
|
public class JpaUpdaterSpi implements Spi {
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInternal() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return "connectionsJpaUpdater";
|
return "connectionsJpaUpdater";
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
package org.keycloak.connections.jpa.util;
|
|
||||||
|
|
||||||
import javax.persistence.EntityManager;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
|
|
||||||
*/
|
|
||||||
public class JpaUtils {
|
|
||||||
|
|
||||||
public static final String HIBERNATE_DEFAULT_SCHEMA = "hibernate.default_schema";
|
|
||||||
|
|
||||||
public static String getTableNameForNativeQuery(String tableName, EntityManager em) {
|
|
||||||
String schema = (String) em.getEntityManagerFactory().getProperties().get(HIBERNATE_DEFAULT_SCHEMA);
|
|
||||||
return (schema==null) ? tableName : schema + "." + tableName;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,45 +1,46 @@
|
|||||||
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
|
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
|
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
|
||||||
version="1.0">
|
version="1.0">
|
||||||
<persistence-unit name="keycloak-default" transaction-type="RESOURCE_LOCAL">
|
<persistence-unit name="keycloak-default" transaction-type="RESOURCE_LOCAL">
|
||||||
<class>org.keycloak.models.jpa.entities.ClientEntity</class>
|
<class>org.keycloak.models.jpa.entities.ClientEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.CredentialEntity</class>
|
<class>org.keycloak.models.jpa.entities.CredentialEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.RealmEntity</class>
|
<class>org.keycloak.models.jpa.entities.RealmEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.RealmAttributeEntity</class>
|
<class>org.keycloak.models.jpa.entities.RealmAttributeEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.RequiredCredentialEntity</class>
|
<class>org.keycloak.models.jpa.entities.RequiredCredentialEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.UserFederationProviderEntity</class>
|
<class>org.keycloak.models.jpa.entities.UserFederationProviderEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.UserFederationMapperEntity</class>
|
<class>org.keycloak.models.jpa.entities.RoleEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.RoleEntity</class>
|
<class>org.keycloak.models.jpa.entities.FederatedIdentityEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.FederatedIdentityEntity</class>
|
<class>org.keycloak.models.jpa.entities.MigrationModelEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.MigrationModelEntity</class>
|
<class>org.keycloak.models.jpa.entities.UserEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.UserEntity</class>
|
<class>org.keycloak.models.jpa.entities.UserRequiredActionEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.UserRequiredActionEntity</class>
|
<class>org.keycloak.models.jpa.entities.UserAttributeEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.UserAttributeEntity</class>
|
<class>org.keycloak.models.jpa.entities.UserRoleMappingEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.UserRoleMappingEntity</class>
|
<class>org.keycloak.models.jpa.entities.ScopeMappingEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.ScopeMappingEntity</class>
|
<class>org.keycloak.models.jpa.entities.IdentityProviderEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.IdentityProviderEntity</class>
|
<class>org.keycloak.models.jpa.entities.IdentityProviderMapperEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.IdentityProviderMapperEntity</class>
|
<class>org.keycloak.models.jpa.entities.ClientIdentityProviderMappingEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.ClientIdentityProviderMappingEntity</class>
|
<class>org.keycloak.models.jpa.entities.ProtocolMapperEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.ProtocolMapperEntity</class>
|
<class>org.keycloak.models.jpa.entities.UserConsentEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.UserConsentEntity</class>
|
<class>org.keycloak.models.jpa.entities.UserConsentRoleEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.UserConsentRoleEntity</class>
|
<class>org.keycloak.models.jpa.entities.UserConsentProtocolMapperEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.UserConsentProtocolMapperEntity</class>
|
|
||||||
<class>org.keycloak.models.jpa.entities.AuthenticationFlowEntity</class>
|
<!-- JpaUserSessionProvider -->
|
||||||
<class>org.keycloak.models.jpa.entities.AuthenticationExecutionEntity</class>
|
<class>org.keycloak.models.sessions.jpa.entities.ClientSessionEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.AuthenticatorConfigEntity</class>
|
<class>org.keycloak.models.sessions.jpa.entities.ClientSessionRoleEntity</class>
|
||||||
<class>org.keycloak.models.jpa.entities.RequiredActionProviderEntity</class>
|
<class>org.keycloak.models.sessions.jpa.entities.ClientSessionProtocolMapperEntity</class>
|
||||||
<class>org.keycloak.models.jpa.session.PersistentUserSessionEntity</class>
|
<class>org.keycloak.models.sessions.jpa.entities.ClientSessionNoteEntity</class>
|
||||||
<class>org.keycloak.models.jpa.session.PersistentClientSessionEntity</class>
|
<class>org.keycloak.models.sessions.jpa.entities.UserSessionNoteEntity</class>
|
||||||
|
<class>org.keycloak.models.sessions.jpa.entities.UserSessionEntity</class>
|
||||||
<!-- JpaAuditProviders -->
|
<class>org.keycloak.models.sessions.jpa.entities.UsernameLoginFailureEntity</class>
|
||||||
<class>org.keycloak.events.jpa.EventEntity</class>
|
|
||||||
<class>org.keycloak.events.jpa.AdminEventEntity</class>
|
<!-- JpaAuditProvider -->
|
||||||
|
<class>org.keycloak.events.jpa.EventEntity</class>
|
||||||
<exclude-unlisted-classes>true</exclude-unlisted-classes>
|
|
||||||
|
<exclude-unlisted-classes>true</exclude-unlisted-classes>
|
||||||
<properties>
|
|
||||||
<property name="jboss.as.jpa.managed" value="false"/>
|
<properties>
|
||||||
</properties>
|
<property name="jboss.as.jpa.managed" value="false"/>
|
||||||
</persistence-unit>
|
</properties>
|
||||||
</persistence>
|
</persistence-unit>
|
||||||
|
</persistence>
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|||||||
+6
-4
@@ -6,7 +6,11 @@ import com.mongodb.DBCollection;
|
|||||||
import com.mongodb.DBCursor;
|
import com.mongodb.DBCursor;
|
||||||
import org.jboss.logging.Logger;
|
import org.jboss.logging.Logger;
|
||||||
import org.keycloak.connections.mongo.updater.MongoUpdaterProvider;
|
import org.keycloak.connections.mongo.updater.MongoUpdaterProvider;
|
||||||
import org.keycloak.connections.mongo.updater.impl.updates.*;
|
import org.keycloak.connections.mongo.updater.impl.updates.Update;
|
||||||
|
import org.keycloak.connections.mongo.updater.impl.updates.Update1_0_0_Final;
|
||||||
|
import org.keycloak.connections.mongo.updater.impl.updates.Update1_1_0_Beta1;
|
||||||
|
import org.keycloak.connections.mongo.updater.impl.updates.Update1_2_0_Beta1;
|
||||||
|
import org.keycloak.connections.mongo.updater.impl.updates.Update1_2_0_CR1;
|
||||||
import org.keycloak.models.KeycloakSession;
|
import org.keycloak.models.KeycloakSession;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@@ -26,9 +30,7 @@ public class DefaultMongoUpdaterProvider implements MongoUpdaterProvider {
|
|||||||
Update1_0_0_Final.class,
|
Update1_0_0_Final.class,
|
||||||
Update1_1_0_Beta1.class,
|
Update1_1_0_Beta1.class,
|
||||||
Update1_2_0_Beta1.class,
|
Update1_2_0_Beta1.class,
|
||||||
Update1_2_0_CR1.class,
|
Update1_2_0_CR1.class
|
||||||
Update1_3_0.class,
|
|
||||||
Update1_4_0.class
|
|
||||||
};
|
};
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
-4
@@ -53,10 +53,6 @@ public abstract class Update {
|
|||||||
log.debugv("Deleted entries from {0}", collection);
|
log.debugv("Deleted entries from {0}", collection);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void removeField(String collection, String field) {
|
|
||||||
db.getCollection(collection).update(new BasicDBObject(), new BasicDBObject("$unset" , new BasicDBObject(field, 1)), false, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void renameCollection(String collection, String newName) {
|
protected void renameCollection(String collection, String newName) {
|
||||||
db.getCollection(collection).rename(newName);
|
db.getCollection(collection).rename(newName);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -249,7 +249,7 @@ public class Update1_2_0_Beta1 extends Update {
|
|||||||
dbMapper.put("protocolMapper", protocolMapper.getProtocolMapper());
|
dbMapper.put("protocolMapper", protocolMapper.getProtocolMapper());
|
||||||
|
|
||||||
Map<String, String> config = protocolMapper.getConfig();
|
Map<String, String> config = protocolMapper.getConfig();
|
||||||
BasicDBObject dbConfig = MapMapper.convertMap(config, null);
|
BasicDBObject dbConfig = MapMapper.convertMap(config);
|
||||||
dbMapper.put("config", dbConfig);
|
dbMapper.put("config", dbConfig);
|
||||||
|
|
||||||
dbProtocolMappers.add(dbMapper);
|
dbProtocolMappers.add(dbMapper);
|
||||||
|
|||||||
-59
@@ -1,59 +0,0 @@
|
|||||||
package org.keycloak.connections.mongo.updater.impl.updates;
|
|
||||||
|
|
||||||
import com.mongodb.BasicDBList;
|
|
||||||
import com.mongodb.BasicDBObject;
|
|
||||||
import com.mongodb.DBCollection;
|
|
||||||
import com.mongodb.DBCursor;
|
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.representations.idm.IdentityProviderRepresentation;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
|
|
||||||
*/
|
|
||||||
public class Update1_3_0 extends Update {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getId() {
|
|
||||||
return "1.3.0";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update(KeycloakSession session) {
|
|
||||||
deleteEntries("clientSessions");
|
|
||||||
deleteEntries("sessions");
|
|
||||||
|
|
||||||
removeField("realms", "passwordCredentialGrantAllowed");
|
|
||||||
|
|
||||||
updateIdentityProviders();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateIdentityProviders() {
|
|
||||||
DBCollection realms = db.getCollection("realms");
|
|
||||||
DBCursor realmsCursor = realms.find();
|
|
||||||
|
|
||||||
try {
|
|
||||||
while (realmsCursor.hasNext()) {
|
|
||||||
BasicDBObject realm = (BasicDBObject) realmsCursor.next();
|
|
||||||
|
|
||||||
BasicDBList identityProviders = (BasicDBList) realm.get("identityProviders");
|
|
||||||
if (identityProviders != null) {
|
|
||||||
for (Object ipObj : identityProviders) {
|
|
||||||
BasicDBObject identityProvider = (BasicDBObject) ipObj;
|
|
||||||
|
|
||||||
boolean updateProfileFirstLogin = identityProvider.getBoolean("updateProfileFirstLogin");
|
|
||||||
String upflMode = updateProfileFirstLogin ? IdentityProviderRepresentation.UPFLM_ON : IdentityProviderRepresentation.UPFLM_OFF;
|
|
||||||
identityProvider.put("updateProfileFirstLoginMode", upflMode);
|
|
||||||
identityProvider.removeField("updateProfileFirstLogin");
|
|
||||||
|
|
||||||
identityProvider.put("trustEmail", false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
realms.save(realm);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
realmsCursor.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
-63
@@ -1,63 +0,0 @@
|
|||||||
package org.keycloak.connections.mongo.updater.impl.updates;
|
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
import com.mongodb.BasicDBList;
|
|
||||||
import com.mongodb.BasicDBObject;
|
|
||||||
import com.mongodb.DBCollection;
|
|
||||||
import com.mongodb.DBCursor;
|
|
||||||
import org.keycloak.models.KeycloakSession;
|
|
||||||
import org.keycloak.representations.idm.IdentityProviderRepresentation;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
|
|
||||||
*/
|
|
||||||
public class Update1_4_0 extends Update {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getId() {
|
|
||||||
return "1.4.0";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void update(KeycloakSession session) throws ClassNotFoundException {
|
|
||||||
deleteEntries("clientSessions");
|
|
||||||
deleteEntries("sessions");
|
|
||||||
|
|
||||||
// Remove warning
|
|
||||||
removeField("realms", "authenticators");
|
|
||||||
|
|
||||||
updateUserAttributes();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateUserAttributes() {
|
|
||||||
DBCollection users = db.getCollection("users");
|
|
||||||
DBCursor usersCursor = users.find();
|
|
||||||
|
|
||||||
try {
|
|
||||||
while (usersCursor.hasNext()) {
|
|
||||||
BasicDBObject user = (BasicDBObject) usersCursor.next();
|
|
||||||
|
|
||||||
BasicDBObject attributes = (BasicDBObject) user.get("attributes");
|
|
||||||
if (attributes != null) {
|
|
||||||
for (Map.Entry<String, Object> attr : new HashSet<>(attributes.entrySet())) {
|
|
||||||
String attrName = attr.getKey();
|
|
||||||
Object attrValue = attr.getValue();
|
|
||||||
if (attrValue != null && attrValue instanceof String) {
|
|
||||||
BasicDBList asList = new BasicDBList();
|
|
||||||
asList.add(attrValue);
|
|
||||||
attributes.put(attrName, asList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
user.put("attributes", attributes);
|
|
||||||
|
|
||||||
users.save(user);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
usersCursor.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+35
-35
@@ -1,35 +1,35 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>keycloak-parent</artifactId>
|
<artifactId>keycloak-parent</artifactId>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<version>1.6.0.Final</version>
|
<version>1.2.0.CR1</version>
|
||||||
<relativePath>../../pom.xml</relativePath>
|
<relativePath>../../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>keycloak-connections-mongo</artifactId>
|
<artifactId>keycloak-connections-mongo</artifactId>
|
||||||
<name>Keycloak Connections Mongo</name>
|
<name>Keycloak Connections Mongo</name>
|
||||||
<description/>
|
<description/>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-core</artifactId>
|
<artifactId>keycloak-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.keycloak</groupId>
|
<groupId>org.keycloak</groupId>
|
||||||
<artifactId>keycloak-model-api</artifactId>
|
<artifactId>keycloak-model-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.mongodb</groupId>
|
<groupId>org.mongodb</groupId>
|
||||||
<artifactId>mongo-java-driver</artifactId>
|
<artifactId>mongo-java-driver</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jboss.logging</groupId>
|
<groupId>org.jboss.logging</groupId>
|
||||||
<artifactId>jboss-logging</artifactId>
|
<artifactId>jboss-logging</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
+24
-90
@@ -3,10 +3,8 @@ package org.keycloak.connections.mongo;
|
|||||||
import com.mongodb.DB;
|
import com.mongodb.DB;
|
||||||
import com.mongodb.MongoClient;
|
import com.mongodb.MongoClient;
|
||||||
import com.mongodb.MongoClientOptions;
|
import com.mongodb.MongoClientOptions;
|
||||||
import com.mongodb.MongoClientURI;
|
|
||||||
import com.mongodb.MongoCredential;
|
import com.mongodb.MongoCredential;
|
||||||
import com.mongodb.ServerAddress;
|
import com.mongodb.ServerAddress;
|
||||||
|
|
||||||
import org.jboss.logging.Logger;
|
import org.jboss.logging.Logger;
|
||||||
import org.keycloak.Config;
|
import org.keycloak.Config;
|
||||||
import org.keycloak.connections.mongo.api.MongoStore;
|
import org.keycloak.connections.mongo.api.MongoStore;
|
||||||
@@ -18,41 +16,32 @@ import org.keycloak.models.KeycloakSessionFactory;
|
|||||||
|
|
||||||
import javax.net.ssl.SSLSocketFactory;
|
import javax.net.ssl.SSLSocketFactory;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.net.UnknownHostException;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
|
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
|
||||||
*/
|
*/
|
||||||
public class DefaultMongoConnectionFactoryProvider implements MongoConnectionProviderFactory {
|
public class DefaultMongoConnectionFactoryProvider implements MongoConnectionProviderFactory {
|
||||||
|
|
||||||
// TODO Make it dynamic
|
// TODO Make configurable
|
||||||
private String[] entities = new String[]{
|
private String[] entities = new String[]{
|
||||||
"org.keycloak.models.mongo.keycloak.entities.MongoRealmEntity",
|
"org.keycloak.models.mongo.keycloak.entities.MongoRealmEntity",
|
||||||
"org.keycloak.models.mongo.keycloak.entities.MongoUserEntity",
|
"org.keycloak.models.mongo.keycloak.entities.MongoUserEntity",
|
||||||
"org.keycloak.models.mongo.keycloak.entities.MongoRoleEntity",
|
"org.keycloak.models.mongo.keycloak.entities.MongoRoleEntity",
|
||||||
"org.keycloak.models.mongo.keycloak.entities.MongoClientEntity",
|
|
||||||
"org.keycloak.models.mongo.keycloak.entities.MongoUserConsentEntity",
|
|
||||||
"org.keycloak.models.mongo.keycloak.entities.MongoMigrationModelEntity",
|
|
||||||
"org.keycloak.models.mongo.keycloak.entities.MongoOnlineUserSessionEntity",
|
|
||||||
"org.keycloak.models.mongo.keycloak.entities.MongoOfflineUserSessionEntity",
|
|
||||||
"org.keycloak.models.entities.IdentityProviderEntity",
|
"org.keycloak.models.entities.IdentityProviderEntity",
|
||||||
"org.keycloak.models.entities.ClientIdentityProviderMappingEntity",
|
"org.keycloak.models.entities.ClientIdentityProviderMappingEntity",
|
||||||
"org.keycloak.models.entities.RequiredCredentialEntity",
|
"org.keycloak.models.entities.RequiredCredentialEntity",
|
||||||
"org.keycloak.models.entities.CredentialEntity",
|
"org.keycloak.models.entities.CredentialEntity",
|
||||||
"org.keycloak.models.entities.FederatedIdentityEntity",
|
"org.keycloak.models.entities.FederatedIdentityEntity",
|
||||||
|
"org.keycloak.models.mongo.keycloak.entities.MongoClientEntity",
|
||||||
|
"org.keycloak.models.sessions.mongo.entities.MongoUsernameLoginFailureEntity",
|
||||||
|
"org.keycloak.models.sessions.mongo.entities.MongoUserSessionEntity",
|
||||||
|
"org.keycloak.models.sessions.mongo.entities.MongoClientSessionEntity",
|
||||||
"org.keycloak.models.entities.UserFederationProviderEntity",
|
"org.keycloak.models.entities.UserFederationProviderEntity",
|
||||||
"org.keycloak.models.entities.UserFederationMapperEntity",
|
|
||||||
"org.keycloak.models.entities.ProtocolMapperEntity",
|
"org.keycloak.models.entities.ProtocolMapperEntity",
|
||||||
"org.keycloak.models.entities.IdentityProviderMapperEntity",
|
"org.keycloak.models.entities.IdentityProviderMapperEntity",
|
||||||
"org.keycloak.models.entities.AuthenticationExecutionEntity",
|
"org.keycloak.models.mongo.keycloak.entities.MongoUserConsentEntity",
|
||||||
"org.keycloak.models.entities.AuthenticationFlowEntity",
|
"org.keycloak.models.mongo.keycloak.entities.MongoMigrationModelEntity"
|
||||||
"org.keycloak.models.entities.AuthenticatorConfigEntity",
|
|
||||||
"org.keycloak.models.entities.RequiredActionProviderEntity",
|
|
||||||
"org.keycloak.models.entities.PersistentUserSessionEntity",
|
|
||||||
"org.keycloak.models.entities.PersistentClientSessionEntity",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
private static final Logger logger = Logger.getLogger(DefaultMongoConnectionFactoryProvider.class);
|
private static final Logger logger = Logger.getLogger(DefaultMongoConnectionFactoryProvider.class);
|
||||||
@@ -61,9 +50,7 @@ public class DefaultMongoConnectionFactoryProvider implements MongoConnectionPro
|
|||||||
|
|
||||||
private MongoStore mongoStore;
|
private MongoStore mongoStore;
|
||||||
private DB db;
|
private DB db;
|
||||||
protected Config.Scope config;
|
private Config.Scope config;
|
||||||
|
|
||||||
private Map<String,String> operationalInfo;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public MongoConnectionProvider create(KeycloakSession session) {
|
public MongoConnectionProvider create(KeycloakSession session) {
|
||||||
@@ -90,9 +77,21 @@ public class DefaultMongoConnectionFactoryProvider implements MongoConnectionPro
|
|||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
if (client == null) {
|
if (client == null) {
|
||||||
try {
|
try {
|
||||||
this.client = createMongoClient();
|
String host = config.get("host", ServerAddress.defaultHost());
|
||||||
|
int port = config.getInt("port", ServerAddress.defaultPort());
|
||||||
String dbName = config.get("db", "keycloak");
|
String dbName = config.get("db", "keycloak");
|
||||||
|
|
||||||
|
String user = config.get("user");
|
||||||
|
String password = config.get("password");
|
||||||
|
|
||||||
|
MongoClientOptions clientOptions = getClientOptions();
|
||||||
|
if (user != null && password != null) {
|
||||||
|
MongoCredential credential = MongoCredential.createMongoCRCredential(user, dbName, password.toCharArray());
|
||||||
|
client = new MongoClient(new ServerAddress(host, port), Collections.singletonList(credential), clientOptions);
|
||||||
|
} else {
|
||||||
|
client = new MongoClient(new ServerAddress(host, port), clientOptions);
|
||||||
|
}
|
||||||
|
|
||||||
this.db = client.getDB(dbName);
|
this.db = client.getDB(dbName);
|
||||||
|
|
||||||
String databaseSchema = config.get("databaseSchema");
|
String databaseSchema = config.get("databaseSchema");
|
||||||
@@ -111,6 +110,8 @@ public class DefaultMongoConnectionFactoryProvider implements MongoConnectionPro
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.mongoStore = new MongoStoreImpl(db, getManagedEntities());
|
this.mongoStore = new MongoStoreImpl(db, getManagedEntities());
|
||||||
|
|
||||||
|
logger.debugv("Initialized mongo model. host: %s, port: %d, db: %s", host, port, dbName);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
@@ -139,68 +140,6 @@ public class DefaultMongoConnectionFactoryProvider implements MongoConnectionPro
|
|||||||
return "default";
|
return "default";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Override this method if you want more possibility to configure Mongo client. It can be also used to inject mongo client
|
|
||||||
* from different source.
|
|
||||||
*
|
|
||||||
* This method can assume that "config" is already set and can use it.
|
|
||||||
*
|
|
||||||
* @return mongoClient instance, which will be shared for whole Keycloak
|
|
||||||
*
|
|
||||||
* @throws UnknownHostException
|
|
||||||
*/
|
|
||||||
protected MongoClient createMongoClient() throws UnknownHostException {
|
|
||||||
operationalInfo = new LinkedHashMap<>();
|
|
||||||
String dbName = config.get("db", "keycloak");
|
|
||||||
|
|
||||||
String uriString = config.get("uri");
|
|
||||||
if (uriString != null) {
|
|
||||||
MongoClientURI uri = new MongoClientURI(uriString);
|
|
||||||
MongoClient client = new MongoClient(uri);
|
|
||||||
|
|
||||||
StringBuilder hostsBuilder = new StringBuilder();
|
|
||||||
for (int i=0 ; i<uri.getHosts().size() ; i++) {
|
|
||||||
if (i!=0) {
|
|
||||||
hostsBuilder.append(", ");
|
|
||||||
}
|
|
||||||
hostsBuilder.append(uri.getHosts().get(i));
|
|
||||||
}
|
|
||||||
String hosts = hostsBuilder.toString();
|
|
||||||
|
|
||||||
operationalInfo.put("mongoHosts", hosts);
|
|
||||||
operationalInfo.put("mongoDatabaseName", dbName);
|
|
||||||
operationalInfo.put("mongoUser", uri.getUsername());
|
|
||||||
operationalInfo.put("mongoDriverVersion", client.getVersion());
|
|
||||||
|
|
||||||
logger.debugv("Initialized mongo model. host(s): %s, db: %s", uri.getHosts(), dbName);
|
|
||||||
return client;
|
|
||||||
} else {
|
|
||||||
String host = config.get("host", ServerAddress.defaultHost());
|
|
||||||
int port = config.getInt("port", ServerAddress.defaultPort());
|
|
||||||
|
|
||||||
String user = config.get("user");
|
|
||||||
String password = config.get("password");
|
|
||||||
|
|
||||||
MongoClientOptions clientOptions = getClientOptions();
|
|
||||||
|
|
||||||
MongoClient client;
|
|
||||||
if (user != null && password != null) {
|
|
||||||
MongoCredential credential = MongoCredential.createMongoCRCredential(user, dbName, password.toCharArray());
|
|
||||||
client = new MongoClient(new ServerAddress(host, port), Collections.singletonList(credential), clientOptions);
|
|
||||||
} else {
|
|
||||||
client = new MongoClient(new ServerAddress(host, port), clientOptions);
|
|
||||||
}
|
|
||||||
|
|
||||||
operationalInfo.put("mongoServerAddress", client.getAddress().toString());
|
|
||||||
operationalInfo.put("mongoDatabaseName", dbName);
|
|
||||||
operationalInfo.put("mongoUser", user);
|
|
||||||
operationalInfo.put("mongoDriverVersion", client.getVersion());
|
|
||||||
|
|
||||||
logger.debugv("Initialized mongo model. host: %s, port: %d, db: %s", host, port, dbName);
|
|
||||||
return client;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected MongoClientOptions getClientOptions() {
|
protected MongoClientOptions getClientOptions() {
|
||||||
MongoClientOptions.Builder builder = MongoClientOptions.builder();
|
MongoClientOptions.Builder builder = MongoClientOptions.builder();
|
||||||
checkIntOption("connectionsPerHost", builder);
|
checkIntOption("connectionsPerHost", builder);
|
||||||
@@ -243,10 +182,5 @@ public class DefaultMongoConnectionFactoryProvider implements MongoConnectionPro
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Map<String,String> getOperationalInfo() {
|
|
||||||
return operationalInfo;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
+2
-2
@@ -1,9 +1,9 @@
|
|||||||
package org.keycloak.connections.mongo;
|
package org.keycloak.connections.mongo;
|
||||||
|
|
||||||
import org.keycloak.provider.ServerInfoAwareProviderFactory;
|
import org.keycloak.provider.ProviderFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
|
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
|
||||||
*/
|
*/
|
||||||
public interface MongoConnectionProviderFactory extends ServerInfoAwareProviderFactory<MongoConnectionProvider> {
|
public interface MongoConnectionProviderFactory extends ProviderFactory<MongoConnectionProvider> {
|
||||||
}
|
}
|
||||||
@@ -9,11 +9,6 @@ import org.keycloak.provider.Spi;
|
|||||||
*/
|
*/
|
||||||
public class MongoConnectionSpi implements Spi {
|
public class MongoConnectionSpi implements Spi {
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isInternal() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return "connectionsMongo";
|
return "connectionsMongo";
|
||||||
|
|||||||
+79
-79
@@ -1,79 +1,79 @@
|
|||||||
package org.keycloak.connections.mongo.api;
|
package org.keycloak.connections.mongo.api;
|
||||||
|
|
||||||
import com.mongodb.DBObject;
|
import com.mongodb.DBObject;
|
||||||
import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext;
|
import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
|
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
|
||||||
*/
|
*/
|
||||||
public interface MongoStore {
|
public interface MongoStore {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Insert new entity
|
* Insert new entity
|
||||||
*
|
*
|
||||||
* @param entity to insert
|
* @param entity to insert
|
||||||
*/
|
*/
|
||||||
void insertEntity(MongoIdentifiableEntity entity, MongoStoreInvocationContext context);
|
void insertEntity(MongoIdentifiableEntity entity, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update existing entity
|
* Update existing entity
|
||||||
*
|
*
|
||||||
* @param entity to update
|
* @param entity to update
|
||||||
*/
|
*/
|
||||||
void updateEntity(MongoIdentifiableEntity entity, MongoStoreInvocationContext context);
|
void updateEntity(MongoIdentifiableEntity entity, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Bulk update of more entities of some type
|
* Bulk update of more entities of some type
|
||||||
*
|
*
|
||||||
* @param type
|
* @param type
|
||||||
* @param query
|
* @param query
|
||||||
* @param update
|
* @param update
|
||||||
* @param context
|
* @param context
|
||||||
* @return count of updated entities
|
* @return count of updated entities
|
||||||
*/
|
*/
|
||||||
<T extends MongoIdentifiableEntity> int updateEntities(Class<T> type, DBObject query, DBObject update, MongoStoreInvocationContext context);
|
<T extends MongoIdentifiableEntity> int updateEntities(Class<T> type, DBObject query, DBObject update, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
<T extends MongoIdentifiableEntity> T loadEntity(Class<T> type, String id, MongoStoreInvocationContext context);
|
<T extends MongoIdentifiableEntity> T loadEntity(Class<T> type, String id, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
<T extends MongoIdentifiableEntity> T loadSingleEntity(Class<T> type, DBObject query, MongoStoreInvocationContext context);
|
<T extends MongoIdentifiableEntity> T loadSingleEntity(Class<T> type, DBObject query, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param type
|
* @param type
|
||||||
* @param query
|
* @param query
|
||||||
* @param context
|
* @param context
|
||||||
* @return query result or empty list if no results available for the query. Doesn't return null
|
* @return query result or empty list if no results available for the query. Doesn't return null
|
||||||
*/
|
*/
|
||||||
<T extends MongoIdentifiableEntity> List<T> loadEntities(Class<T> type, DBObject query, MongoStoreInvocationContext context);
|
<T extends MongoIdentifiableEntity> List<T> loadEntities(Class<T> type, DBObject query, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param type
|
* @param type
|
||||||
* @param query
|
* @param query
|
||||||
* @param context
|
* @param context
|
||||||
* @return query result or empty list if no results available for the query. Doesn't return null
|
* @return query result or empty list if no results available for the query. Doesn't return null
|
||||||
*/
|
*/
|
||||||
<T extends MongoIdentifiableEntity> List<T> loadEntities(Class<T> type, DBObject query, DBObject sort, int firstResult, int maxResults, MongoStoreInvocationContext context);
|
<T extends MongoIdentifiableEntity> List<T> loadEntities(Class<T> type, DBObject query, DBObject sort, int firstResult, int maxResults, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
<T extends MongoIdentifiableEntity> int countEntities(Class<T> type, DBObject query, MongoStoreInvocationContext context);
|
<T extends MongoIdentifiableEntity> int countEntities(Class<T> type, DBObject query, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
boolean removeEntity(MongoIdentifiableEntity entity, MongoStoreInvocationContext context);
|
boolean removeEntity(MongoIdentifiableEntity entity, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
boolean removeEntity(Class<? extends MongoIdentifiableEntity> type, String id, MongoStoreInvocationContext context);
|
boolean removeEntity(Class<? extends MongoIdentifiableEntity> type, String id, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param type
|
* @param type
|
||||||
* @param query
|
* @param query
|
||||||
* @param callback if true, then store will first load all entities, then call "afterRemove" for every entity. If false, the entities are removed directly without load and calling "afterRemove" callback
|
* @param callback if true, then store will first load all entities, then call "afterRemove" for every entity. If false, the entities are removed directly without load and calling "afterRemove" callback
|
||||||
* false has better performance (especially if we are going to remove big number of entities)
|
* false has better performance (especially if we are going to remove big number of entities)
|
||||||
* @param context
|
* @param context
|
||||||
* @return count of removed entities
|
* @return count of removed entities
|
||||||
*/
|
*/
|
||||||
int removeEntities(Class<? extends MongoIdentifiableEntity> type, DBObject query, boolean callback, MongoStoreInvocationContext context);
|
int removeEntities(Class<? extends MongoIdentifiableEntity> type, DBObject query, boolean callback, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
<S> boolean pushItemToList(MongoIdentifiableEntity entity, String listPropertyName, S itemToPush, boolean skipIfAlreadyPresent, MongoStoreInvocationContext context);
|
<S> boolean pushItemToList(MongoIdentifiableEntity entity, String listPropertyName, S itemToPush, boolean skipIfAlreadyPresent, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
<S> boolean pullItemFromList(MongoIdentifiableEntity entity, String listPropertyName, S itemToPull, MongoStoreInvocationContext context);
|
<S> boolean pullItemFromList(MongoIdentifiableEntity entity, String listPropertyName, S itemToPull, MongoStoreInvocationContext context);
|
||||||
|
|
||||||
}
|
}
|
||||||
+3
-4
@@ -1,6 +1,5 @@
|
|||||||
package org.keycloak.connections.mongo.api.types;
|
package org.keycloak.connections.mongo.api.types;
|
||||||
|
|
||||||
import java.lang.reflect.Type;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -15,9 +14,9 @@ public class MapperContext<T, S> {
|
|||||||
private final Class<? extends S> expectedReturnType;
|
private final Class<? extends S> expectedReturnType;
|
||||||
|
|
||||||
// in case that expected return type is generic type (like "List<String>"), then genericTypes could contain list of expected generic arguments
|
// in case that expected return type is generic type (like "List<String>"), then genericTypes could contain list of expected generic arguments
|
||||||
private final List<Type> genericTypes;
|
private final List<Class<?>> genericTypes;
|
||||||
|
|
||||||
public MapperContext(T objectToConvert, Class<? extends S> expectedReturnType, List<Type> genericTypes) {
|
public MapperContext(T objectToConvert, Class<? extends S> expectedReturnType, List<Class<?>> genericTypes) {
|
||||||
this.objectToConvert = objectToConvert;
|
this.objectToConvert = objectToConvert;
|
||||||
this.expectedReturnType = expectedReturnType;
|
this.expectedReturnType = expectedReturnType;
|
||||||
this.genericTypes = genericTypes;
|
this.genericTypes = genericTypes;
|
||||||
@@ -31,7 +30,7 @@ public class MapperContext<T, S> {
|
|||||||
return expectedReturnType;
|
return expectedReturnType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Type> getGenericTypes() {
|
public List<Class<?>> getGenericTypes() {
|
||||||
return genericTypes;
|
return genericTypes;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+111
-119
@@ -1,119 +1,111 @@
|
|||||||
package org.keycloak.connections.mongo.api.types;
|
package org.keycloak.connections.mongo.api.types;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registry of mappers, which allow to convert application object to database objects. MapperRegistry is main entry point to be used by application.
|
* Registry of mappers, which allow to convert application object to database objects. MapperRegistry is main entry point to be used by application.
|
||||||
* Application can create instance of MapperRegistry and then register required Mapper objects.
|
* Application can create instance of MapperRegistry and then register required Mapper objects.
|
||||||
*
|
*
|
||||||
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
|
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
|
||||||
*/
|
*/
|
||||||
public class MapperRegistry {
|
public class MapperRegistry {
|
||||||
|
|
||||||
// TODO: Thread-safety support (maybe...)
|
// TODO: Thread-safety support (maybe...)
|
||||||
// Mappers of Application objects to DB objects
|
// Mappers of Application objects to DB objects
|
||||||
private Map<Class<?>, Mapper<?, ?>> appObjectMappers = new HashMap<Class<?>, Mapper<?, ?>>();
|
private Map<Class<?>, Mapper<?, ?>> appObjectMappers = new HashMap<Class<?>, Mapper<?, ?>>();
|
||||||
|
|
||||||
// Mappers of DB objects to Application objects
|
// Mappers of DB objects to Application objects
|
||||||
private Map<Class<?>, Map<Class<?>, Mapper<?, ?>>> dbObjectMappers = new HashMap<Class<?>, Map<Class<?>, Mapper<?,?>>>();
|
private Map<Class<?>, Map<Class<?>, Mapper<?, ?>>> dbObjectMappers = new HashMap<Class<?>, Map<Class<?>, Mapper<?,?>>>();
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add mapper for converting application objects to DB objects
|
* Add mapper for converting application objects to DB objects
|
||||||
*
|
*
|
||||||
* @param mapper
|
* @param mapper
|
||||||
*/
|
*/
|
||||||
public void addAppObjectMapper(Mapper<?, ?> mapper) {
|
public void addAppObjectMapper(Mapper<?, ?> mapper) {
|
||||||
appObjectMappers.put(mapper.getTypeOfObjectToConvert(), mapper);
|
appObjectMappers.put(mapper.getTypeOfObjectToConvert(), mapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add mapper for converting DB objects to application objects
|
* Add mapper for converting DB objects to application objects
|
||||||
*
|
*
|
||||||
* @param mapper
|
* @param mapper
|
||||||
*/
|
*/
|
||||||
public void addDBObjectMapper(Mapper<?, ?> mapper) {
|
public void addDBObjectMapper(Mapper<?, ?> mapper) {
|
||||||
Class<?> dbObjectType = mapper.getTypeOfObjectToConvert();
|
Class<?> dbObjectType = mapper.getTypeOfObjectToConvert();
|
||||||
Class<?> appObjectType = mapper.getExpectedReturnType();
|
Class<?> appObjectType = mapper.getExpectedReturnType();
|
||||||
Map<Class<?>, Mapper<?, ?>> appObjects = dbObjectMappers.get(dbObjectType);
|
Map<Class<?>, Mapper<?, ?>> appObjects = dbObjectMappers.get(dbObjectType);
|
||||||
if (appObjects == null) {
|
if (appObjects == null) {
|
||||||
appObjects = new HashMap<Class<?>, Mapper<?, ?>>();
|
appObjects = new HashMap<Class<?>, Mapper<?, ?>>();
|
||||||
dbObjectMappers.put(dbObjectType, appObjects);
|
dbObjectMappers.put(dbObjectType, appObjects);
|
||||||
}
|
}
|
||||||
appObjects.put(appObjectType, mapper);
|
appObjects.put(appObjectType, mapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public <S> S convertDBObjectToApplicationObject(MapperContext<Object, S> context) {
|
public <S> S convertDBObjectToApplicationObject(MapperContext<Object, S> context) {
|
||||||
if (context.getObjectToConvert() == null) {
|
Object dbObject = context.getObjectToConvert();
|
||||||
return null;
|
Class<?> expectedApplicationObjectType = context.getExpectedReturnType();
|
||||||
}
|
|
||||||
|
Class<?> dbObjectType = dbObject.getClass();
|
||||||
Object dbObject = context.getObjectToConvert();
|
Mapper<Object, S> mapper;
|
||||||
Class<?> expectedApplicationObjectType = context.getExpectedReturnType();
|
|
||||||
|
Map<Class<?>, Mapper<?, ?>> appObjects = dbObjectMappers.get(dbObjectType);
|
||||||
Class<?> dbObjectType = dbObject.getClass();
|
if (appObjects == null) {
|
||||||
Mapper<Object, S> mapper;
|
throw new IllegalArgumentException("Not found any mappers for type " + dbObjectType);
|
||||||
|
} else {
|
||||||
Map<Class<?>, Mapper<?, ?>> appObjects = dbObjectMappers.get(dbObjectType);
|
if (appObjects.size() == 1) {
|
||||||
if (appObjects == null) {
|
mapper = (Mapper<Object, S>)appObjects.values().iterator().next();
|
||||||
throw new IllegalArgumentException("Not found any mappers for type " + dbObjectType);
|
} else {
|
||||||
} else {
|
// Try to find converter for requested application type
|
||||||
if (appObjects.size() == 1) {
|
mapper = (Mapper<Object, S>)getAppConverterForType(context.getExpectedReturnType(), appObjects);
|
||||||
mapper = (Mapper<Object, S>)appObjects.values().iterator().next();
|
}
|
||||||
} else {
|
}
|
||||||
// Try to find converter for requested application type
|
|
||||||
mapper = (Mapper<Object, S>)getAppConverterForType(context.getExpectedReturnType(), appObjects);
|
if (mapper == null) {
|
||||||
}
|
throw new IllegalArgumentException("Can't found mapper for type " + dbObjectType + " and expectedApplicationType " + expectedApplicationObjectType);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mapper == null) {
|
return mapper.convertObject(context);
|
||||||
throw new IllegalArgumentException("Can't found mapper for type " + dbObjectType + " and expectedApplicationType " + expectedApplicationObjectType);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return mapper.convertObject(context);
|
public <S> S convertApplicationObjectToDBObject(Object applicationObject, Class<S> expectedDBObjectType) {
|
||||||
}
|
Class<?> appObjectType = applicationObject.getClass();
|
||||||
|
Mapper<Object, S> mapper = (Mapper<Object, S>)getAppConverterForType(appObjectType, appObjectMappers);
|
||||||
|
if (mapper == null) {
|
||||||
public <S> S convertApplicationObjectToDBObject(Object applicationObject, Class<S> expectedDBObjectType) {
|
throw new IllegalArgumentException("Can't found converter for type " + appObjectType + " in registered appObjectMappers");
|
||||||
if (applicationObject == null) {
|
}
|
||||||
return null;
|
if (!expectedDBObjectType.isAssignableFrom(mapper.getExpectedReturnType())) {
|
||||||
}
|
throw new IllegalArgumentException("Converter " + mapper + " has return type " + mapper.getExpectedReturnType() +
|
||||||
|
" but we need type " + expectedDBObjectType);
|
||||||
Class<?> appObjectType = applicationObject.getClass();
|
}
|
||||||
Mapper<Object, S> mapper = (Mapper<Object, S>)getAppConverterForType(appObjectType, appObjectMappers);
|
return mapper.convertObject(new MapperContext<Object, S>(applicationObject, expectedDBObjectType, null));
|
||||||
if (mapper == null) {
|
}
|
||||||
throw new IllegalArgumentException("Can't found converter for type " + appObjectType + " in registered appObjectMappers");
|
|
||||||
}
|
// Try to find converter for given type or all it's supertypes
|
||||||
if (!expectedDBObjectType.isAssignableFrom(mapper.getExpectedReturnType())) {
|
private static Mapper<Object, ?> getAppConverterForType(Class<?> appObjectType, Map<Class<?>, Mapper<?, ?>> appObjectConverters) {
|
||||||
throw new IllegalArgumentException("Converter " + mapper + " has return type " + mapper.getExpectedReturnType() +
|
Mapper<Object, ?> mapper = (Mapper<Object, ?>)appObjectConverters.get(appObjectType);
|
||||||
" but we need type " + expectedDBObjectType);
|
if (mapper != null) {
|
||||||
}
|
return mapper;
|
||||||
return mapper.convertObject(new MapperContext<Object, S>(applicationObject, expectedDBObjectType, null));
|
} else {
|
||||||
}
|
Class<?>[] interfaces = appObjectType.getInterfaces();
|
||||||
|
for (Class<?> interface1 : interfaces) {
|
||||||
// Try to find converter for given type or all it's supertypes
|
mapper = getAppConverterForType(interface1, appObjectConverters);
|
||||||
private static Mapper<Object, ?> getAppConverterForType(Class<?> appObjectType, Map<Class<?>, Mapper<?, ?>> appObjectConverters) {
|
if (mapper != null) {
|
||||||
Mapper<Object, ?> mapper = (Mapper<Object, ?>)appObjectConverters.get(appObjectType);
|
return mapper;
|
||||||
if (mapper != null) {
|
}
|
||||||
return mapper;
|
}
|
||||||
} else {
|
|
||||||
Class<?>[] interfaces = appObjectType.getInterfaces();
|
Class<?> superType = appObjectType.getSuperclass();
|
||||||
for (Class<?> interface1 : interfaces) {
|
if (superType != null) {
|
||||||
mapper = getAppConverterForType(interface1, appObjectConverters);
|
return getAppConverterForType(superType, appObjectConverters);
|
||||||
if (mapper != null) {
|
} else {
|
||||||
return mapper;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
Class<?> superType = appObjectType.getSuperclass();
|
}
|
||||||
if (superType != null) {
|
|
||||||
return getAppConverterForType(superType, appObjectConverters);
|
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loaded 100 of 3368 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user