From 8bd69919761c208aa5c9b5bffeca91c8d4085077 Mon Sep 17 00:00:00 2001 From: Steve Riesenberg <5248162+sjohnr@users.noreply.github.com> Date: Mon, 25 Mar 2024 14:51:53 -0500 Subject: [PATCH 1/2] Update nohttp allow list Issue gh-14609 --- etc/nohttp/allowlist.lines | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/nohttp/allowlist.lines b/etc/nohttp/allowlist.lines index 330ed0f5ce..073132e28d 100644 --- a/etc/nohttp/allowlist.lines +++ b/etc/nohttp/allowlist.lines @@ -12,3 +12,5 @@ ^http://openoffice.org/.* ^http://www.w3.org/2003/g/data-view ^http://schemas.openid.net/event/backchannel-logout +^http://host.docker.internal:8090/back-channel/logout +^http://host.docker.internal:8090/logout From 614123e6f92f99e63a7133de95cd7d1090fd0cca Mon Sep 17 00:00:00 2001 From: Steve Riesenberg <5248162+sjohnr@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:49:21 -0500 Subject: [PATCH 2/2] Update tests that fail on Windows Issue gh-14609 --- .../configurers/oauth2/client/OidcLogoutConfigurerTests.java | 2 +- .../security/config/web/server/OidcLogoutSpecTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcLogoutConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcLogoutConfigurerTests.java index 9512ed592a..934c8bede9 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcLogoutConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OidcLogoutConfigurerTests.java @@ -212,7 +212,7 @@ public class OidcLogoutConfigurerTests { .param("logout_token", logoutToken)) .andExpect(status().isBadRequest()) .andExpect(content().string(containsString("partial_logout"))) - .andExpect(content().string(containsString("Connection refused"))); + .andExpect(content().string(containsString("not all sessions were terminated"))); this.mvc.perform(get("/token/logout").session(one)).andExpect(status().isOk()); } diff --git a/config/src/test/java/org/springframework/security/config/web/server/OidcLogoutSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OidcLogoutSpecTests.java index 03557c8c48..9f5627db79 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OidcLogoutSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OidcLogoutSpecTests.java @@ -264,7 +264,7 @@ public class OidcLogoutSpecTests { .isBadRequest() .expectBody(String.class) .value(containsString("partial_logout")) - .value(containsString("Connection refused")); + .value(containsString("not all sessions were terminated")); this.test.get().uri("/token/logout").cookie("SESSION", one).exchange().expectStatus().isOk(); }