diff --git a/servlet/java-configuration/preauth/build.gradle b/servlet/java-configuration/preauth/build.gradle new file mode 100644 index 0000000..7eb0887 --- /dev/null +++ b/servlet/java-configuration/preauth/build.gradle @@ -0,0 +1,37 @@ +plugins { + id "java" + id "nebula.integtest" version "7.0.9" + id "org.gretty" version "3.0.3" + id "war" +} + +apply from: "gradle/gretty.gradle" + +repositories { + jcenter() + maven { url "https://repo.spring.io/snapshot" } +} + +dependencies { + implementation platform("org.springframework:spring-framework-bom:5.3.0") + implementation platform("org.springframework.security:spring-security-bom:5.5.0-SNAPSHOT") + implementation platform("org.junit:junit-bom:5.7.0") + + implementation "org.springframework.security:spring-security-config" + implementation "org.springframework.security:spring-security-web" + implementation "org.springframework:spring-webmvc" + implementation "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" + + testImplementation "org.assertj:assertj-core:3.18.0" + testImplementation "org.springframework:spring-test" + testImplementation "org.springframework.security:spring-security-test" + testImplementation("org.junit.jupiter:junit-jupiter-api") + + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + + integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0" +} + +tasks.withType(Test).configureEach { + useJUnitPlatform() +} diff --git a/servlet/java-configuration/preauth/gradle.properties b/servlet/java-configuration/preauth/gradle.properties new file mode 100644 index 0000000..fe89f6a --- /dev/null +++ b/servlet/java-configuration/preauth/gradle.properties @@ -0,0 +1 @@ +tomcat85Version=8.5.54 diff --git a/servlet/java-configuration/preauth/gradle/gretty.gradle b/servlet/java-configuration/preauth/gradle/gretty.gradle new file mode 100644 index 0000000..3df1479 --- /dev/null +++ b/servlet/java-configuration/preauth/gradle/gretty.gradle @@ -0,0 +1,41 @@ +gretty { + servletContainer = "tomcat85" + contextPath = "/" + fileLogEnabled = false + integrationTestTask = 'integrationTest' +} + +Task prepareAppServerForIntegrationTests = project.tasks.create('prepareAppServerForIntegrationTests') { + group = 'Verification' + description = 'Prepares the app server for integration tests' + doFirst { + project.gretty { + httpPort = -1 + } + } +} + +project.tasks.matching { it.name == "appBeforeIntegrationTest" }.all { task -> + task.dependsOn prepareAppServerForIntegrationTests +} + +project.tasks.matching { it.name == "integrationTest" }.all { + task -> task.doFirst { + def gretty = project.gretty + String host = project.gretty.host ?: 'localhost' + boolean isHttps = gretty.httpsEnabled + Integer httpPort = integrationTest.systemProperties['gretty.httpPort'] + Integer httpsPort = integrationTest.systemProperties['gretty.httpsPort'] + int port = isHttps ? httpsPort : httpPort + String contextPath = project.gretty.contextPath + String httpBaseUrl = "http://${host}:${httpPort}${contextPath}" + String httpsBaseUrl = "https://${host}:${httpsPort}${contextPath}" + String baseUrl = isHttps ? httpsBaseUrl : httpBaseUrl + integrationTest.systemProperty 'app.port', port + integrationTest.systemProperty 'app.httpPort', httpPort + integrationTest.systemProperty 'app.httpsPort', httpsPort + integrationTest.systemProperty 'app.baseURI', baseUrl + integrationTest.systemProperty 'app.httpBaseURI', httpBaseUrl + integrationTest.systemProperty 'app.httpsBaseURI', httpsBaseUrl + } +} \ No newline at end of file diff --git a/servlet/java-configuration/preauth/gradle/wrapper/gradle-wrapper.jar b/servlet/java-configuration/preauth/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..62d4c05 Binary files /dev/null and b/servlet/java-configuration/preauth/gradle/wrapper/gradle-wrapper.jar differ diff --git a/servlet/java-configuration/preauth/gradle/wrapper/gradle-wrapper.properties b/servlet/java-configuration/preauth/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..be52383 --- /dev/null +++ b/servlet/java-configuration/preauth/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/servlet/java-configuration/preauth/gradlew b/servlet/java-configuration/preauth/gradlew new file mode 100755 index 0000000..fbd7c51 --- /dev/null +++ b/servlet/java-configuration/preauth/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/servlet/java-configuration/preauth/gradlew.bat b/servlet/java-configuration/preauth/gradlew.bat new file mode 100644 index 0000000..a9f778a --- /dev/null +++ b/servlet/java-configuration/preauth/gradlew.bat @@ -0,0 +1,104 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/servlet/java-configuration/preauth/server/tomcat85-users.xml b/servlet/java-configuration/preauth/server/tomcat85-users.xml new file mode 100644 index 0000000..68e8649 --- /dev/null +++ b/servlet/java-configuration/preauth/server/tomcat85-users.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/servlet/java-configuration/preauth/settings.gradle b/servlet/java-configuration/preauth/settings.gradle new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/servlet/java-configuration/preauth/settings.gradle @@ -0,0 +1 @@ + diff --git a/servlet/java-configuration/preauth/src/integTest/java/example/HelloWorldTests.java b/servlet/java-configuration/preauth/src/integTest/java/example/HelloWorldTests.java new file mode 100644 index 0000000..335f249 --- /dev/null +++ b/servlet/java-configuration/preauth/src/integTest/java/example/HelloWorldTests.java @@ -0,0 +1,81 @@ +/* + * Copyright 2002-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package example; + +import example.pages.HomePage; +import example.pages.LoginPage; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.htmlunit.HtmlUnitDriver; + +/** + * Test the Hello World application. + * + * @author Michael Simons + */ +public class HelloWorldTests { + + private WebDriver driver; + + private int port; + + @BeforeEach + void setup() { + this.port = Integer.parseInt(System.getProperty("app.httpPort")); + this.driver = new HtmlUnitDriver(); + } + + @AfterEach + void tearDown() { + this.driver.quit(); + } + + @Test + void accessHomePageWithUnauthenticatedUserSendsToLoginPage() { + final LoginPage loginPage = HomePage.to(this.driver, this.port); + loginPage.assertAt(); + } + + @Test + void authenticatedUserIsSentToOriginalPage() { + // @formatter:off + final HomePage homePage = HomePage.to(this.driver, this.port) + .loginForm() + .username("user") + .password("password") + .submit(); + // @formatter:on + } + + @Test + void authenticatedUserLogsOut() { + // @formatter:off + LoginPage loginPage = HomePage.to(this.driver, this.port) + .loginForm() + .username("user") + .password("password") + .submit() + .logout(); + // @formatter:on + loginPage.assertAt(); + + loginPage = HomePage.to(this.driver, this.port); + loginPage.assertAt(); + } + +} diff --git a/servlet/java-configuration/preauth/src/integTest/java/example/pages/HomePage.java b/servlet/java-configuration/preauth/src/integTest/java/example/pages/HomePage.java new file mode 100644 index 0000000..5cd72a3 --- /dev/null +++ b/servlet/java-configuration/preauth/src/integTest/java/example/pages/HomePage.java @@ -0,0 +1,59 @@ +/* + * Copyright 2002-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package example.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * The home page. + * + * @author Michael Simons + */ +public class HomePage { + + private final WebDriver webDriver; + + @FindBy(css = "p") + private WebElement message; + + @FindBy(css = "input[type=submit]") + private WebElement logoutButton; + + public static LoginPage to(WebDriver driver, int port) { + driver.get("http://localhost:" + port + "/"); + return PageFactory.initElements(driver, LoginPage.class); + } + + public HomePage(WebDriver webDriver) { + this.webDriver = webDriver; + } + + public HomePage assertAt() { + assertThat(this.webDriver.getTitle()).isEqualTo("Hello Security"); + return this; + } + + public LoginPage logout() { + this.logoutButton.submit(); + return PageFactory.initElements(this.webDriver, LoginPage.class); + } + +} diff --git a/servlet/java-configuration/preauth/src/integTest/java/example/pages/LoginPage.java b/servlet/java-configuration/preauth/src/integTest/java/example/pages/LoginPage.java new file mode 100644 index 0000000..25bcec3 --- /dev/null +++ b/servlet/java-configuration/preauth/src/integTest/java/example/pages/LoginPage.java @@ -0,0 +1,82 @@ +/* + * Copyright 2002-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package example.pages; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; +import org.openqa.selenium.support.PageFactory; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * The log in page. + * + * @author Michael Simons + */ +public class LoginPage { + + private final WebDriver webDriver; + + private final LoginForm loginForm; + + public LoginPage(WebDriver webDriver) { + this.webDriver = webDriver; + this.loginForm = PageFactory.initElements(this.webDriver, LoginForm.class); + } + + public LoginPage assertAt() { + assertThat(this.webDriver.getTitle()).isEqualTo("Please sign in"); + return this; + } + + public LoginForm loginForm() { + return this.loginForm; + } + + public static class LoginForm { + + private WebDriver webDriver; + + private WebElement username; + + private WebElement password; + + @FindBy(css = "button[type=submit]") + private WebElement submit; + + public LoginForm(WebDriver webDriver) { + this.webDriver = webDriver; + } + + public LoginForm username(String username) { + this.username.sendKeys(username); + return this; + } + + public LoginForm password(String password) { + this.password.sendKeys(password); + return this; + } + + public HomePage submit() { + this.submit.click(); + return PageFactory.initElements(this.webDriver, HomePage.class); + } + + } + +} diff --git a/servlet/java-configuration/preauth/src/main/java/example/ApplicationConfiguration.java b/servlet/java-configuration/preauth/src/main/java/example/ApplicationConfiguration.java new file mode 100644 index 0000000..9b01227 --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/java/example/ApplicationConfiguration.java @@ -0,0 +1,26 @@ +/* + * Copyright 2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package example; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan +public class ApplicationConfiguration { + +} diff --git a/servlet/java-configuration/preauth/src/main/java/example/IndexController.java b/servlet/java-configuration/preauth/src/main/java/example/IndexController.java new file mode 100644 index 0000000..0f1c67b --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/java/example/IndexController.java @@ -0,0 +1,34 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package example; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * Controller for "/". + * + * @author Rob WInch + */ +@Controller +public class IndexController { + + @GetMapping("/") + public String index() { + return "index"; + } + +} diff --git a/servlet/java-configuration/preauth/src/main/java/example/LoginController.java b/servlet/java-configuration/preauth/src/main/java/example/LoginController.java new file mode 100644 index 0000000..10c3a62 --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/java/example/LoginController.java @@ -0,0 +1,35 @@ +/* + * Copyright 2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package example; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * Controller for the custom log in page. + * + * @author Rob WInch + */ +@Controller +public class LoginController { + + @GetMapping("/login") + String login() { + return "login"; + } + +} diff --git a/servlet/java-configuration/preauth/src/main/java/example/MvcWebApplicationInitializer.java b/servlet/java-configuration/preauth/src/main/java/example/MvcWebApplicationInitializer.java new file mode 100644 index 0000000..a45eec0 --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/java/example/MvcWebApplicationInitializer.java @@ -0,0 +1,46 @@ +/* + * Copyright 2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package example; + +import javax.servlet.Filter; + +import org.springframework.web.filter.HiddenHttpMethodFilter; +import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; + +public class MvcWebApplicationInitializer extends AbstractAnnotationConfigDispatcherServletInitializer { + + @Override + protected Class[] getRootConfigClasses() { + return null; + } + + @Override + protected Class[] getServletConfigClasses() { + return new Class[] { ApplicationConfiguration.class }; + } + + @Override + protected String[] getServletMappings() { + return new String[] { "/" }; + } + + @Override + protected Filter[] getServletFilters() { + return new Filter[] { new HiddenHttpMethodFilter() }; + } + +} diff --git a/servlet/java-configuration/preauth/src/main/java/example/SecurityConfiguration.java b/servlet/java-configuration/preauth/src/main/java/example/SecurityConfiguration.java new file mode 100644 index 0000000..121ba79 --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/java/example/SecurityConfiguration.java @@ -0,0 +1,58 @@ +/* + * Copyright 2002-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package example; + +import org.springframework.context.annotation.Bean; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; + +@EnableWebSecurity +public class SecurityConfiguration extends WebSecurityConfigurerAdapter { + + // @formatter:off + @Override + protected void configure(HttpSecurity http) throws Exception { + http + .authorizeRequests((authorizeRequests) -> + authorizeRequests + .antMatchers("/login", "/resources/**").permitAll() + .anyRequest().authenticated() + ) + .jee((jee) -> + jee + .mappableRoles("USER", "ADMIN") + ); + } + // @formatter:on + + // @formatter:off + @Bean + public UserDetailsService userDetailsService() { + UserDetails user = User.withDefaultPasswordEncoder() + .username("user") + .password("password") + .roles("USER") + .build(); + return new InMemoryUserDetailsManager(user); + } + // @formatter:on + +} diff --git a/servlet/java-configuration/preauth/src/main/java/example/SecurityWebApplicationInitializer.java b/servlet/java-configuration/preauth/src/main/java/example/SecurityWebApplicationInitializer.java new file mode 100644 index 0000000..848385d --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/java/example/SecurityWebApplicationInitializer.java @@ -0,0 +1,35 @@ +/* + * Copyright 2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package example; + +import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer; +import org.springframework.security.web.session.HttpSessionEventPublisher; + +/** + * We customize {@link AbstractSecurityWebApplicationInitializer} to enable the + * {@link HttpSessionEventPublisher}. + * + * @author Rob Winch + */ +public class SecurityWebApplicationInitializer extends AbstractSecurityWebApplicationInitializer { + + @Override + protected boolean enableHttpSessionEventPublisher() { + return true; + } + +} diff --git a/servlet/java-configuration/preauth/src/main/java/example/WebMvcConfiguration.java b/servlet/java-configuration/preauth/src/main/java/example/WebMvcConfiguration.java new file mode 100644 index 0000000..9c01f78 --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/java/example/WebMvcConfiguration.java @@ -0,0 +1,79 @@ +/* + * Copyright 2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package example; + +import org.thymeleaf.spring5.ISpringTemplateEngine; +import org.thymeleaf.spring5.SpringTemplateEngine; +import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring5.view.ThymeleafViewResolver; +import org.thymeleaf.templatemode.TemplateMode; +import org.thymeleaf.templateresolver.ITemplateResolver; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; +import org.springframework.web.servlet.ViewResolver; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@EnableWebMvc +@Configuration +public class WebMvcConfiguration implements WebMvcConfigurer { + + @Override + public void addViewControllers(ViewControllerRegistry registry) { + registry.setOrder(Ordered.HIGHEST_PRECEDENCE); + } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + // @formatter:off + registry.addResourceHandler("/resources/**") + .addResourceLocations("classpath:/resources/") + .setCachePeriod(31556926); + // @formatter:on + registry.setOrder(Ordered.HIGHEST_PRECEDENCE); + } + + @Bean + public ViewResolver viewResolver(ISpringTemplateEngine templateEngine) { + ThymeleafViewResolver resolver = new ThymeleafViewResolver(); + resolver.setTemplateEngine(templateEngine); + resolver.setCharacterEncoding("UTF-8"); + return resolver; + } + + @Bean + public SpringTemplateEngine templateEngine(ITemplateResolver templateResolver) { + SpringTemplateEngine engine = new SpringTemplateEngine(); + engine.setEnableSpringELCompiler(true); + engine.setTemplateResolver(templateResolver); + return engine; + } + + @Bean + public SpringResourceTemplateResolver templateResolver() { + SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver(); + resolver.setPrefix("classpath:/templates/"); + resolver.setSuffix(".html"); + resolver.setTemplateMode(TemplateMode.HTML); + return resolver; + } + +} diff --git a/servlet/java-configuration/preauth/src/main/resources/logback.xml b/servlet/java-configuration/preauth/src/main/resources/logback.xml new file mode 100644 index 0000000..3ebbcc0 --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/resources/logback.xml @@ -0,0 +1,12 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/servlet/java-configuration/preauth/src/main/resources/templates/index.html b/servlet/java-configuration/preauth/src/main/resources/templates/index.html new file mode 100644 index 0000000..09634dc --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/resources/templates/index.html @@ -0,0 +1,29 @@ + + + + + Hello Security + + +
+

Hello Security

+
+ +
+
+ + \ No newline at end of file diff --git a/servlet/java-configuration/preauth/src/main/resources/templates/login.html b/servlet/java-configuration/preauth/src/main/resources/templates/login.html new file mode 100644 index 0000000..be7451e --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/resources/templates/login.html @@ -0,0 +1,24 @@ + + + Please sign in + + +
+
+
+ Please Login +
Invalid + username and password.
+
You + have been logged out.
+ + +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/servlet/java-configuration/preauth/src/main/webapp/META-INF/MANIFEST.MF b/servlet/java-configuration/preauth/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 0000000..58630c0 --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/servlet/java-configuration/preauth/src/main/webapp/WEB-INF/web.xml b/servlet/java-configuration/preauth/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..c2fd660 --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,35 @@ + + + + + FORM + + /login + /login?error + + + + + ROLE_USER + + + + Public + Matches unconstrained pages + /login + /logout + /resources/* + + + + + Secured Areas + /* + + + ROLE_USER + + + diff --git a/servlet/java-configuration/preauth/src/main/webapp/login.html b/servlet/java-configuration/preauth/src/main/webapp/login.html new file mode 100644 index 0000000..3c53c9c --- /dev/null +++ b/servlet/java-configuration/preauth/src/main/webapp/login.html @@ -0,0 +1,24 @@ + + + Please sign in + + +
+
+
+ Please Login +
Invalid + username and password.
+
You + have been logged out.
+ + +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 9460d32..a4da7a3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -36,6 +36,7 @@ include ":servlet:java-configuration:hello-mvc-security" include ":servlet:java-configuration:hello-security" include ":servlet:java-configuration:hello-security-explicit" include ":servlet:java-configuration:max-sessions" +include ":servlet:java-configuration:preauth" include ":servlet:java-configuration:remember-me" include ":servlet:spring-boot:java:hello" include ":servlet:spring-boot:java:hello-security" @@ -50,3 +51,4 @@ include ":servlet:spring-boot:java:oauth2:resource-server:static" include ":servlet:spring-boot:java:oauth2:webclient" include ":servlet:spring-boot:java:saml2-login" include ":servlet:spring-boot:kotlin:hello-security" +