From 1bfac7ea530e165149f6aa2f2a36e153ea19d523 Mon Sep 17 00:00:00 2001 From: eelhazati Date: Sat, 29 Feb 2020 16:46:05 +0100 Subject: [PATCH] move jaas to core security module. --- .../core-java-security/README.md | 1 + .../jaas}/ConsoleCallbackHandler.java | 2 +- .../baeldung/jaas}/JaasAuthentication.java | 2 +- .../com/baeldung/jaas}/JaasAuthorization.java | 2 +- .../java/com/baeldung/jaas}/LoginService.java | 2 +- .../com/baeldung/jaas}/ResourceAction.java | 2 +- .../baeldung/jaas}/ResourcePermission.java | 2 +- .../loginmodule}/InMemoryLoginModule.java | 2 +- .../src/main/resources/jaas/jaas.login.config | 3 ++ .../src/main/resources/jaas}/jaas.policy | 6 +-- pom.xml | 1 - security-jaas/jaas-app/pom.xml | 40 ------------------- security-jaas/jaas-login-module/pom.xml | 14 ------- security-jaas/jaas.login.config | 3 -- security-jaas/pom.xml | 27 ------------- security-jaas/run-authentication.bat | 1 - security-jaas/run-authorization.bat | 1 - 17 files changed, 14 insertions(+), 97 deletions(-) rename {security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app => core-java-modules/core-java-security/src/main/java/com/baeldung/jaas}/ConsoleCallbackHandler.java (95%) rename {security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app => core-java-modules/core-java-security/src/main/java/com/baeldung/jaas}/JaasAuthentication.java (90%) rename {security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app => core-java-modules/core-java-security/src/main/java/com/baeldung/jaas}/JaasAuthorization.java (92%) rename {security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app => core-java-modules/core-java-security/src/main/java/com/baeldung/jaas}/LoginService.java (90%) rename {security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app => core-java-modules/core-java-security/src/main/java/com/baeldung/jaas}/ResourceAction.java (90%) rename {security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app => core-java-modules/core-java-security/src/main/java/com/baeldung/jaas}/ResourcePermission.java (80%) rename {security-jaas/jaas-login-module/src/main/java/com/baeldung/security/jaas/authentication => core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/loginmodule}/InMemoryLoginModule.java (97%) create mode 100644 core-java-modules/core-java-security/src/main/resources/jaas/jaas.login.config rename {security-jaas => core-java-modules/core-java-security/src/main/resources/jaas}/jaas.policy (67%) delete mode 100644 security-jaas/jaas-app/pom.xml delete mode 100644 security-jaas/jaas-login-module/pom.xml delete mode 100644 security-jaas/jaas.login.config delete mode 100644 security-jaas/pom.xml delete mode 100644 security-jaas/run-authentication.bat delete mode 100644 security-jaas/run-authorization.bat diff --git a/core-java-modules/core-java-security/README.md b/core-java-modules/core-java-security/README.md index ff9b1eef14..2340813c27 100644 --- a/core-java-modules/core-java-security/README.md +++ b/core-java-modules/core-java-security/README.md @@ -16,4 +16,5 @@ This module contains articles about core Java Security - [An Introduction to Java SASL](https://www.baeldung.com/java-sasl) - [A Guide to Java GSS API](https://www.baeldung.com/java-gss) - [Intro to the Java SecurityManager](https://www.baeldung.com/java-security-manager) +- [Guide To The Java Authentication And Authorization Service (JAAS)](https://www.baeldung.com/java-security-jaas) diff --git a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/ConsoleCallbackHandler.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/ConsoleCallbackHandler.java similarity index 95% rename from security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/ConsoleCallbackHandler.java rename to core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/ConsoleCallbackHandler.java index c5d7e9f6df..714879e862 100644 --- a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/ConsoleCallbackHandler.java +++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/ConsoleCallbackHandler.java @@ -1,4 +1,4 @@ -package com.baeldung.security.jaas.app; +package com.baeldung.jaas; import javax.security.auth.callback.*; import java.io.Console; diff --git a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/JaasAuthentication.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/JaasAuthentication.java similarity index 90% rename from security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/JaasAuthentication.java rename to core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/JaasAuthentication.java index 8e519c8854..263daa4008 100644 --- a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/JaasAuthentication.java +++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/JaasAuthentication.java @@ -1,4 +1,4 @@ -package com.baeldung.security.jaas.app; +package com.baeldung.jaas; import javax.security.auth.Subject; import javax.security.auth.login.LoginException; diff --git a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/JaasAuthorization.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/JaasAuthorization.java similarity index 92% rename from security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/JaasAuthorization.java rename to core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/JaasAuthorization.java index 27e08bc6ca..b01179c4d6 100644 --- a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/JaasAuthorization.java +++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/JaasAuthorization.java @@ -1,4 +1,4 @@ -package com.baeldung.security.jaas.app; +package com.baeldung.jaas; import javax.security.auth.Subject; import javax.security.auth.login.LoginException; diff --git a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/LoginService.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/LoginService.java similarity index 90% rename from security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/LoginService.java rename to core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/LoginService.java index 8eff76527a..72c18d211c 100644 --- a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/LoginService.java +++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/LoginService.java @@ -1,4 +1,4 @@ -package com.baeldung.security.jaas.app; +package com.baeldung.jaas; import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; diff --git a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/ResourceAction.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/ResourceAction.java similarity index 90% rename from security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/ResourceAction.java rename to core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/ResourceAction.java index 28d13775da..274f280c2b 100644 --- a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/ResourceAction.java +++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/ResourceAction.java @@ -1,4 +1,4 @@ -package com.baeldung.security.jaas.app; +package com.baeldung.jaas; import java.security.PrivilegedAction; diff --git a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/ResourcePermission.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/ResourcePermission.java similarity index 80% rename from security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/ResourcePermission.java rename to core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/ResourcePermission.java index c2a94579f2..1ea162f002 100644 --- a/security-jaas/jaas-app/src/main/java/com/baeldung/security/jaas/app/ResourcePermission.java +++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/ResourcePermission.java @@ -1,4 +1,4 @@ -package com.baeldung.security.jaas.app; +package com.baeldung.jaas; import java.security.BasicPermission; diff --git a/security-jaas/jaas-login-module/src/main/java/com/baeldung/security/jaas/authentication/InMemoryLoginModule.java b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/loginmodule/InMemoryLoginModule.java similarity index 97% rename from security-jaas/jaas-login-module/src/main/java/com/baeldung/security/jaas/authentication/InMemoryLoginModule.java rename to core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/loginmodule/InMemoryLoginModule.java index 8a48e36401..6ab606530b 100644 --- a/security-jaas/jaas-login-module/src/main/java/com/baeldung/security/jaas/authentication/InMemoryLoginModule.java +++ b/core-java-modules/core-java-security/src/main/java/com/baeldung/jaas/loginmodule/InMemoryLoginModule.java @@ -1,4 +1,4 @@ -package com.baeldung.security.jaas.authentication; +package com.baeldung.jaas.loginmodule; import com.sun.security.auth.UserPrincipal; diff --git a/core-java-modules/core-java-security/src/main/resources/jaas/jaas.login.config b/core-java-modules/core-java-security/src/main/resources/jaas/jaas.login.config new file mode 100644 index 0000000000..1163f60c84 --- /dev/null +++ b/core-java-modules/core-java-security/src/main/resources/jaas/jaas.login.config @@ -0,0 +1,3 @@ +jaasApplication { + com.baeldung.jaas.loginmodule.InMemoryLoginModule required debug=true; +}; diff --git a/security-jaas/jaas.policy b/core-java-modules/core-java-security/src/main/resources/jaas/jaas.policy similarity index 67% rename from security-jaas/jaas.policy rename to core-java-modules/core-java-security/src/main/resources/jaas/jaas.policy index d3109d62e7..fa95bfed30 100644 --- a/security-jaas/jaas.policy +++ b/core-java-modules/core-java-security/src/main/resources/jaas/jaas.policy @@ -1,14 +1,14 @@ -grant codebase "file:./jaas-app/target/jaas-app.jar" { +grant codebase "file:./target/core-java-security-0.1.0-SNAPSHOT.jar" { permission javax.security.auth.AuthPermission "createLoginContext.jaasApplication"; permission javax.security.auth.AuthPermission "doAsPrivileged"; permission java.lang.RuntimePermission "readFileDescriptor"; permission java.lang.RuntimePermission "writeFileDescriptor"; }; -grant codebase "file:./jaas-login-module/target/jaas-login-module.jar" { +grant codebase "file:./target/core-java-security-0.1.0-SNAPSHOT.jar" { permission javax.security.auth.AuthPermission "modifyPrincipals"; }; grant principal com.sun.security.auth.UserPrincipal "testuser" { - permission com.baeldung.security.jaas.app.ResourcePermission "test_resource"; + permission com.baeldung.jaas.ResourcePermission "test_resource"; }; diff --git a/pom.xml b/pom.xml index 5d8181a7bc..71e5d21b02 100644 --- a/pom.xml +++ b/pom.xml @@ -636,7 +636,6 @@ webrtc wildfly quarkus-extension - security-jaas diff --git a/security-jaas/jaas-app/pom.xml b/security-jaas/jaas-app/pom.xml deleted file mode 100644 index 0cc068c2de..0000000000 --- a/security-jaas/jaas-app/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - - com.baeldung.security.jaas - security-jaas - 1.0-SNAPSHOT - - jaas-app - - - - - maven-jar-plugin - 3.1.2 - - - - true - com.baeldung.security.jaas.JaasApplication - - - - - - - - - - com.baeldung.security.jaas - jaas-login-module - 1.0-SNAPSHOT - provided - - - - \ No newline at end of file diff --git a/security-jaas/jaas-login-module/pom.xml b/security-jaas/jaas-login-module/pom.xml deleted file mode 100644 index 371aaf3a8f..0000000000 --- a/security-jaas/jaas-login-module/pom.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - 4.0.0 - - - com.baeldung.security.jaas - security-jaas - 1.0-SNAPSHOT - - jaas-login-module - - \ No newline at end of file diff --git a/security-jaas/jaas.login.config b/security-jaas/jaas.login.config deleted file mode 100644 index 4b0a64540b..0000000000 --- a/security-jaas/jaas.login.config +++ /dev/null @@ -1,3 +0,0 @@ -jaasApplication { - com.baeldung.security.jaas.authentication.InMemoryLoginModule required debug=true; -}; diff --git a/security-jaas/pom.xml b/security-jaas/pom.xml deleted file mode 100644 index 1e256d4668..0000000000 --- a/security-jaas/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - - com.baeldung.security.jaas - security-jaas - 1.0-SNAPSHOT - pom - - - 1.8 - 1.8 - UTF-8 - - - - jaas-app - jaas-login-module - - - - ${project.artifactId} - - - \ No newline at end of file diff --git a/security-jaas/run-authentication.bat b/security-jaas/run-authentication.bat deleted file mode 100644 index 1ee2c2398a..0000000000 --- a/security-jaas/run-authentication.bat +++ /dev/null @@ -1 +0,0 @@ -java -Djava.security.auth.login.config=jaas.login.config -classpath jaas-app/target/jaas-app.jar;jaas-login-module/target/jaas-login-module.jar com.baeldung.security.jaas.app.JaasAuthentication \ No newline at end of file diff --git a/security-jaas/run-authorization.bat b/security-jaas/run-authorization.bat deleted file mode 100644 index fdb1501ff4..0000000000 --- a/security-jaas/run-authorization.bat +++ /dev/null @@ -1 +0,0 @@ -java -Djava.security.manager -Djava.security.policy=jaas.policy -Djava.security.auth.login.config=jaas.login.config -classpath %JAVA_HOME%\lib;jaas-app/target/jaas-app.jar;jaas-login-module/target/jaas-login-module.jar com.baeldung.security.jaas.app.JaasAuthorization \ No newline at end of file