From fb08a01b513805a7d21edf44db0688da69e24570 Mon Sep 17 00:00:00 2001
From: Jj! <jj@scaldingspoon.com>
Date: Thu, 13 Oct 2022 08:20:12 -0500
Subject: [PATCH] [NOTASK]

update classloader for SPI usage
exclude xml dependencies
---
 pom.xml                                       | 27 +++++++++++++++++--
 .../plugin/Pac4jConfigFactory.java            |  5 ++++
 .../filter/CallbackFilterDecorator.java       | 12 +++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d5bac77..40b4a12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,14 @@
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-jcl</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -97,6 +105,14 @@
             <artifactId>pac4j-oidc</artifactId>
             <version>${pac4j.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
+            <version>8.0.0</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-catalina</artifactId>
@@ -171,10 +187,17 @@
                         <Bundle-Activator>edu.internet2.middleware.grouper.authentication.plugin.GrouperAuthentication</Bundle-Activator>
                         <Export-Package>edu.internet2.middleware.grouper.authentication.plugin.filter</Export-Package>
                         <Private-Package>edu.internet2.middleware.grouper.authentication.plugin.*</Private-Package>
-                        <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+                        <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
+                        <!--
+                        <Import-Package>
+                            COM.newmonics;COM.newmonics.PercClassLoader;EDU.oswego.cs.dl.util.concurrent;android.os;com.google.appengine.api;com.google.appengine.api.utils;com.google.apphosting.api;com.ibm.websphere.jtaextensions;com.ibm.wsspi.uow;javax.ejb;javax.el;javax.enterprise.*;javax.faces.*;javax.inject.*;javax.interceptor;javax.jdo;javax.jdo.datastore;javax.resource;javax.resource.cci;javax.resource.spi;javax.resource.spi.endpoint;javax.resource.spi.work;resolution:=optional,
+                            sun.misc.*,javax.*,
+                            *
+                        </Import-Package>
+                        -->
                         <Import-Package>
-                            *;resolution:=optional
+                            sun.misc,org.osgi.framework,javax.servlet,javax.xml,org.w3c.dom
                         </Import-Package>
                         <!--
                         <Import-Package>
diff --git a/src/main/java/edu/internet2/middleware/grouper/authentication/plugin/Pac4jConfigFactory.java b/src/main/java/edu/internet2/middleware/grouper/authentication/plugin/Pac4jConfigFactory.java
index 42c4f74..46fd5d4 100644
--- a/src/main/java/edu/internet2/middleware/grouper/authentication/plugin/Pac4jConfigFactory.java
+++ b/src/main/java/edu/internet2/middleware/grouper/authentication/plugin/Pac4jConfigFactory.java
@@ -32,7 +32,10 @@ public class Pac4jConfigFactory implements ConfigFactory {
 
     @Override
     public Config build(Object... parameters) {
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         try {
+            Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+
             ConfigPropertiesCascadeBase grouperConfig = ConfigUtils.getBestGrouperConfiguration();
 
             String provider;
@@ -60,6 +63,8 @@ public Config build(Object... parameters) {
             return config;
         } catch (IllegalAccessException|InstantiationException e) {
             throw new RuntimeException("problem configuring pac4j", e);
+        } finally {
+            Thread.currentThread().setContextClassLoader(classLoader);
         }
     }
 
diff --git a/src/main/java/edu/internet2/middleware/grouper/authentication/plugin/filter/CallbackFilterDecorator.java b/src/main/java/edu/internet2/middleware/grouper/authentication/plugin/filter/CallbackFilterDecorator.java
index 2c45f19..838265a 100644
--- a/src/main/java/edu/internet2/middleware/grouper/authentication/plugin/filter/CallbackFilterDecorator.java
+++ b/src/main/java/edu/internet2/middleware/grouper/authentication/plugin/filter/CallbackFilterDecorator.java
@@ -10,6 +10,7 @@
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -47,4 +48,15 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             chain.doFilter(request, response);
         }
     }
+
+    @Override
+    protected void internalFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+            super.internalFilter(request, response, chain);
+        } finally {
+            Thread.currentThread().setContextClassLoader(classLoader);
+        }
+    }
 }