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

truststore httpclient

Browse source
This commit is contained in:
Bill Burke 2016-01-19 17:29:16 -05:00
parent 17d856a5d8
commit 4ed1eb66ee
38 changed files with 32 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java
View file

@ -27,7 +27,7 @@ import org.keycloak.broker.provider.AbstractIdentityProvider;
import org.keycloak.broker.provider.AuthenticationRequest;
import org.keycloak.broker.provider.BrokeredIdentityContext;
import org.keycloak.broker.provider.IdentityBrokerException;
import org.keycloak.connections.truststore.JSSETruststoreConfigurator;
import org.keycloak.truststore.JSSETruststoreConfigurator;
import org.keycloak.events.Errors;
import org.keycloak.events.EventBuilder;
import org.keycloak.events.EventType;

40
connections/http-client/pom.xml
View file

@ -1,40 +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.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-connections-http-client</artifactId>
<name>Keycloak Connections Apache HttpClient</name>
<description/>
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-connections-truststore</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

1
connections/http-client/src/main/resources/META-INF/services/org.keycloak.provider.Spi
View file

@ -1 +0,0 @@
org.keycloak.connections.httpclient.HttpClientSpi

2
connections/pom.xml
View file

@ -14,8 +14,6 @@
<modules>
<module>infinispan</module>
<module>http-client</module>
<module>truststore</module>
</modules>
<build>

35
connections/truststore/pom.xml
View file

@ -1,35 +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.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-connections-truststore</artifactId>
<name>Keycloak Truststore</name>
<description/>
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

1
connections/truststore/src/main/resources/META-INF/services/org.keycloak.connections.truststore.TruststoreProviderFactory
View file

@ -1 +0,0 @@
org.keycloak.connections.truststore.FileTruststoreProviderFactory

1
connections/truststore/src/main/resources/META-INF/services/org.keycloak.provider.Spi
View file

@ -1 +0,0 @@
org.keycloak.connections.truststore.TruststoreSpi

8
dependencies/server-min/pom.xml vendored
View file

@ -65,14 +65,6 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-forms-common-themes</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-connections-truststore</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-connections-http-client</artifactId>
</dependency>
</dependencies>
</project>

1
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml
View file

@ -11,7 +11,6 @@
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.keycloak.keycloak-services"/>
<module name="org.keycloak.keycloak-connections-truststore"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/>

22
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-http-client/main/module.xml
View file

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-connections-http-client">
<resources>
<artifact name="${org.keycloak:keycloak-connections-http-client}"/>
</resources>
<exports>
<include path="META-INF/**"/>
</exports>
<dependencies>
<module name="org.keycloak.keycloak-common"/>
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.jboss.logging"/>
<module name="javax.api"/>
<module name="org.apache.httpcomponents"/>
<module name="org.keycloak.keycloak-connections-truststore"/>
</dependencies>
</module>

17
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-connections-truststore/main/module.xml
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-connections-truststore">
<resources>
<artifact name="${org.keycloak:keycloak-connections-truststore}"/>
</resources>
<dependencies>
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.jboss.logging"/>
<module name="javax.api"/>
<module name="org.apache.httpcomponents"/>
</dependencies>
</module>

3
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml
View file

@ -11,14 +11,13 @@
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-saml-core"/>
<module name="org.keycloak.keycloak-server-spi"/>
<module name="org.keycloak.keycloak-services"/>
<module name="org.keycloak.keycloak-services" services="import"/>
<module name="org.apache.httpcomponents" />
<module name="org.jboss.logging"/>
<module name="javax.ws.rs.api"/>
<module name="org.jboss.resteasy.resteasy-jaxrs"/>
<module name="org.jboss.resteasy.resteasy-crypto"/>
<module name="org.jboss.resteasy.resteasy-multipart-provider"/>
<module name="org.keycloak.keycloak-connections-http-client" services="import"/>
<module name="javax.api"/>
<module name="javax.xml.soap.api"/>

1
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-spi/main/module.xml
View file

@ -12,6 +12,7 @@
<module name="org.keycloak.keycloak-core"/>
<module name="org.bouncycastle" />
<module name="javax.api"/>
<module name="org.apache.httpcomponents"/>
</dependencies>
</module>

1
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
View file

@ -2,7 +2,6 @@
<deployment>
<dependencies>
<module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
<module name="org.keycloak.keycloak-connections-truststore" services="import"/>
<module name="org.keycloak.keycloak-common" services="import"/>
<module name="org.keycloak.keycloak-core" services="import"/>
<module name="org.keycloak.keycloak-events-email" services="import"/>

2
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
View file

@ -9,9 +9,7 @@
<dependencies>
<module name="org.keycloak.keycloak-broker-oidc" services="import"/>
<module name="org.keycloak.keycloak-broker-saml" services="import"/>
<module name="org.keycloak.keycloak-connections-http-client" services="import"/>
<module name="org.keycloak.keycloak-connections-infinispan" services="import"/>
<module name="org.keycloak.keycloak-connections-truststore" services="import"/>
<module name="org.keycloak.keycloak-common" services="import"/>
<module name="org.keycloak.keycloak-core" services="import"/>
<module name="org.keycloak.keycloak-events-email" services="import"/>

1
model/mongo/pom.xml
View file

@ -30,7 +30,6 @@
<artifactId>keycloak-server-spi</artifactId>
<scope>provided</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>

10
pom.xml
View file

@ -620,21 +620,11 @@
<artifactId>keycloak-connections-infinispan</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-connections-http-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-client-registration-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-connections-truststore</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-common</artifactId>

