Skip to content

Commit a51bba9

Browse files
author
Rob Tjalma
authored
Merge pull request #38 from com-pas/update_keycloak
Added client for new SCL Auto Alignment component.
2 parents ca2dd32 + b93d9dc commit a51bba9

File tree

3 files changed

+101
-33
lines changed

3 files changed

+101
-33
lines changed

‎compas/docker-compose-basex.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ services:
5454
deploy:
5555
restart_policy:
5656
condition: on-failure
57-
delay: 5s
5857
max_attempts: 3
59-
window: 30s
6058
healthcheck:
6159
test: ["CMD", "curl", "-f", "http://localhost:8080/compas-scl-data-service/q/health/ready"]
6260
interval: 15s
@@ -79,9 +77,7 @@ services:
7977
deploy:
8078
restart_policy:
8179
condition: on-failure
82-
delay: 5s
8380
max_attempts: 3
84-
window: 30s
8581
healthcheck:
8682
test: ["CMD", "curl", "-f", "http://localhost:8080/compas-cim-mapping/q/health/ready"]
8783
interval: 15s

‎compas/docker-compose-postgresql.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ services:
6161
deploy:
6262
restart_policy:
6363
condition: on-failure
64-
delay: 5s
6564
max_attempts: 3
66-
window: 30s
6765
healthcheck:
6866
test: ["CMD", "curl", "-f", "http://localhost:8080/compas-scl-data-service/q/health/ready"]
6967
interval: 15s
@@ -86,9 +84,7 @@ services:
8684
deploy:
8785
restart_policy:
8886
condition: on-failure
89-
delay: 5s
9087
max_attempts: 3
91-
window: 30s
9288
healthcheck:
9389
test: ["CMD", "curl", "-f", "http://localhost:8080/compas-cim-mapping/q/health/ready"]
9490
interval: 15s

‎compas/keycloak/keycloak_compas_realm.json‎

