Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev-env/keycloak/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/keycloak/keycloak:26.3.2
FROM quay.io/keycloak/keycloak:26.6.4

# Add the Oracle JDBC jars
ARG ORACLE_JDBC_VERSION=23.8.0.25.04
Expand All @@ -12,6 +12,7 @@ ENV KC_HEALTH_ENABLED=true
COPY keycloak-dv-builtin-users-authenticator-1.0-SNAPSHOT.jar /opt/keycloak/providers/

# Copy additional configurations
COPY keycloak.conf /opt/keycloak/conf/
COPY quarkus.properties /opt/keycloak/conf/
COPY test-realm.json /opt/keycloak/data/import/

Expand Down
Binary file not shown.
2 changes: 2 additions & 0 deletions dev-env/keycloak/keycloak.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
db-kind-user-store=postgres
db-kind-user-store-qa=postgres
11 changes: 11 additions & 0 deletions dev-env/keycloak/quarkus.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,14 @@ quarkus.datasource.user-store.jdbc.recovery.password=${DATAVERSE_DB_PASSWORD}
quarkus.datasource.user-store.jdbc.xa-properties.serverName=${DATAVERSE_DB_HOST}
quarkus.datasource.user-store.jdbc.xa-properties.portNumber=${DATAVERSE_DB_PORT}
quarkus.datasource.user-store.jdbc.xa-properties.databaseName=dataverse

quarkus.datasource.user-store-qa.jdbc.url=jdbc:postgresql://${DATAVERSE_DB_HOST}:${DATAVERSE_DB_PORT}/dataverse
quarkus.datasource.user-store-qa.username=${DATAVERSE_DB_USER}
quarkus.datasource.user-store-qa.password=${DATAVERSE_DB_PASSWORD}
quarkus.datasource.user-store-qa.jdbc.driver=org.postgresql.Driver
quarkus.datasource.user-store-qa.jdbc.transactions=disabled
quarkus.datasource.user-store-qa.jdbc.recovery.username=${DATAVERSE_DB_USER}
quarkus.datasource.user-store-qa.jdbc.recovery.password=${DATAVERSE_DB_PASSWORD}
quarkus.datasource.user-store-qa.jdbc.xa-properties.serverName=${DATAVERSE_DB_HOST}
quarkus.datasource.user-store-qa.jdbc.xa-properties.portNumber=${DATAVERSE_DB_PORT}
quarkus.datasource.user-store-qa.jdbc.xa-properties.databaseName=dataverse
8 changes: 8 additions & 0 deletions dev-env/keycloak/setup-spi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ ADMIN_TOKEN=$(curl -s -X POST "http://keycloak:9080/realms/master/protocol/openi
-d "grant_type=password" \
-d "client_id=admin-cli" | jq -r .access_token)

EXISTING_SPI_COUNT=$(curl -s "http://keycloak:9080/admin/realms/test/components" \
-H "Authorization: Bearer $ADMIN_TOKEN" | jq '[.[] | select(.providerId == "dv-builtin-users-authenticator" and .providerType == "org.keycloak.storage.UserStorageProvider")] | length')

if [ "$EXISTING_SPI_COUNT" -gt 0 ]; then
echo "Keycloak SPI already configured in realm."
exit 0
fi

# Create user storage provider using the components endpoint
curl -X POST "http://keycloak:9080/admin/realms/test/components" \
-H "Authorization: Bearer $ADMIN_TOKEN" \
Expand Down
10 changes: 6 additions & 4 deletions dev-env/keycloak/test-realm.json
Original file line number Diff line number Diff line change
Expand Up @@ -842,9 +842,11 @@
"alwaysDisplayInConsole": false,
"clientAuthenticatorType": "client-secret",
"redirectUris": [
"*"
"http://localhost:8000/modern/*"
],
"webOrigins": [
"http://localhost:8000"
],
"webOrigins": [],
"notBefore": 0,
"bearerOnly": false,
"consentRequired": false,
Expand Down Expand Up @@ -2396,7 +2398,7 @@
"clientSessionMaxLifespan": "0",
"frontendUrl": ""
},
"keycloakVersion": "26.3.2",
"keycloakVersion": "26.6.4",
"userManagedAccessAllowed": false,
"organizationsEnabled": false,
"verifiableCredentialsEnabled": false,
Expand All @@ -2407,4 +2409,4 @@
"clientPolicies": {
"policies": []
}
}
}
3 changes: 2 additions & 1 deletion dev-env/shib-dev-env/keycloak/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/keycloak/keycloak:26.3.2
FROM quay.io/keycloak/keycloak:26.6.4

