From 8fafb7ff74b2201341ab21b8184211055331e1a2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 7 Jun 2026 11:14:12 +0000 Subject: [PATCH] fix: update versions and fix oidcc-prompt-login URL match pattern Update conformance suite from v5.1.41 to v5.1.43 and Keycloak from 26.6.0 to 26.6.3 as reported in keycloak/keycloak-oauth-sig#1021. Fix the browser automation URL match pattern for the oidcc-prompt-login test by adding a trailing wildcard (*) to the prompt=login match. Without this, the pattern only matches URLs where prompt=login is the last parameter, which can fail if the conformance suite v5.1.43 places it before other parameters in the authorization URL. This is consistent with the existing oidcc-max-age-1 pattern which already uses a trailing wildcard: auth*max_age=* Closes keycloak/keycloak-oauth-sig#1021 --- .github/workflows/run-conformance-tests.yml | 4 ++-- conformance-tests-env/.env | 4 ++-- .../oidc/oidcc-basic-automated.json | 2 +- .../oidc/oidcc-basic-discovery-dynamic-automated.json | 2 +- .../oidc/oidcc-basic-static-static-automated.json | 2 +- .../oidc/oidcc-formpost-basic-automated.json | 2 +- .../oidcc-formpost-basic-discovery-dynamic-automated.json | 2 +- .../oidc/oidcc-formpost-basic-static-static-automated.json | 2 +- .../oidc/oidcc-formpost-hybrid-automated.json | 2 +- .../oidcc-formpost-hybrid-discovery-dynamic-automated.json | 2 +- .../oidc/oidcc-formpost-hybrid-static-static-automated.json | 2 +- .../oidc/oidcc-formpost-implicit-automated.json | 2 +- .../oidcc-formpost-implicit-discovery-dynamic-automated.json | 2 +- .../oidc/oidcc-formpost-implicit-static-static-automated.json | 2 +- .../oidc/oidcc-hybrid-automated.json | 2 +- .../oidc/oidcc-hybrid-discovery-dynamic-automated.json | 2 +- .../oidc/oidcc-hybrid-static-static-automated.json | 2 +- .../oidc/oidcc-implicit-automated.json | 2 +- .../oidc/oidcc-implicit-discovery-dynamic-automated.json | 2 +- .../oidc/oidcc-implicit-static-static-automated.json | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/run-conformance-tests.yml b/.github/workflows/run-conformance-tests.yml index 9b52283f0a..82e678422c 100644 --- a/.github/workflows/run-conformance-tests.yml +++ b/.github/workflows/run-conformance-tests.yml @@ -38,13 +38,13 @@ jobs: exit $EXIT_CODE env: OPENID_GIT_URL: https://gitlab.com/openid/conformance-suite.git - OPENID_GIT_TAG: release-v5.1.41 + OPENID_GIT_TAG: release-v5.1.43 RESOURCE_FQDN: rs.keycloak-fapi.org CONSENT_FQDN: cs.keycloak-fapi.org CONFORMANCE_SUITE_FQDN: conformance-suite.keycloak-fapi.org AUTOMATE_TESTS: true TEST_PLAN: --${{ matrix.profile }}-all-ci - KEYCLOAK_BASE_IMAGE: quay.io/keycloak/keycloak:26.6.0 + KEYCLOAK_BASE_IMAGE: quay.io/keycloak/keycloak:26.6.3 KEYCLOAK_REALM: test KEYCLOAK_USER: admin KEYCLOAK_PASSWORD: admin diff --git a/conformance-tests-env/.env b/conformance-tests-env/.env index 19801b2d95..229bb95812 100644 --- a/conformance-tests-env/.env +++ b/conformance-tests-env/.env @@ -9,7 +9,7 @@ # Conformance-suite OPENID_GIT_URL=https://gitlab.com/openid/conformance-suite.git -OPENID_GIT_TAG=release-v5.1.41 +OPENID_GIT_TAG=release-v5.1.43 # FQDN RESOURCE_FQDN=rs.keycloak-fapi.org @@ -21,7 +21,7 @@ AUTOMATE_TESTS=true TEST_PLAN=--fapi1-advanced-all # Image version -KEYCLOAK_BASE_IMAGE=quay.io/keycloak/keycloak:26.6.0 +KEYCLOAK_BASE_IMAGE=quay.io/keycloak/keycloak:26.6.3 # Realm KEYCLOAK_REALM=test diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-automated.json index db0d3d2c48..8d151fa71b 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-automated.json @@ -81,7 +81,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-discovery-dynamic-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-discovery-dynamic-automated.json index 69ca5621c3..9057fa13fa 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-discovery-dynamic-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-discovery-dynamic-automated.json @@ -69,7 +69,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-static-static-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-static-static-automated.json index eca8b48da5..fc09a9a3fb 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-static-static-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-basic-static-static-automated.json @@ -86,7 +86,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-automated.json index 1ebdd1aa71..bb49f95181 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-automated.json @@ -81,7 +81,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-discovery-dynamic-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-discovery-dynamic-automated.json index 102b22bd5e..9c7986bee6 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-discovery-dynamic-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-discovery-dynamic-automated.json @@ -69,7 +69,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-static-static-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-static-static-automated.json index 72cf4ac398..f7867dc7f2 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-static-static-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-basic-static-static-automated.json @@ -86,7 +86,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-automated.json index e6f3f6241c..f331d4d42a 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-automated.json @@ -81,7 +81,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-discovery-dynamic-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-discovery-dynamic-automated.json index 1c8ee4d630..094fb6a4bd 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-discovery-dynamic-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-discovery-dynamic-automated.json @@ -69,7 +69,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-static-static-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-static-static-automated.json index d5434f0691..c77a3cf547 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-static-static-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-hybrid-static-static-automated.json @@ -86,7 +86,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-automated.json index a9c3206c38..4a2bd9806a 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-automated.json @@ -73,7 +73,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-discovery-dynamic-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-discovery-dynamic-automated.json index a48d17277e..d751a68c01 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-discovery-dynamic-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-discovery-dynamic-automated.json @@ -69,7 +69,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-static-static-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-static-static-automated.json index 5aac067bb1..4e079c1fcc 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-static-static-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-formpost-implicit-static-static-automated.json @@ -78,7 +78,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-automated.json index 5a3dc79e50..59c5cbed1c 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-automated.json @@ -81,7 +81,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-discovery-dynamic-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-discovery-dynamic-automated.json index 7fbbf424d6..b256d61dfd 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-discovery-dynamic-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-discovery-dynamic-automated.json @@ -69,7 +69,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-static-static-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-static-static-automated.json index 7c64b0cf3d..91b3123679 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-static-static-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-hybrid-static-static-automated.json @@ -86,7 +86,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-automated.json index 86cec85e60..5aae8d5841 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-automated.json @@ -73,7 +73,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-discovery-dynamic-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-discovery-dynamic-automated.json index 46c12d39d2..a22832830e 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-discovery-dynamic-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-discovery-dynamic-automated.json @@ -69,7 +69,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [ diff --git a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-static-static-automated.json b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-static-static-automated.json index 7723694653..ae2ed31320 100644 --- a/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-static-static-automated.json +++ b/conformance-tests-env/conformance-suite/fapi-conformance-suite-configs/oidc/oidcc-implicit-static-static-automated.json @@ -78,7 +78,7 @@ "tasks": [ { "task": "Prompted Login", - "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login", + "match": "https://as.keycloak-fapi.org/auth/realms/test/protocol/openid-connect/auth*prompt=login*", "optional": true, "commands": [ [