removing pac4j

Heigvd · Jun 10, 2024 · 7539aca · 7539aca
1 parent 38daaf8
commit 7539aca
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 232 deletions.
diff --git a/pom.xml b/pom.xml
@@ -135,9 +135,6 @@
         <jakarta.version>10.0.0</jakarta.version>
 
         <shiro.version>1.13.0</shiro.version>
-        <pac4jVersion>6.0.2</pac4jVersion>
-        <bujiVersion>9.0.1</bujiVersion>
-        <jakartaPac4jVersion>8.0.1</jakartaPac4jVersion>
 
         <payara.version>6.2024.5</payara.version>
 
@@ -228,27 +225,7 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>io.buji</groupId>
-                <artifactId>buji-pac4j</artifactId>
-                <version>${bujiVersion}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.pac4j</groupId>
-                <artifactId>jakartaee-pac4j</artifactId>
-                <version>${jakartaPac4jVersion}</version>
-            </dependency>
 
-            <dependency>
-                <groupId>org.pac4j</groupId>
-                <artifactId>pac4j-jakartaee</artifactId>
-                <version>${pac4jVersion}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.pac4j</groupId>
-                <artifactId>pac4j-oidc</artifactId>
-                <version>${pac4jVersion}</version>
-            </dependency>
 
             <!-- Import dep from payara -->
             <dependency>

diff --git a/wegas-app/src/main/webapp/WEB-INF/shiro.ini b/wegas-app/src/main/webapp/WEB-INF/shiro.ini
@@ -15,7 +15,7 @@ sessionManager.globalSessionTimeout = 3600000
 
 # For shiro >= 1.7.0
 # Explicit url rewriting must be set in order to work with special chars (File management needs that)
-sessionManager.sessionIdUrlRewritingEnabled = true
+sessionManager.sessionIdUrlRewritingEnabled = false
 invalidRequest = org.apache.shiro.web.filter.InvalidRequestFilter
 invalidRequest.blockNonAscii = false
 
@@ -61,11 +61,11 @@ aaiRealm = com.wegas.core.security.aai.AaiRealm
 aaiRealm.credentialsMatcher = $aaiCredentialsMatcher
 
 #pac4j Realm
-pac4jRealm = com.wegas.core.security.oidc.Pac4jOidcWegasRealm
-pac4jRealm.credentialsMatcher = $aaiCredentialsMatcher
+#pac4jRealm = com.wegas.core.security.oidc.Pac4jOidcWegasRealm
+#pac4jRealm.credentialsMatcher = $aaiCredentialsMatcher
 
 # Assign realms to security manager
-securityManager.realms = $jpaRealm, $guestRealm, $pac4jRealm, $aaiRealm, $jpaTokenRealm
+securityManager.realms = $jpaRealm, $guestRealm, $aaiRealm, $jpaTokenRealm
 
 srm = com.wegas.core.security.util.ShiroRememberManager
 securityManager.rememberMeManager = $srm
@@ -83,55 +83,51 @@ roles.unauthorizedUrl = /wegas-app/jsf/error/accessdenied.html
 # Redirect logout to logout page
 logout.redirectUrl = /
 
-oidcConfig = com.wegas.core.security.oidc.WegasOidcConfiguration
-oidcClient = com.wegas.core.security.oidc.WegasOidcClient
-oidcClient.configuration = $oidcConfig
+#oidcConfig = com.wegas.core.security.oidc.WegasOidcConfiguration
+#oidcClient = com.wegas.core.security.oidc.WegasOidcClient
+#oidcClient.configuration = $oidcConfig
 
-wegasRememberMeAuthGenerator = com.wegas.core.security.oidc.WegasRememberMeAuthGenerator
-oidcClient.authorizationGenerator = $wegasRememberMeAuthGenerator
+#wegasRememberMeAuthGenerator = com.wegas.core.security.oidc.WegasRememberMeAuthGenerator
+#oidcClient.authorizationGenerator = $wegasRememberMeAuthGenerator
 
 
-clients.clients = $oidcClient
+#clients.clients = $oidcClient
 
