Skip to content
This repository has been archived by the owner on May 7, 2020. It is now read-only.

Commit

Permalink
Merge pull request #135 from hkeeler/keycloak-3.2.1-oidc-2.3.1
Browse files Browse the repository at this point in the history
WIP: Upgrade to Keycloak 3.2.1 & mod_auth_openidc 2.3.1
  • Loading branch information
awolfe76 authored Aug 3, 2017
2 parents 0f34413 + 716192e commit 8f47cf6
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 11 deletions.
6 changes: 3 additions & 3 deletions auth-proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM centos:7

ENV OIDC_VER 2.2.0
ENV OIDC_VER 2.3.1
ENV OIDC_PATCH 1
ENV OIDC_PKG mod_auth_openidc-${OIDC_VER}-${OIDC_PATCH}.el7.centos.x86_64.rpm

# Cisco's cjose lib is _usually_ on the same release as mod_auth_openidc
ENV CJOSE_OIDC_VER 2.2.0
ENV CJOSE_PKG cjose-0.4.1-1.el7.centos.x86_64.rpm
ENV CJOSE_OIDC_VER 2.3.0
ENV CJOSE_PKG cjose-0.5.1-1.el7.centos.x86_64.rpm

ENV DL_SITE https://github.com/pingidentity/mod_auth_openidc/releases/download/

Expand Down
7 changes: 4 additions & 3 deletions keycloak/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM jboss/keycloak-postgres:3.1.0.Final
FROM jboss/keycloak-postgres:3.2.1.Final

ENV MAVEN_VER=3.3.9
ENV MAVEN_VER=3.5.0
ENV MAVEN_DIST=apache-maven-$MAVEN_VER
ENV MAVEN_FILE=$MAVEN_DIST-bin.tar.gz
ENV PATH=$PATH:/tmp/$MAVEN_DIST/bin
ENV KC_SPI_SRC=providers
ENV KC_SPI_DEST=/usr/src/keycloak
ENV KC_LIB_VER=3.1.0.Final
ENV KC_LIB_VER=3.2.1.Final

# Install Maven (YUM version is too old)
RUN curl -s -o /tmp/${MAVEN_FILE} http://www-us.apache.org/dist/maven/maven-3/${MAVEN_VER}/binaries/${MAVEN_FILE} && \
Expand Down Expand Up @@ -41,6 +41,7 @@ USER jboss
RUN echo 'Keycloak SPI build starting...' && \
cd ${KC_SPI_DEST}/${KC_SPI_SRC}/authenticator/hmda && \
mvn --quiet clean install && \
mkdir /opt/jboss/keycloak/providers && \
cp target/keycloak-authenticator-hmda-${KC_LIB_VER}.jar /opt/jboss/keycloak/providers && \
echo 'Keycloak SPIs build successful!'

Expand Down
2 changes: 1 addition & 1 deletion keycloak/providers/authenticator/hmda/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>3.1.0.Final</version>
<version>3.2.1.Final</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
7 changes: 6 additions & 1 deletion keycloak/standalone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,16 @@
<eviction max-entries="10000" strategy="LRU"/>
</local-cache>
<local-cache name="sessions"/>
<local-cache name="authenticationSessions"/>
<local-cache name="offlineSessions"/>
<local-cache name="loginFailures"/>
<local-cache name="work"/>
<local-cache name="authorization">
<eviction max-entries="100" strategy="LRU"/>
<eviction max-entries="10000" strategy="LRU"/>
</local-cache>
<local-cache name="actionTokens">
<eviction max-entries="-1" strategy="NONE"/>
<expiration max-idle="-1" interval="300000"/>
</local-cache>
<local-cache name="keys">
<eviction max-entries="1000" strategy="LRU"/>
Expand Down
4 changes: 2 additions & 2 deletions keycloak/themes/hmda/login/register.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ function getInstitutions(domain) {
},
data: { domain: domain }
})
.success(function(response) {
buildList(response.institutions);
.done(function(data, status, xhr) {
buildList(data.institutions);
})
.fail(function(request, status, error) {
$('#institutions').html('<span class="hmda-error-message">Sorry, something went wrong. Please contact <a href="mailto:${properties.supportEmailTo!}?subject=${properties.supportEmailSubject!}">${properties.supportEmailTo!}</a> for help getting registered <strong>or</strong> try again in a few minutes.</span>');
Expand Down
1 change: 1 addition & 0 deletions keycloak/themes/hmda/login/resources/css/hmda.css
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ body {
}

.usa-alert-error,
.usa-alert-info,
.usa-alert-warning {
background-image: none;
}
Expand Down
Binary file removed keycloak/themes/hmda/login/resources/img/select2.png
Binary file not shown.
2 changes: 1 addition & 1 deletion keycloak/themes/hmda/login/theme.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parent=keycloak
scripts=lib/jquery/jquery-1.10.2.js lib/select2-3.4.1/select2.min.js
scripts=node_modules/jquery/dist/jquery.min.js
styles=css/uswds.min.css css/hmda.css

# WARNING: These placeholders are overridden on container startup. Do not commit overridden values.
Expand Down

0 comments on commit 8f47cf6

Please sign in to comment.