Lines changed: 101 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,14 @@
269269
"attributes" : { }
270270
} ],
271271
"security-admin-console" : [ ],
272+
"scl-auto-alignment" : [ {
273+
"id" : "6aa8a493-0d4b-4f7f-928a-29540b774ef9",
274+
"name" : "USER",
275+
"composite" : false,
276+
"clientRole" : true,
277+
"containerId" : "f488ae1f-4c15-4d55-b835-650ecec1d978",
278+
"attributes" : { }
279+
} ],
272280
"scl-data-service" : [ {
273281
"id" : "a9445ca5-bc71-4972-81d7-e6ebf6b72719",
274282
"name" : "IID_DELETE",
@@ -693,6 +701,7 @@
693701
"requiredActions" : [ ],
694702
"realmRoles" : [ "default-roles-compas" ],
695703
"clientRoles" : {
704+
"scl-auto-alignment" : [ "USER" ],
696705
"scl-data-service" : [ "SCD_READ" ],
697706
"cim-mapping" : [ "USER" ],
698707
"openscd" : [ "USER" ]
@@ -720,6 +729,7 @@
720729
"realmRoles" : [ "default-roles-compas" ],
721730
"clientRoles" : {
722731
"scl-data-service" : [ "IID_DELETE", "SED_UPDATE", "CID_DELETE", "ISD_READ", "ICD_DELETE", "SSD_DELETE", "SSD_UPDATE", "SCD_DELETE", "ICD_READ", "SED_DELETE", "ICD_UPDATE", "SCD_CREATE", "SSD_READ", "CID_UPDATE", "SCD_READ", "SED_CREATE", "ISD_DELETE", "ISD_UPDATE", "IID_READ", "ISD_CREATE", "CID_READ", "IID_CREATE", "SED_READ", "IID_UPDATE", "CID_CREATE", "SCD_UPDATE", "ICD_CREATE", "SSD_CREATE" ],
732+
"scl-auto-alignment" : [ "USER" ],
723733
"cim-mapping" : [ "USER" ],
724734
"openscd" : [ "USER" ]
725735
},
@@ -746,6 +756,7 @@
746756
"realmRoles" : [ "default-roles-compas" ],
747757
"clientRoles" : {
748758
"scl-data-service" : [ "ICD_READ", "IID_READ", "ISD_READ", "CID_READ", "SSD_READ", "SCD_READ", "SED_READ" ],
759+
"scl-auto-alignment" : [ "USER" ],
749760
"cim-mapping" : [ "USER" ],
750761
"openscd" : [ "USER" ]
751762
},
@@ -1053,6 +1064,71 @@
10531064
"nodeReRegistrationTimeout" : 0,
10541065
"defaultClientScopes" : [ "web-origins", "roles", "profile", "email" ],
10551066
"optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
1067+
}, {
1068+
"id" : "f488ae1f-4c15-4d55-b835-650ecec1d978",
1069+
"clientId" : "scl-auto-alignment",
1070+
"name" : "SCL Auto Alignment Service",
1071+
"description" : "The SCL Auto Alignment Service for calculating XY Coordinates",
1072+
"rootUrl" : "http://##COMPAS_HOSTNAME##/",
1073+
"adminUrl" : "http://##COMPAS_HOSTNAME##/",
1074+
"surrogateAuthRequired" : false,
1075+
"enabled" : true,
1076+
"alwaysDisplayInConsole" : false,
1077+
"clientAuthenticatorType" : "client-secret",
1078+
"redirectUris" : [ "http://##COMPAS_HOSTNAME##/*" ],
1079+
"webOrigins" : [ "http://##COMPAS_HOSTNAME##" ],
1080+
"notBefore" : 0,
1081+
"bearerOnly" : false,
1082+
"consentRequired" : false,
1083+
"standardFlowEnabled" : true,
1084+
"implicitFlowEnabled" : false,
1085+
"directAccessGrantsEnabled" : true,
1086+
"serviceAccountsEnabled" : false,
1087+
"publicClient" : true,
1088+
"frontchannelLogout" : false,
1089+
"protocol" : "openid-connect",
1090+
"attributes" : {
1091+
"id.token.as.detached.signature" : "false",
1092+
"saml.assertion.signature" : "false",
1093+
"saml.force.post.binding" : "false",
1094+
"saml.multivalued.roles" : "false",
1095+
"saml.encrypt" : "false",
1096+
"oauth2.device.authorization.grant.enabled" : "false",
1097+
"backchannel.logout.revoke.offline.tokens" : "false",
1098+
"saml.server.signature" : "false",
1099+
"saml.server.signature.keyinfo.ext" : "false",
1100+
"use.refresh.tokens" : "true",
1101+
"exclude.session.state.from.auth.response" : "false",
1102+
"oidc.ciba.grant.enabled" : "false",
1103+
"saml.artifact.binding" : "false",
1104+
"backchannel.logout.session.required" : "true",
1105+
"client_credentials.use_refresh_token" : "false",
1106+
"saml_force_name_id_format" : "false",
1107+
"require.pushed.authorization.requests" : "false",
1108+
"saml.client.signature" : "false",
1109+
"tls.client.certificate.bound.access.tokens" : "false",
1110+
"saml.authnstatement" : "false",
1111+
"display.on.consent.screen" : "false",
1112+
"saml.onetimeuse.condition" : "false"
1113+
},
1114+
"authenticationFlowBindingOverrides" : { },
1115+
"fullScopeAllowed" : true,
1116+
"nodeReRegistrationTimeout" : -1,
1117+
"protocolMappers" : [ {
1118+
"id" : "cb0fbdf9-e2ac-4a78-ba90-0418c879a75b",
1119+
"name" : "scl-auto-alignment",
1120+
"protocol" : "openid-connect",
1121+
"protocolMapper" : "oidc-audience-mapper",
1122+
"consentRequired" : false,
1123+
"config" : {
1124+
"included.client.audience" : "scl-auto-alignment",
1125+
"id.token.claim" : "false",
1126+
"access.token.claim" : "true",
1127+
"userinfo.token.claim" : "false"
1128+
}
1129+
} ],
1130+
"defaultClientScopes" : [ "web-origins", "roles", "profile", "email" ],
1131+
"optionalClientScopes" : [ "address", "phone", "offline_access", "microprofile-jwt" ]
10561132
}, {
10571133
"id" : "12ab3cb2-73f3-4855-bed8-9ab2af75f595",
10581134
"clientId" : "scl-data-service",
@@ -1633,7 +1709,7 @@
16331709
"subType" : "authenticated",
16341710
"subComponents" : { },
16351711
"config" : {
1636-
"allowed-protocol-mapper-types" : [ "saml-role-list-mapper", "oidc-full-name-mapper", "oidc-usermodel-attribute-mapper", "oidc-usermodel-property-mapper", "saml-user-attribute-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-address-mapper", "saml-user-property-mapper" ]
1712+
"allowed-protocol-mapper-types" : [ "saml-user-attribute-mapper", "oidc-full-name-mapper", "oidc-address-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-usermodel-attribute-mapper", "oidc-usermodel-property-mapper", "saml-role-list-mapper", "saml-user-property-mapper" ]
16371713
}
16381714
}, {
16391715
"id" : "1df6c9e4-319c-43c1-a0f8-e97a9741cd36",
@@ -1642,7 +1718,7 @@
16421718
"subType" : "anonymous",
16431719
"subComponents" : { },
16441720
"config" : {
1645-
"allowed-protocol-mapper-types" : [ "oidc-usermodel-property-mapper", "saml-role-list-mapper", "oidc-usermodel-attribute-mapper", "saml-user-property-mapper", "oidc-address-mapper", "oidc-full-name-mapper", "oidc-sha256-pairwise-sub-mapper", "saml-user-attribute-mapper" ]
1721+
"allowed-protocol-mapper-types" : [ "saml-role-list-mapper", "oidc-full-name-mapper", "saml-user-attribute-mapper", "oidc-usermodel-attribute-mapper", "saml-user-property-mapper", "oidc-address-mapper", "oidc-sha256-pairwise-sub-mapper", "oidc-usermodel-property-mapper" ]
16461722
}
16471723
}, {
16481724
"id" : "276e7a01-2481-494c-a009-81965ed751a3",
@@ -1738,7 +1814,7 @@
17381814
"internationalizationEnabled" : false,
17391815
"supportedLocales" : [ ],
17401816
"authenticationFlows" : [ {
1741-
"id" : "47735bac-4f25-4640-95cc-7768e936100f",
1817+
"id" : "7a8a0416-499b-4461-8ede-d91747d2a0a0",
17421818
"alias" : "Account verification options",
17431819
"description" : "Method with which to verity the existing account",
17441820
"providerId" : "basic-flow",
@@ -1760,7 +1836,7 @@
17601836
"autheticatorFlow" : true
17611837
} ]
17621838
}, {
1763-
"id" : "3474fd7f-5fdb-41d9-81e0-370d5864483b",
1839+
"id" : "981fc24a-2689-48d2-85b8-66bae7772fc2",
17641840
"alias" : "Authentication Options",
17651841
"description" : "Authentication options.",
17661842
"providerId" : "basic-flow",
@@ -1789,7 +1865,7 @@
17891865
"autheticatorFlow" : false
17901866
} ]
17911867
}, {
1792-
"id" : "93be177f-4477-4edb-ade0-1026a6c57a6d",
1868+
"id" : "cb13b985-8b73-4a28-99e1-78730bfa44d8",
17931869
"alias" : "Browser - Conditional OTP",
17941870
"description" : "Flow to determine if the OTP is required for the authentication",
17951871
"providerId" : "basic-flow",
@@ -1811,7 +1887,7 @@
18111887
"autheticatorFlow" : false
18121888
} ]
18131889
}, {
1814-
"id" : "b2313c20-b215-47e5-952d-4e10a83b25fd",
1890+
"id" : "64168036-a8e8-48c1-aa88-dec32dced521",
18151891
"alias" : "Direct Grant - Conditional OTP",
18161892
"description" : "Flow to determine if the OTP is required for the authentication",
18171893
"providerId" : "basic-flow",
@@ -1833,7 +1909,7 @@
18331909
"autheticatorFlow" : false
18341910
} ]
18351911
}, {
1836-
"id" : "55afb317-43e1-4a0e-8461-a16c328dca8c",
1912+
"id" : "460c0336-faad-444b-8174-5b7e3dc77aa7",
18371913
"alias" : "First broker login - Conditional OTP",
18381914
"description" : "Flow to determine if the OTP is required for the authentication",
18391915
"providerId" : "basic-flow",
@@ -1855,7 +1931,7 @@
18551931
"autheticatorFlow" : false
18561932
} ]
18571933
}, {
1858-
"id" : "145db225-ffaf-4bd6-8360-2a495520bd84",
1934+
"id" : "716a7846-ccaf-4d0f-9532-833c3ea54cb6",
18591935
"alias" : "Handle Existing Account",
18601936
"description" : "Handle what to do if there is existing account with same email/username like authenticated identity provider",
18611937
"providerId" : "basic-flow",
@@ -1877,7 +1953,7 @@
18771953
"autheticatorFlow" : true
18781954
} ]
18791955
}, {
1880-
"id" : "ba40de9e-306c-485a-8687-5c86abf79fa2",
1956+
"id" : "d79a8017-b719-495d-816c-19ba6aa96f08",
18811957
"alias" : "Reset - Conditional OTP",
18821958
"description" : "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
18831959
"providerId" : "basic-flow",
@@ -1899,7 +1975,7 @@
18991975
"autheticatorFlow" : false
19001976
} ]
19011977
}, {
1902-
"id" : "80d844c8-429e-49ea-8e08-4960bde67568",
1978+
"id" : "6eeb2628-0a4d-49e7-ba89-b2fd5ffe15ec",
19031979
"alias" : "User creation or linking",
19041980
"description" : "Flow for the existing/non-existing user alternatives",
19051981
"providerId" : "basic-flow",
@@ -1922,7 +1998,7 @@
19221998
"autheticatorFlow" : true
19231999
} ]
19242000
}, {
1925-
"id" : "a97f2d07-45a7-4445-b869-20795baf4dcb",
2001+
"id" : "78cb2449-f61b-4374-a3c1-d7883b915304",
19262002
"alias" : "Verify Existing Account by Re-authentication",
19272003
"description" : "Reauthentication of existing account",
19282004
"providerId" : "basic-flow",
@@ -1944,7 +2020,7 @@
19442020
"autheticatorFlow" : true
19452021
} ]
19462022
}, {
1947-
"id" : "e8f6310f-8871-4161-9470-7eab44101e64",
2023+
"id" : "11460871-42f7-408d-96da-fba86352e5c8",
19482024
"alias" : "browser",
19492025
"description" : "browser based authentication",
19502026
"providerId" : "basic-flow",
@@ -1980,7 +2056,7 @@
19802056
"autheticatorFlow" : true
19812057
} ]
19822058
}, {
1983-
"id" : "3a8bdb67-f2fc-472e-b5c1-2eb41f053dd0",
2059+
"id" : "36cb3fe2-9543-4ed2-9f5a-fb13dfe4128d",
19842060
"alias" : "clients",
19852061
"description" : "Base authentication for clients",
19862062
"providerId" : "client-flow",
@@ -2016,7 +2092,7 @@
20162092
"autheticatorFlow" : false
20172093
} ]
20182094
}, {
2019-
"id" : "779ef763-3b57-465d-94de-559b65ccf58f",
2095+
"id" : "2dc631f6-2536-4026-aeac-5485acf1cd1d",
20202096
"alias" : "direct grant",
20212097
"description" : "OpenID Connect Resource Owner Grant",
20222098
"providerId" : "basic-flow",
@@ -2045,7 +2121,7 @@
20452121
"autheticatorFlow" : true
20462122
} ]
20472123
}, {
2048-
"id" : "f45d8704-6179-491b-b70a-6e234fa3f532",
2124+
"id" : "3dfc2ea7-f7f7-4b04-adb2-079066a45ac8",
20492125
"alias" : "docker auth",
20502126
"description" : "Used by Docker clients to authenticate against the IDP",
20512127
"providerId" : "basic-flow",
@@ -2060,7 +2136,7 @@
20602136
"autheticatorFlow" : false
20612137
} ]
20622138
}, {
2063-
"id" : "4c97b8eb-50bc-4be9-a3cd-7164502e4d25",
2139+
"id" : "1ebdc3c5-096b-4a48-b2f2-dce9facfa8cd",
20642140
"alias" : "first broker login",
20652141
"description" : "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
20662142
"providerId" : "basic-flow",
@@ -2083,7 +2159,7 @@
20832159
"autheticatorFlow" : true
20842160
} ]
20852161
}, {
2086-
"id" : "1206b0d1-0126-47af-8574-88b6a182460c",
2162+
"id" : "c35d97ad-92c8-4992-93f6-725db436f10a",
20872163
"alias" : "forms",
20882164
"description" : "Username, password, otp and other auth forms.",
20892165
"providerId" : "basic-flow",
@@ -2105,7 +2181,7 @@
21052181
"autheticatorFlow" : true
21062182
} ]
21072183
}, {
2108-
"id" : "654f2651-edde-400e-a1f5-b86392802919",
2184+
"id" : "c7ed2543-a6d1-41d2-ac11-58f4b1b805b5",
21092185
"alias" : "http challenge",
21102186
"description" : "An authentication flow based on challenge-response HTTP Authentication Schemes",
21112187
"providerId" : "basic-flow",
@@ -2127,7 +2203,7 @@
21272203
"autheticatorFlow" : true
21282204
} ]
21292205
}, {
2130-
"id" : "ce53a107-0e6c-4b2a-b27d-6bc0ffbce21b",
2206+
"id" : "93735a5a-e42e-48d9-b373-b3016f676eb3",
21312207
"alias" : "registration",
21322208
"description" : "registration flow",
21332209
"providerId" : "basic-flow",
@@ -2143,7 +2219,7 @@
21432219
"autheticatorFlow" : true
21442220
} ]
21452221
}, {
2146-
"id" : "6af6a8b4-d186-4363-aa9d-7f093815cce3",
2222+
"id" : "c27bd9e8-ea55-4753-8443-80a6280cbce6",
21472223
"alias" : "registration form",
21482224
"description" : "registration form",
21492225
"providerId" : "form-flow",
@@ -2179,7 +2255,7 @@
21792255
"autheticatorFlow" : false
21802256
} ]
21812257
}, {
2182-
"id" : "15f7d277-f0b3-48b9-a64b-48ae16663d87",
2258+
"id" : "b689031f-9bb4-4fb4-aae6-02aaa27d71e0",
21832259
"alias" : "reset credentials",
21842260
"description" : "Reset credentials for a user if they forgot their password or something",
21852261
"providerId" : "basic-flow",
@@ -2215,7 +2291,7 @@
22152291
"autheticatorFlow" : true
22162292
} ]
22172293
}, {
2218-
"id" : "fc0b0fee-985e-4885-a0ff-d7eb4d48a4cd",
2294+
"id" : "85a94e50-e406-4bc7-9acd-519139f956bf",
22192295
"alias" : "saml ecp",
22202296
"description" : "SAML ECP Profile Authentication Flow",
22212297
"providerId" : "basic-flow",
@@ -2231,13 +2307,13 @@
22312307
} ]
22322308
} ],
22332309
"authenticatorConfig" : [ {
2234-
"id" : "a123d762-dbe5-408a-b2bd-09695596c0cc",
2310+
"id" : "42439c1e-54fc-4b11-a94f-607cb9025267",
22352311
"alias" : "create unique user config",
22362312
"config" : {
22372313
"require.password.update.after.registration" : "false"
22382314
}
22392315
}, {
2240-
"id" : "717f4403-9133-441c-89c1-42d044a5b29a",
2316+
"id" : "439ae195-c51d-4b0b-af66-f3464ad43e2f",
22412317
"alias" : "review profile config",
22422318
"config" : {
22432319
"update.profile.on.first.login" : "missing"
@@ -2319,7 +2395,7 @@
23192395
"clientOfflineSessionIdleTimeout" : "0",
23202396
"cibaInterval" : "5"
23212397
},
2322-
"keycloakVersion" : "15.0.0",
2398+
"keycloakVersion" : "15.0.2",
23232399
"userManagedAccessAllowed" : false,
23242400
"clientProfiles" : {
23252401
"profiles" : [ ]

0 commit comments

Comments
 (0)