db changes only

Heigvd · Jun 12, 2024 · b5d38e6 · b5d38e6
1 parent e05bdc8
commit b5d38e6
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 224 deletions.
diff --git a/pom.xml b/pom.xml
@@ -135,10 +135,6 @@
         <jakarta.version>10.0.0</jakarta.version>
 
         <shiro.version>1.12.0</shiro.version>
-        <pac4jVersion>6.0.2</pac4jVersion>
-        <bujiVersion>9.0.1</bujiVersion>
-        <jakartaPac4jVersion>8.0.1</jakartaPac4jVersion>
-
         <payara.version>6.2023.9</payara.version>
 
         <junit.version>4.13.1</junit.version>
@@ -186,28 +182,6 @@
 
     <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>
                 <groupId>fish.payara.api</groupId>

diff --git a/wegas-app/src/main/webapp/WEB-INF/shiro.ini b/wegas-app/src/main/webapp/WEB-INF/shiro.ini
@@ -60,12 +60,8 @@ aaiCredentialsMatcher = com.wegas.core.security.aai.AaiCredentialsMatcher
 aaiRealm = com.wegas.core.security.aai.AaiRealm
 aaiRealm.credentialsMatcher = $aaiCredentialsMatcher
 
-#pac4j Realm
-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
@@ -80,28 +76,9 @@ authc.successUrl  = /
 # Redirect to error page if user does not have access rights
 roles.unauthorizedUrl = /wegas-app/jsf/error/accessdenied.html
 
-# Redirect logout to logout page
+# Redirect logout to logoutpage
 logout.redirectUrl = /
 
-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
-
-
-clients.clients = $oidcClient
-
-oidcSecurityFilter = org.pac4j.jee.filter.SecurityFilter
-# $config is defined in pac4j
-oidcSecurityFilter.config = $config
-oidcSecurityFilter.clients = WegasOidcClient
-
-callbackFilter = org.pac4j.jee.filter.CallbackFilter
-callbackFilter.config = $config
-callbackFilter.renewSession = false
-
 [urls]
 #logout
 #/logout=logout
@@ -112,9 +89,6 @@ callbackFilter.renewSession = false
 /host.html=authc
 /game-play.html=authc
 
-/rest/Oidc/Login=oidcSecurityFilter
-
-/rest/Oidc/Callback=callbackFilter
 # 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