From 6d387bb796338c9e8908fe9d84646244abc33f25 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 11 Feb 2022 06:50:33 +0000 Subject: [PATCH 01/12] renovatebot(deps): update dependency jakarta.xml.bind:jakarta.xml.bind-api to v2.3.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3897a78..fca9a53 100644 --- a/build.gradle +++ b/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation 'net.sf.ehcache:ehcache:2.10.9.2' implementation 'org.codehaus.woodstox:woodstox-core-asl:4.4.1' implementation 'org.apache.commons:commons-lang3:3.12.0' - implementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.2" + implementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" implementation "org.glassfish.jaxb:jaxb-runtime:2.3.2" } From cef5784b25d933cc46bf9320b28a503cdaf37364 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 11:00:52 +0400 Subject: [PATCH 02/12] renovatebot(deps): update dependency org.gretty:gretty to v3.0.7 (#4) Co-authored-by: Renovate Bot Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3897a78..ceb8d31 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { } dependencies { - classpath "org.gretty:gretty:3.0.6" + classpath "org.gretty:gretty:3.0.7" } } From 085c6f4695afbdec2c1a0a5fd6f0ce4859d6f250 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 11 Feb 2022 07:01:29 +0000 Subject: [PATCH 03/12] renovatebot(deps): update dependency joda-time:joda-time to v2.10.13 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index faa4904..c40c8c3 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ dependencies { implementation "org.springframework.security:spring-security-config:${project.springSecurityVersion}" implementation 'log4j:log4j:1.2.17' - implementation 'joda-time:joda-time:2.7' + implementation 'joda-time:joda-time:2.10.13' implementation 'org.jasypt:jasypt:1.9.3' implementation 'net.sf.ehcache:ehcache:2.10.9.2' implementation 'org.codehaus.woodstox:woodstox-core-asl:4.4.1' From 4c4737e137b5855a85a77e54b06e318fb428822e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 11 Feb 2022 07:01:32 +0000 Subject: [PATCH 04/12] renovatebot(deps): update dependency jakarta.xml.bind:jakarta.xml.bind-api to v3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index faa4904..42630dc 100644 --- a/build.gradle +++ b/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation 'net.sf.ehcache:ehcache:2.10.9.2' implementation 'org.codehaus.woodstox:woodstox-core-asl:4.4.1' implementation 'org.apache.commons:commons-lang3:3.12.0' - implementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" + implementation "jakarta.xml.bind:jakarta.xml.bind-api:3.0.1" implementation "org.glassfish.jaxb:jaxb-runtime:2.3.2" } From 581dbbd6ede172c591223995ee7f922a7ea130cb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 11 Feb 2022 07:03:09 +0000 Subject: [PATCH 05/12] renovatebot(deps): update dependency org.glassfish.jaxb:jaxb-runtime to v3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6602f29..eab0ac0 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ dependencies { implementation 'org.codehaus.woodstox:woodstox-core-asl:4.4.1' implementation 'org.apache.commons:commons-lang3:3.12.0' implementation "jakarta.xml.bind:jakarta.xml.bind-api:3.0.1" - implementation "org.glassfish.jaxb:jaxb-runtime:2.3.2" + implementation "org.glassfish.jaxb:jaxb-runtime:3.0.2" } From 703eb0ef915f85f2c4988ef2a0eb7f73d33e3b65 Mon Sep 17 00:00:00 2001 From: Hal Deadman Date: Mon, 14 Feb 2022 02:37:31 -0500 Subject: [PATCH 06/12] re-arrange files and revert jaxb upgrade beyond what jetty 9.x supports (#10) --- .gitattributes | 8 + .gitignore | 11 ++ README.md | 4 +- .../cxf/fediz/example/FederationServlet.class | Bin 5627 -> 0 bytes build.gradle | 7 +- .../cas/ClassLoaderLeakPreventorListener.java | 19 ++ .../main/resources}/log4j.properties | 14 +- .../main/resources}/ststrust.jks | Bin .../WEB-INF}/applicationContext-security.xml | 0 .../main/webapp/WEB-INF}/fediz.xml | 0 {WEB-INF => src/main/webapp/WEB-INF}/web.xml | 179 ++++++++++-------- .../main/webapp/WEB-INF}/wsfed.properties | 0 index.html => src/main/webapp/index.html | 44 ++--- {secure => src/main/webapp/secure}/test.html | 2 +- 14 files changed, 173 insertions(+), 115 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitignore delete mode 100644 WEB-INF/classes/org/apache/cxf/fediz/example/FederationServlet.class create mode 100644 src/main/java/org/apereo/cas/ClassLoaderLeakPreventorListener.java rename {WEB-INF/classes => src/main/resources}/log4j.properties (70%) rename {WEB-INF/classes => src/main/resources}/ststrust.jks (100%) rename {WEB-INF => src/main/webapp/WEB-INF}/applicationContext-security.xml (100%) rename {WEB-INF => src/main/webapp/WEB-INF}/fediz.xml (100%) rename {WEB-INF => src/main/webapp/WEB-INF}/web.xml (85%) rename {WEB-INF => src/main/webapp/WEB-INF}/wsfed.properties (100%) rename index.html => src/main/webapp/index.html (97%) rename {secure => src/main/webapp/secure}/test.html (72%) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a206e02 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +*.sh text eol=lf +gradlew text eol=lf +*.java text eol=lf +*.xml text eol=lf +*.properties text eol=lf +*.txt text eol=lf +*.json text eol=lf +*.html text eol=lf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a3c7f32 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +.gradle +build/ +.idea +classes +*.iml +bin/ +.classpath +.project +.settings/ +.vscode/ + diff --git a/README.md b/README.md index 2a26c9d..fe73aad 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,6 @@ You will need a keystore at `/etc/cas/thekeystore`. See: -- `WEB-INF/fediz.xml` -- `WEB-INF/applicationContext-security.xml` +- `src/main/webapp/fediz.xml` +- `src/main/webapp/applicationContext-security.xml` diff --git a/WEB-INF/classes/org/apache/cxf/fediz/example/FederationServlet.class b/WEB-INF/classes/org/apache/cxf/fediz/example/FederationServlet.class deleted file mode 100644 index 88c38e72235bd3fa8dd16d71a2b3190fd9c2a64c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5627 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 - - - - WS Federation Spring Example - WS Federation Spring Example - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - - FederationFilter - org.apache.cxf.fediz.core.servlet.FederationFilter - - - - springSecurityFilterChain - /* - - - - FederationFilter - /secure/* - - - - contextConfigLocation - /WEB-INF/applicationContext-security.xml - - - - org.springframework.web.context.ContextLoaderListener - - - - FederationServlet - org.apereo.cas.FederationServlet - - - - FederationServlet - /secure/fedservlet - - - - FederationServlet - /secure/admin/fedservlet - - - - FederationServlet - /secure/user/fedservlet - - - - FederationServlet - /secure/manager/fedservlet - - - + + + + + WS Federation Spring Example + WS Federation Spring Example + + + contextConfigLocation + /WEB-INF/applicationContext-security.xml + + + + ClassLoaderLeakPreventor.threadWaitMs + 100 + + + + ClassLoaderLeakPreventor.shutdownHookWaitMs + 200 + + + + springSecurityFilterChain + org.springframework.web.filter.DelegatingFilterProxy + + + + + FederationFilter + org.apache.cxf.fediz.core.servlet.FederationFilter + + + + springSecurityFilterChain + /* + + + + FederationFilter + /secure/* + + + + + org.apereo.cas.ClassLoaderLeakPreventorListener + + + + org.springframework.web.context.ContextLoaderListener + + + + FederationServlet + org.apereo.cas.FederationServlet + + + + FederationServlet + /secure/fedservlet + + + + FederationServlet + /secure/admin/fedservlet + + + + FederationServlet + /secure/user/fedservlet + + + + FederationServlet + /secure/manager/fedservlet + + + diff --git a/WEB-INF/wsfed.properties b/src/main/webapp/WEB-INF/wsfed.properties similarity index 100% rename from WEB-INF/wsfed.properties rename to src/main/webapp/WEB-INF/wsfed.properties diff --git a/index.html b/src/main/webapp/index.html similarity index 97% rename from index.html rename to src/main/webapp/index.html index d3dfba1..a6ab28f 100644 --- a/index.html +++ b/src/main/webapp/index.html @@ -1,22 +1,22 @@ - - - - WS Federation Sample Web Application - - - - - - -
-
-
-

WS Federation Sample Web Application

-

This is a sample application that acts as a WS Federation client using Apache Fediz.

-

Login with CAS

-
-
-
- - - + + + + WS Federation Sample Web Application + + + + + + +
+
+
+

WS Federation Sample Web Application

+

This is a sample application that acts as a WS Federation client using Apache Fediz.

+

Login with CAS

+
+
+
+ + + diff --git a/secure/test.html b/src/main/webapp/secure/test.html similarity index 72% rename from secure/test.html rename to src/main/webapp/secure/test.html index 5c427b7..08a53bd 100644 --- a/secure/test.html +++ b/src/main/webapp/secure/test.html @@ -1,5 +1,5 @@ -WS Federation Tomcat Examples +WS Federation Tomcat Examples From 52a256ba9c904582a9a7aec8d6e5538db29fa3fd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 25 Feb 2022 10:04:24 +0000 Subject: [PATCH 07/12] renovatebot(deps): update actions/setup-java action to v3 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c84b46..8508fbe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: ${{ env.JDK_CURRENT }} distribution: 'temurin' From ee512428fdb05ba2aacb5df9e0190894f982c90b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 Mar 2022 18:09:49 +0000 Subject: [PATCH 08/12] renovatebot(deps): update actions/checkout action to v3 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8508fbe..5c53a53 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: runs-on: ${{ matrix.os }} needs: cancel-previous-runs steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 - name: Set up JDK From 6b447cdd83b1602462a068c0b27d532460ae512b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 9 Mar 2022 18:48:54 +0000 Subject: [PATCH 09/12] renovatebot(deps): update dependency gradle to v7.4.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..00e33ed 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 011a2abf958914e88f209df2fcc0561dc0494b44 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 21 Mar 2022 15:59:17 +0000 Subject: [PATCH 10/12] renovatebot(deps): update dependency joda-time:joda-time to v2.10.14 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 98822cf..72cb956 100644 --- a/build.gradle +++ b/build.gradle @@ -63,7 +63,7 @@ dependencies { implementation "org.springframework.security:spring-security-config:${project.springSecurityVersion}" implementation 'log4j:log4j:1.2.17' - implementation 'joda-time:joda-time:2.10.13' + implementation 'joda-time:joda-time:2.10.14' implementation 'org.jasypt:jasypt:1.9.3' implementation 'net.sf.ehcache:ehcache:2.10.9.2' implementation 'org.codehaus.woodstox:woodstox-core-asl:4.4.1' From 712bfd6abdbb1ab8aec508e7926a319e5913ac60 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 31 Mar 2022 16:41:21 +0000 Subject: [PATCH 11/12] renovatebot(deps): update dependency gradle to v7.4.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33ed..aa991fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 94408d9c0ad4016748a34e7f0a23150e8a87ee6c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 8 Apr 2022 16:15:06 +0000 Subject: [PATCH 12/12] renovatebot(deps): update dependency jakarta.xml.bind:jakarta.xml.bind-api to v4 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 72cb956..a45b5ef 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ dependencies { implementation 'net.sf.ehcache:ehcache:2.10.9.2' implementation 'org.codehaus.woodstox:woodstox-core-asl:4.4.1' implementation 'org.apache.commons:commons-lang3:3.12.0' - implementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" + implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0" implementation "org.glassfish.jaxb:jaxb-runtime:2.3.6" implementation "se.jiderhamn.classloader-leak-prevention:classloader-leak-prevention-servlet:2.7.0"