-oidcSecurityFilter = org.pac4j.jee.filter.SecurityFilter
+#oidcSecurityFilter = org.pac4j.jee.filter.SecurityFilter
 # $config is defined in pac4j
-oidcSecurityFilter.config = $config
-oidcSecurityFilter.clients = WegasOidcClient
+#oidcSecurityFilter.config = $config
+#oidcSecurityFilter.clients = WegasOidcClient
 
-callbackFilter = org.pac4j.jee.filter.CallbackFilter
-callbackFilter.config = $config
-callbackFilter.renewSession = false
+#callbackFilter = org.pac4j.jee.filter.CallbackFilter
+#callbackFilter.config = $config
+#callbackFilter.renewSession = false
 
 [urls]
 #logout
 #/logout=logout
 #/logout.html=anon
 
-#/index.html=anon
-#/aai-login.html=anon
-#/**/*.html=authc
+/index.html=anon
+/aai-login.html=anon
+/**/*.html=authc
 
 # Login API calls
-#/rest/Editor/User/Current=anon
-#/rest/User/Account/Current=anon
-#/rest/User/AuthMethod/**=anon
-#/rest/User/Authenticate=anon
-#/rest/Pusher/ApplicationKey=anon
-#/rest/User/DefaultAuthMethod=anon
-#/rest/User/Signup=anon
-#/rest/Extended/User/Account/AaiConfig=anon
-#/rest/User/AaiLogin=anon
-/game.html=authc
-/edit.html=authc
-/host.html=authc
-/game-play.html=authc
-/rest/Oidc/Login=oidcSecurityFilter
-
-/rest/Oidc/Callback=callbackFilter
-
-
-#/rest/**=authc
-#/openapi/**=authc
+/rest/Editor/User/Current=anon
+/rest/User/Account/Current=anon
+/rest/User/AuthMethod/**=anon
+/rest/User/Authenticate=anon
+/rest/Pusher/ApplicationKey=anon
+/rest/User/DefaultAuthMethod=anon
+/rest/User/Signup=anon
+/rest/Extended/User/Account/AaiConfig=anon
+/rest/User/AaiLogin=anon
+#/rest/Oidc/Login=oidcSecurityFilter
+
+#/rest/Oidc/Callback=callbackFilter
+
+
+/rest/**=authc
+/openapi/**=authc
 
 # force ssl for login page
 #/login.html=ssl[8443], authc

diff --git a/wegas-core/pom.xml b/wegas-core/pom.xml
@@ -43,33 +43,6 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>io.buji</groupId>
-            <artifactId>buji-pac4j</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.pac4j</groupId>
-                    <artifactId>pac4j-javaee</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.shiro</groupId>
-                    <artifactId>shiro-web</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.pac4j</groupId>
-            <artifactId>jakartaee-pac4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.pac4j</groupId>
-            <artifactId>pac4j-jakartaee</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.pac4j</groupId>
-            <artifactId>pac4j-oidc</artifactId>
-        </dependency>
         <dependency>
             <groupId>ch.albasim.wegas</groupId>
             <artifactId>wegas-annotations</artifactId>

diff --git a/wegas-core/src/main/java/com/wegas/core/security/oidc/Pac4jOidcWegasRealm.java b/wegas-core/src/main/java/com/wegas/core/security/oidc/Pac4jOidcWegasRealm.java
diff --git a/wegas-core/src/main/java/com/wegas/core/security/oidc/WegasOidcClient.java b/wegas-core/src/main/java/com/wegas/core/security/oidc/WegasOidcClient.java
diff --git a/wegas-core/src/main/java/com/wegas/core/security/oidc/WegasOidcConfiguration.java b/wegas-core/src/main/java/com/wegas/core/security/oidc/WegasOidcConfiguration.java
diff --git a/wegas-core/src/main/java/com/wegas/core/security/oidc/WegasRememberMeAuthGenerator.java b/wegas-core/src/main/java/com/wegas/core/security/oidc/WegasRememberMeAuthGenerator.java