Skip to content
Merged
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
2 changes: 0 additions & 2 deletions container/keycloak/initdb.d/00_config.env

This file was deleted.

8 changes: 0 additions & 8 deletions container/keycloak/initdb.d/01_login.sh

This file was deleted.

15 changes: 0 additions & 15 deletions container/keycloak/initdb.d/02_realm.sh

This file was deleted.

13 changes: 0 additions & 13 deletions container/keycloak/initdb.d/03_client.sh

This file was deleted.

49 changes: 49 additions & 0 deletions container/keycloak/initdb.d/03_customize.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/bin/bash

# Located in root of container
. /kc-lib.sh

echo "----------------"
echo "| Create Roles |"
echo "----------------"
KC_ROLE_NAME=group1Leaders
create_role
KC_ROLE_NAME=group2Leaders
create_role
KC_ROLE_NAME=group3Leaders
create_role
KC_ROLE_NAME=testlead
create_role
KC_ROLE_NAME=${KC_RESOURCE}-reviewer
create_role

echo "----------------"
echo "| Create Users |"
echo "----------------"
KC_PASSWORD=password

KC_USERNAME=user1
KC_FIRSTNAME=James
KC_LASTNAME=Johnson
KC_EMAIL=user1@example.com
create_user
KC_ROLE_NAME=${KC_RESOURCE}-user
assign_role

KC_USERNAME=user2
KC_FIRSTNAME=Robert
KC_LASTNAME=Williams
KC_EMAIL=user2@example.com
create_user
KC_ROLE_NAME=${KC_RESOURCE}-user
assign_role

KC_USERNAME=user3
KC_FIRSTNAME=Michael
KC_LASTNAME=Miller
KC_EMAIL=user3@example.com
create_user
KC_ROLE_NAME=${KC_RESOURCE}-user
assign_role
KC_ROLE_NAME=testlead
assign_role
81 changes: 0 additions & 81 deletions container/keycloak/initdb.d/04_accounts.sh

This file was deleted.

7 changes: 5 additions & 2 deletions deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- ./container/oracle/initdb.d:/container-entrypoint-initdb.d

keycloak:
image: jeffersonlab/keycloak:2.2.0
image: jeffersonlab/keycloak:2.6.0
hostname: keycloak
container_name: keycloak
ports:
Expand All @@ -25,8 +25,11 @@ services:
KC_HTTP_RELATIVE_PATH: '/auth'
KC_BOOTSTRAP_ADMIN_USERNAME: 'admin'
KC_BOOTSTRAP_ADMIN_PASSWORD: 'admin'
KC_CLIENT_NAME: dtm
KC_RESOURCE: dtm
KC_REDIRECT_URIS: '["https://localhost:8443/dtm/*"]'
volumes:
- ./container/keycloak/initdb.d:/container-entrypoint-initdb.d
- ./container/keycloak/initdb.d/03_customize.sh:/container-entrypoint-initdb.d/03_customize.sh

puppet:
image: slominskir/puppet-show:2.1.1
Expand Down
5 changes: 4 additions & 1 deletion src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,15 @@
<url-pattern>/reports/activity-audit/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>dtm-reviewer</role-name>
<role-name>dtm-admin</role-name>
</auth-constraint>
</security-constraint>
<login-config>
<auth-method>OIDC</auth-method>
</login-config>
<security-role>
<role-name>dtm-admin</role-name>
</security-role>
<security-role>
<role-name>dtm-reviewer</role-name>
</security-role>
Expand Down
Loading