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

bump undertow version

Browse source
This commit is contained in:
Bill Burke 2014-06-02 09:37:18 -04:00
parent e39149c954
commit 34d3be244d
3 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
integration/adapter-core/src/main/java/org/keycloak/adapters/RequestAuthenticator.java
View file

@ -32,10 +32,6 @@ public abstract class RequestAuthenticator {
public AuthOutcome authenticate() {
log.info("--> authenticate()");
if (!facade.getRequest().isSecure() && deployment.isSslRequired()) {
log.warn("SSL is required to authenticate");
return AuthOutcome.FAILED;
}
BearerTokenRequestAuthenticator bearer = createBearerTokenAuthenticator();
log.info("try bearer");
AuthOutcome outcome = bearer.authenticate(facade);
@ -44,6 +40,7 @@ public abstract class RequestAuthenticator {
log.info("Bearer FAILED");
return AuthOutcome.FAILED;
} else if (outcome == AuthOutcome.AUTHENTICATED) {
if (verifySSL()) return AuthOutcome.FAILED;
completeAuthentication(bearer);
log.info("Bearer AUTHENTICATED");
return AuthOutcome.AUTHENTICATED;
@ -55,6 +52,7 @@ public abstract class RequestAuthenticator {
log.info("try oauth");
if (isCached()) {
if (verifySSL()) return AuthOutcome.FAILED;
log.info("AUTHENTICATED: was cached");
return AuthOutcome.AUTHENTICATED;
}
@ -70,6 +68,8 @@ public abstract class RequestAuthenticator {
}
if (verifySSL()) return AuthOutcome.FAILED;
completeAuthentication(oauth);
// redirect to strip out access code and state query parameters
@ -81,6 +81,14 @@ public abstract class RequestAuthenticator {
return AuthOutcome.AUTHENTICATED;
}
protected boolean verifySSL() {
if (!facade.getRequest().isSecure() && deployment.isSslRequired()) {
log.warn("SSL is required to authenticate");
return true;
}
return false;
}
protected abstract OAuthRequestAuthenticator createOAuthAuthenticator();
protected BearerTokenRequestAuthenticator createBearerTokenAuthenticator() {

13
model/invalidation-cache/model-adapters/pom.xml
View file

@ -66,19 +66,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-tests</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>

2
pom.xml
View file

@ -18,7 +18,7 @@
<resteasy.version>2.3.7.Final</resteasy.version>
<resteasy.version.eap.6.3>2.3.7.Final</resteasy.version.eap.6.3>
<resteasy.version.latest>3.0.8.Final</resteasy.version.latest>
<undertow.version>1.0.0.Final</undertow.version>
<undertow.version>1.0.15.Final</undertow.version>
<picketlink.version>2.6.0.CR2</picketlink.version>
<picketbox.ldap.version>1.0.2.Final</picketbox.ldap.version>
<mongo.driver.version>2.11.3</mongo.driver.version>