# Add the Oracle JDBC jars
ARG ORACLE_JDBC_VERSION=23.8.0.25.04
Expand All @@ -12,6 +12,7 @@ ENV KC_HEALTH_ENABLED=true
COPY keycloak-dv-builtin-users-authenticator-1.0-SNAPSHOT.jar /opt/keycloak/providers/

# Copy additional configurations
COPY keycloak.conf /opt/keycloak/conf/
COPY quarkus.properties /opt/keycloak/conf/
COPY test-realm.json /opt/keycloak/data/import/

Expand Down
Binary file not shown.
2 changes: 2 additions & 0 deletions dev-env/shib-dev-env/keycloak/keycloak.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
db-kind-user-store=postgres
db-kind-user-store-qa=postgres
11 changes: 11 additions & 0 deletions dev-env/shib-dev-env/keycloak/quarkus.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,14 @@ quarkus.datasource.user-store.jdbc.recovery.password=${DATAVERSE_DB_PASSWORD}
quarkus.datasource.user-store.jdbc.xa-properties.serverName=${DATAVERSE_DB_HOST}
quarkus.datasource.user-store.jdbc.xa-properties.portNumber=${DATAVERSE_DB_PORT}
quarkus.datasource.user-store.jdbc.xa-properties.databaseName=dataverse

quarkus.datasource.user-store-qa.jdbc.url=jdbc:postgresql://${DATAVERSE_DB_HOST}:${DATAVERSE_DB_PORT}/dataverse
quarkus.datasource.user-store-qa.username=${DATAVERSE_DB_USER}
quarkus.datasource.user-store-qa.password=${DATAVERSE_DB_PASSWORD}
quarkus.datasource.user-store-qa.jdbc.driver=org.postgresql.Driver
quarkus.datasource.user-store-qa.jdbc.transactions=disabled
quarkus.datasource.user-store-qa.jdbc.recovery.username=${DATAVERSE_DB_USER}
quarkus.datasource.user-store-qa.jdbc.recovery.password=${DATAVERSE_DB_PASSWORD}
quarkus.datasource.user-store-qa.jdbc.xa-properties.serverName=${DATAVERSE_DB_HOST}
quarkus.datasource.user-store-qa.jdbc.xa-properties.portNumber=${DATAVERSE_DB_PORT}
quarkus.datasource.user-store-qa.jdbc.xa-properties.databaseName=dataverse
8 changes: 8 additions & 0 deletions dev-env/shib-dev-env/keycloak/setup-spi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ ADMIN_TOKEN=$(curl -s -X POST "http://keycloak:9080/realms/master/protocol/openi
-d "grant_type=password" \
-d "client_id=admin-cli" | jq -r .access_token)

EXISTING_SPI_COUNT=$(curl -s "http://keycloak:9080/admin/realms/test/components" \
-H "Authorization: Bearer $ADMIN_TOKEN" | jq '[.[] | select(.providerId == "dv-builtin-users-authenticator" and .providerType == "org.keycloak.storage.UserStorageProvider")] | length')

if [ "$EXISTING_SPI_COUNT" -gt 0 ]; then
echo "Keycloak SPI already configured in realm."
exit 0
fi

# Create user storage provider using the components endpoint
curl -X POST "http://keycloak:9080/admin/realms/test/components" \
-H "Authorization: Bearer $ADMIN_TOKEN" \
Expand Down
2 changes: 1 addition & 1 deletion dev-env/shib-dev-env/keycloak/test-realm.json
Original file line number Diff line number Diff line change
Expand Up @@ -2636,7 +2636,7 @@
"frontendUrl": "https://localhost",
"acr.loa.map": "{}"
},
"keycloakVersion": "26.1.4",
"keycloakVersion": "26.6.4",
"userManagedAccessAllowed": false,
"organizationsEnabled": false,
"verifiableCredentialsEnabled": false,
Expand Down
Loading