5
saml/saml-protocol/pom.xml
View file

@ -33,11 +33,6 @@
<artifactId>keycloak-common</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-connections-http-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-services</artifactId>

5
server-spi/pom.xml
View file

@ -39,6 +39,11 @@
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>

0
connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientFactory.java → server-spi/src/main/java/org/keycloak/connections/httpclient/HttpClientFactory.java
View file

0
connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java → server-spi/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java
View file

0
connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientSpi.java → server-spi/src/main/java/org/keycloak/connections/httpclient/HttpClientSpi.java
View file

2
connections/truststore/src/main/java/org/keycloak/connections/truststore/HostnameVerificationPolicy.java → server-spi/src/main/java/org/keycloak/truststore/HostnameVerificationPolicy.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.connections.truststore;
package org.keycloak.truststore;
public enum HostnameVerificationPolicy {

2
connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProvider.java → server-spi/src/main/java/org/keycloak/truststore/TruststoreProvider.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.connections.truststore;
package org.keycloak.truststore;
import org.keycloak.provider.Provider;

2
connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProviderFactory.java → server-spi/src/main/java/org/keycloak/truststore/TruststoreProviderFactory.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.connections.truststore;
package org.keycloak.truststore;
import org.keycloak.provider.ProviderFactory;

2
connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreSpi.java → server-spi/src/main/java/org/keycloak/truststore/TruststoreSpi.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.connections.truststore;
package org.keycloak.truststore;
import org.keycloak.provider.Provider;
import org.keycloak.provider.ProviderFactory;

3
server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
View file

@ -23,4 +23,7 @@ org.keycloak.forms.login.LoginFormsSpi
org.keycloak.email.EmailSenderSpi
org.keycloak.email.EmailTemplateSpi
org.keycloak.theme.ThemeSpi
org.keycloak.truststore.TruststoreSpi
org.keycloak.connections.httpclient.HttpClientSpi

4
services/pom.xml
View file

@ -30,10 +30,6 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-connections-http-client</artifactId>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>

2
connections/http-client/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java → services/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java
View file

@ -10,7 +10,7 @@ import org.apache.http.entity.ContentType;
import org.apache.http.impl.client.CloseableHttpClient;
import org.jboss.logging.Logger;
import org.keycloak.Config;
import org.keycloak.connections.truststore.TruststoreProvider;
import org.keycloak.truststore.TruststoreProvider;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.common.util.EnvUtil;

0
connections/http-client/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java → services/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java
View file

4
services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java Normal file → Executable file
View file

@ -1,8 +1,8 @@
package org.keycloak.email;
import org.jboss.logging.Logger;
import org.keycloak.connections.truststore.HostnameVerificationPolicy;
import org.keycloak.connections.truststore.JSSETruststoreConfigurator;
import org.keycloak.truststore.HostnameVerificationPolicy;
import org.keycloak.truststore.JSSETruststoreConfigurator;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.models.UserModel;

5
connections/truststore/src/main/java/org/keycloak/connections/truststore/FileTruststoreProvider.java → services/src/main/java/org/keycloak/truststore/FileTruststoreProvider.java Normal file → Executable file
View file

@ -1,4 +1,7 @@
package org.keycloak.connections.truststore;
package org.keycloak.truststore;
import org.keycloak.truststore.HostnameVerificationPolicy;
import org.keycloak.truststore.TruststoreProvider;
import java.security.KeyStore;

2
connections/truststore/src/main/java/org/keycloak/connections/truststore/FileTruststoreProviderFactory.java → services/src/main/java/org/keycloak/truststore/FileTruststoreProviderFactory.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.connections.truststore;
package org.keycloak.truststore;
import org.jboss.logging.Logger;
import org.keycloak.Config;

5
connections/truststore/src/main/java/org/keycloak/connections/truststore/JSSETruststoreConfigurator.java → services/src/main/java/org/keycloak/truststore/JSSETruststoreConfigurator.java Normal file → Executable file
View file

@ -1,9 +1,12 @@
package org.keycloak.connections.truststore;
package org.keycloak.truststore;
import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
import org.apache.http.conn.ssl.StrictHostnameVerifier;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.KeycloakSessionFactory;
import org.keycloak.truststore.HostnameVerificationPolicy;
import org.keycloak.truststore.TruststoreProvider;
import org.keycloak.truststore.TruststoreProviderFactory;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;

2
connections/truststore/src/main/java/org/keycloak/connections/truststore/SSLSocketFactory.java → services/src/main/java/org/keycloak/truststore/SSLSocketFactory.java Normal file → Executable file
View file

@ -1,4 +1,4 @@
package org.keycloak.connections.truststore;
package org.keycloak.truststore;
import org.jboss.logging.Logger;

4
connections/truststore/src/main/java/org/keycloak/connections/truststore/TruststoreProviderSingleton.java → services/src/main/java/org/keycloak/truststore/TruststoreProviderSingleton.java Normal file → Executable file
View file

@ -1,4 +1,6 @@
package org.keycloak.connections.truststore;
package org.keycloak.truststore;
import org.keycloak.truststore.TruststoreProvider;
/**
* @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a>

0
connections/http-client/src/main/resources/META-INF/services/org.keycloak.connections.httpclient.HttpClientFactory → services/src/main/resources/META-INF/services/org.keycloak.connections.httpclient.HttpClientFactory
View file

1
services/src/main/resources/META-INF/services/org.keycloak.truststore.TruststoreProviderFactory Executable file
View file

@ -0,0 +1 @@
org.keycloak.truststore.FileTruststoreProviderFactory