diff --git a/JWTApp/.gitignore b/JWTApp/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/JWTApp/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/JWTApp/.mvn/wrapper/MavenWrapperDownloader.java b/JWTApp/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..e76d1f32 --- /dev/null +++ b/JWTApp/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present 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. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/JWTApp/.mvn/wrapper/maven-wrapper.jar b/JWTApp/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..2cc7d4a5 Binary files /dev/null and b/JWTApp/.mvn/wrapper/maven-wrapper.jar differ diff --git a/JWTApp/.mvn/wrapper/maven-wrapper.properties b/JWTApp/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..ffdc10e5 --- /dev/null +++ b/JWTApp/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/JWTApp/mvnw b/JWTApp/mvnw new file mode 100755 index 00000000..a16b5431 --- /dev/null +++ b/JWTApp/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + 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 + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/JWTApp/mvnw.cmd b/JWTApp/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/JWTApp/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. 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, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/JWTApp/pom.xml b/JWTApp/pom.xml new file mode 100644 index 00000000..da23f253 --- /dev/null +++ b/JWTApp/pom.xml @@ -0,0 +1,81 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.1 + + + ru.alishev.springcourse + SpringSecurityApp + 0.0.1-SNAPSHOT + FirstSecurityApp + Spring Boot app with Spring Security + + 11 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-web + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity5 + + + + org.postgresql + postgresql + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + org.modelmapper + modelmapper + 3.0.0 + + + com.auth0 + java-jwt + 3.18.3 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/SpringSecurityApp.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/SpringSecurityApp.java new file mode 100644 index 00000000..b606a27a --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/SpringSecurityApp.java @@ -0,0 +1,19 @@ +package ru.alishev.springcourse.FirstSecurityApp; + +import org.modelmapper.ModelMapper; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +public class SpringSecurityApp { + + public static void main(String[] args) { + SpringApplication.run(SpringSecurityApp.class, args); + } + + @Bean + public ModelMapper modelMapper() { + return new ModelMapper(); + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/config/JWTFilter.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/config/JWTFilter.java new file mode 100644 index 00000000..8d463e5b --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/config/JWTFilter.java @@ -0,0 +1,64 @@ +package ru.alishev.springcourse.FirstSecurityApp.config; + +import com.auth0.jwt.exceptions.JWTVerificationException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; +import ru.alishev.springcourse.FirstSecurityApp.security.JWTUtil; +import ru.alishev.springcourse.FirstSecurityApp.services.PersonDetailsService; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author Neil Alishev + */ +@Component +public class JWTFilter extends OncePerRequestFilter { + + private final JWTUtil jwtUtil; + private final PersonDetailsService personDetailsService; + + public JWTFilter(JWTUtil jwtUtil, PersonDetailsService personDetailsService) { + this.jwtUtil = jwtUtil; + this.personDetailsService = personDetailsService; + } + + @Override + protected void doFilterInternal(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, FilterChain filterChain) throws ServletException, IOException { + String authHeader = httpServletRequest.getHeader("Authorization"); + + if (authHeader != null && !authHeader.isBlank() && authHeader.startsWith("Bearer ")) { + String jwt = authHeader.substring(7); + + if (jwt.isBlank()) { + httpServletResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, + "Invalid JWT Token in Bearer Header"); + } else { + try { + String username = jwtUtil.validateTokenAndRetrieveClaim(jwt); + UserDetails userDetails = personDetailsService.loadUserByUsername(username); + + UsernamePasswordAuthenticationToken authToken = + new UsernamePasswordAuthenticationToken(userDetails, + userDetails.getPassword(), + userDetails.getAuthorities()); + + if (SecurityContextHolder.getContext().getAuthentication() == null) { + SecurityContextHolder.getContext().setAuthentication(authToken); + } + } catch (JWTVerificationException exc) { + httpServletResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, + "Invalid JWT Token"); + } + } + } + + filterChain.doFilter(httpServletRequest, httpServletResponse); + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/config/SecurityConfig.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/config/SecurityConfig.java new file mode 100644 index 00000000..9fac166b --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/config/SecurityConfig.java @@ -0,0 +1,76 @@ +package ru.alishev.springcourse.FirstSecurityApp.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +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.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import ru.alishev.springcourse.FirstSecurityApp.services.PersonDetailsService; + +/** + * @author Neil Alishev + */ +@EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true) +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + private final PersonDetailsService personDetailsService; + private final JWTFilter jwtFilter; + + @Autowired + public SecurityConfig(PersonDetailsService personDetailsService, JWTFilter jwtFilter) { + this.personDetailsService = personDetailsService; + this.jwtFilter = jwtFilter; + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + // конфигурируем сам Spring Security + // конфигурируем авторизацию + http + .csrf().disable() + .authorizeRequests() + .antMatchers("/admin").hasRole("ADMIN") + .antMatchers("/auth/login", "/auth/registration", "/error").permitAll() + .anyRequest().hasAnyRole("USER", "ADMIN") + .and() + .formLogin().loginPage("/auth/login") + .loginProcessingUrl("/process_login") + .defaultSuccessUrl("/hello", true) + .failureUrl("/auth/login?error") + .and() + .logout() + .logoutUrl("/logout") + .logoutSuccessUrl("/auth/login") + .and() + .sessionManagement() + .sessionCreationPolicy(SessionCreationPolicy.STATELESS); + + http.addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class); + } + + // Настраиваем аутентификацию + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(personDetailsService) + .passwordEncoder(getPasswordEncoder()); + } + + @Bean + public PasswordEncoder getPasswordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + @Override + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/controllers/AuthController.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/controllers/AuthController.java new file mode 100644 index 00000000..e3e0d78d --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/controllers/AuthController.java @@ -0,0 +1,79 @@ +package ru.alishev.springcourse.FirstSecurityApp.controllers; + +import org.modelmapper.ModelMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; +import ru.alishev.springcourse.FirstSecurityApp.dto.AuthenticationDTO; +import ru.alishev.springcourse.FirstSecurityApp.dto.PersonDTO; +import ru.alishev.springcourse.FirstSecurityApp.models.Person; +import ru.alishev.springcourse.FirstSecurityApp.security.JWTUtil; +import ru.alishev.springcourse.FirstSecurityApp.services.RegistrationService; +import ru.alishev.springcourse.FirstSecurityApp.util.PersonValidator; + +import javax.validation.Valid; +import java.util.Map; + +/** + * @author Neil Alishev + */ +@RestController +@RequestMapping("/auth") +public class AuthController { + + private final RegistrationService registrationService; + private final PersonValidator personValidator; + private final JWTUtil jwtUtil; + private final ModelMapper modelMapper; + private final AuthenticationManager authenticationManager; + + @Autowired + public AuthController(RegistrationService registrationService, PersonValidator personValidator, + JWTUtil jwtUtil, ModelMapper modelMapper, AuthenticationManager authenticationManager) { + this.registrationService = registrationService; + this.personValidator = personValidator; + this.jwtUtil = jwtUtil; + this.modelMapper = modelMapper; + this.authenticationManager = authenticationManager; + } + + @PostMapping("/registration") + public Map performRegistration(@RequestBody @Valid PersonDTO personDTO, + BindingResult bindingResult) { + Person person = convertToPerson(personDTO); + + personValidator.validate(person, bindingResult); + + if (bindingResult.hasErrors()) { + return Map.of("message", "Ошибка!"); + } + + registrationService.register(person); + + String token = jwtUtil.generateToken(person.getUsername()); + return Map.of("jwt-token", token); + } + + @PostMapping("/login") + public Map performLogin(@RequestBody AuthenticationDTO authenticationDTO) { + UsernamePasswordAuthenticationToken authInputToken = + new UsernamePasswordAuthenticationToken(authenticationDTO.getUsername(), + authenticationDTO.getPassword()); + + try { + authenticationManager.authenticate(authInputToken); + } catch (BadCredentialsException e) { + return Map.of("message", "Incorrect credentials!"); + } + + String token = jwtUtil.generateToken(authenticationDTO.getUsername()); + return Map.of("jwt-token", token); + } + + public Person convertToPerson(PersonDTO personDTO) { + return this.modelMapper.map(personDTO, Person.class); + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/controllers/HelloController.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/controllers/HelloController.java new file mode 100644 index 00000000..46d03e1b --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/controllers/HelloController.java @@ -0,0 +1,43 @@ +package ru.alishev.springcourse.FirstSecurityApp.controllers; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import ru.alishev.springcourse.FirstSecurityApp.security.PersonDetails; +import ru.alishev.springcourse.FirstSecurityApp.services.AdminService; + +/** + * @author Neil Alishev + */ +@Controller +public class HelloController { + private final AdminService adminService; + + @Autowired + public HelloController(AdminService adminService) { + this.adminService = adminService; + } + + @GetMapping("/hello") + public String sayHello() { + return "hello"; + } + + @GetMapping("/showUserInfo") + @ResponseBody + public String showUserInfo() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + PersonDetails personDetails = (PersonDetails) authentication.getPrincipal(); + + return personDetails.getUsername(); + } + + @GetMapping("/admin") + public String adminPage() { + adminService.doAdminStuff(); + return "admin"; + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/dto/AuthenticationDTO.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/dto/AuthenticationDTO.java new file mode 100644 index 00000000..f60cb05c --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/dto/AuthenticationDTO.java @@ -0,0 +1,31 @@ +package ru.alishev.springcourse.FirstSecurityApp.dto; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; + +/** + * @author Neil Alishev + */ +public class AuthenticationDTO { + @NotEmpty(message = "Имя не должно быть пустым") + @Size(min = 2, max = 100, message = "Имя должно быть от 2 до 100 символов длиной") + private String username; + + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/dto/PersonDTO.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/dto/PersonDTO.java new file mode 100644 index 00000000..90d56540 --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/dto/PersonDTO.java @@ -0,0 +1,43 @@ +package ru.alishev.springcourse.FirstSecurityApp.dto; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; + +/** + * @author Neil Alishev + */ +public class PersonDTO { + @NotEmpty(message = "Имя не должно быть пустым") + @Size(min = 2, max = 100, message = "Имя должно быть от 2 до 100 символов длиной") + private String username; + + @Min(value = 1900, message = "Год рождения должен быть больше, чем 1900") + private int yearOfBirth; + + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public int getYearOfBirth() { + return yearOfBirth; + } + + public void setYearOfBirth(int yearOfBirth) { + this.yearOfBirth = yearOfBirth; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/models/Person.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/models/Person.java new file mode 100644 index 00000000..77f97f16 --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/models/Person.java @@ -0,0 +1,92 @@ +package ru.alishev.springcourse.FirstSecurityApp.models; + +import javax.persistence.*; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Size; + +/** + * @author Neil Alishev + */ +@Entity +@Table(name = "Person") +public class Person { + @Id + @Column(name = "id") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private int id; + + @NotEmpty(message = "Имя не должно быть пустым") + @Size(min = 2, max = 100, message = "Имя должно быть от 2 до 100 символов длиной") + @Column(name = "username") + private String username; + + @Min(value = 1900, message = "Год рождения должен быть больше, чем 1900") + @Column(name = "year_of_birth") + private int yearOfBirth; + + @Column(name = "password") + private String password; + + @Column(name = "role") + private String role; + + // Конструктор по умолчанию нужен для Spring + public Person() { + } + + public Person(String username, int yearOfBirth) { + this.username = username; + this.yearOfBirth = yearOfBirth; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public int getYearOfBirth() { + return yearOfBirth; + } + + public void setYearOfBirth(int yearOfBirth) { + this.yearOfBirth = yearOfBirth; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + @Override + public String toString() { + return "Person{" + + "id=" + id + + ", username='" + username + '\'' + + ", yearOfBirth=" + yearOfBirth + + ", password='" + password + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/repositories/PeopleRepository.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/repositories/PeopleRepository.java new file mode 100644 index 00000000..569af7a4 --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/repositories/PeopleRepository.java @@ -0,0 +1,15 @@ +package ru.alishev.springcourse.FirstSecurityApp.repositories; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import ru.alishev.springcourse.FirstSecurityApp.models.Person; + +import java.util.Optional; + +/** + * @author Neil Alishev + */ +@Repository +public interface PeopleRepository extends JpaRepository { + Optional findByUsername(String username); +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/security/JWTUtil.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/security/JWTUtil.java new file mode 100644 index 00000000..c93ee6c6 --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/security/JWTUtil.java @@ -0,0 +1,44 @@ +package ru.alishev.springcourse.FirstSecurityApp.security; + +import com.auth0.jwt.JWT; +import com.auth0.jwt.JWTVerifier; +import com.auth0.jwt.algorithms.Algorithm; +import com.auth0.jwt.exceptions.JWTVerificationException; +import com.auth0.jwt.interfaces.DecodedJWT; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.time.ZonedDateTime; +import java.util.Date; + +/** + * @author Neil Alishev + */ +@Component +public class JWTUtil { + + @Value("${jwt_secret}") + private String secret; + + public String generateToken(String username) { + Date expirationDate = Date.from(ZonedDateTime.now().plusMinutes(60).toInstant()); + + return JWT.create() + .withSubject("User details") + .withClaim("username", username) + .withIssuedAt(new Date()) + .withIssuer("alishev") + .withExpiresAt(expirationDate) + .sign(Algorithm.HMAC256(secret)); + } + + public String validateTokenAndRetrieveClaim(String token) throws JWTVerificationException { + JWTVerifier verifier = JWT.require(Algorithm.HMAC256(secret)) + .withSubject("User details") + .withIssuer("alishev") + .build(); + + DecodedJWT jwt = verifier.verify(token); + return jwt.getClaim("username").asString(); + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/security/PersonDetails.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/security/PersonDetails.java new file mode 100644 index 00000000..dc73b6e2 --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/security/PersonDetails.java @@ -0,0 +1,62 @@ +package ru.alishev.springcourse.FirstSecurityApp.security; + +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import ru.alishev.springcourse.FirstSecurityApp.models.Person; + +import java.util.Collection; +import java.util.Collections; + +/** + * @author Neil Alishev + */ +public class PersonDetails implements UserDetails { + private final Person person; + + public PersonDetails(Person person) { + this.person = person; + } + + @Override + public Collection getAuthorities() { + // SHOW_ACCOUNT, WITHDRAW_MONEY, SEND_MONEY + // ROLE_ADMIN, ROLE_USER - это роли + return Collections.singletonList(new SimpleGrantedAuthority(person.getRole())); + } + + @Override + public String getPassword() { + return this.person.getPassword(); + } + + @Override + public String getUsername() { + return this.person.getUsername(); + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } + + // Нужно, чтобы получать данные аутентифицированного пользователя + public Person getPerson() { + return this.person; + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/services/AdminService.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/services/AdminService.java new file mode 100644 index 00000000..545e4374 --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/services/AdminService.java @@ -0,0 +1,16 @@ +package ru.alishev.springcourse.FirstSecurityApp.services; + +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Service; + +/** + * @author Neil Alishev + */ +@Service +public class AdminService { + + @PreAuthorize("hasRole('ROLE_ADMIN') and hasRole('ROLE_SOME_OTHER')") + public void doAdminStuff() { + System.out.println("Only admin here"); + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/services/PersonDetailsService.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/services/PersonDetailsService.java new file mode 100644 index 00000000..4ca5432a --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/services/PersonDetailsService.java @@ -0,0 +1,36 @@ +package ru.alishev.springcourse.FirstSecurityApp.services; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; +import ru.alishev.springcourse.FirstSecurityApp.models.Person; +import ru.alishev.springcourse.FirstSecurityApp.repositories.PeopleRepository; +import ru.alishev.springcourse.FirstSecurityApp.security.PersonDetails; + +import java.util.Optional; + +/** + * @author Neil Alishev + */ +@Service +public class PersonDetailsService implements UserDetailsService { + + private final PeopleRepository peopleRepository; + + @Autowired + public PersonDetailsService(PeopleRepository peopleRepository) { + this.peopleRepository = peopleRepository; + } + + @Override + public UserDetails loadUserByUsername(String s) throws UsernameNotFoundException { + Optional person = peopleRepository.findByUsername(s); + + if (person.isEmpty()) + throw new UsernameNotFoundException("User not found"); + + return new PersonDetails(person.get()); + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/services/RegistrationService.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/services/RegistrationService.java new file mode 100644 index 00000000..38cb0eec --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/services/RegistrationService.java @@ -0,0 +1,31 @@ +package ru.alishev.springcourse.FirstSecurityApp.services; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.alishev.springcourse.FirstSecurityApp.models.Person; +import ru.alishev.springcourse.FirstSecurityApp.repositories.PeopleRepository; + +/** + * @author Neil Alishev + */ +@Service +public class RegistrationService { + + private final PeopleRepository peopleRepository; + private final PasswordEncoder passwordEncoder; + + @Autowired + public RegistrationService(PeopleRepository peopleRepository, PasswordEncoder passwordEncoder) { + this.peopleRepository = peopleRepository; + this.passwordEncoder = passwordEncoder; + } + + @Transactional + public void register(Person person) { + person.setPassword(passwordEncoder.encode(person.getPassword())); + person.setRole("ROLE_USER"); + peopleRepository.save(person); + } +} diff --git a/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/util/PersonValidator.java b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/util/PersonValidator.java new file mode 100644 index 00000000..93694cc9 --- /dev/null +++ b/JWTApp/src/main/java/ru/alishev/springcourse/FirstSecurityApp/util/PersonValidator.java @@ -0,0 +1,41 @@ +package ru.alishev.springcourse.FirstSecurityApp.util; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Component; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; +import ru.alishev.springcourse.FirstSecurityApp.models.Person; +import ru.alishev.springcourse.FirstSecurityApp.services.PersonDetailsService; + +/** + * @author Neil Alishev + */ +@Component +public class PersonValidator implements Validator { + + private final PersonDetailsService personDetailsService; + + @Autowired + public PersonValidator(PersonDetailsService personDetailsService) { + this.personDetailsService = personDetailsService; + } + + @Override + public boolean supports(Class aClass) { + return Person.class.equals(aClass); + } + + @Override + public void validate(Object o, Errors errors) { + Person person = (Person) o; + + try { + personDetailsService.loadUserByUsername(person.getUsername()); + } catch (UsernameNotFoundException ignored) { + return; // все ок, пользователь не найден + } + + errors.rejectValue("username", "", "Человек с таким именем пользователя уже существует"); + } +} diff --git a/JWTApp/src/main/resources/application.properties b/JWTApp/src/main/resources/application.properties new file mode 100644 index 00000000..97c20e5a --- /dev/null +++ b/JWTApp/src/main/resources/application.properties @@ -0,0 +1,9 @@ +spring.datasource.driverClassName=org.postgresql.Driver +spring.datasource.url=jdbc:postgresql://localhost:5432/security_app_db +spring.datasource.username=postgres +spring.datasource.password=postgres + +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +spring.jpa.properties.hibernate.show_sql=true + +jwt_secret=SECRET \ No newline at end of file diff --git a/JWTApp/src/main/resources/templates/admin.html b/JWTApp/src/main/resources/templates/admin.html new file mode 100644 index 00000000..4e64e0a1 --- /dev/null +++ b/JWTApp/src/main/resources/templates/admin.html @@ -0,0 +1,10 @@ + + + + + Admin page + + +Admin page + + \ No newline at end of file diff --git a/JWTApp/src/main/resources/templates/auth/login.html b/JWTApp/src/main/resources/templates/auth/login.html new file mode 100644 index 00000000..f1cc287e --- /dev/null +++ b/JWTApp/src/main/resources/templates/auth/login.html @@ -0,0 +1,26 @@ + + + + + Login page + + + +
+ + + + +
+ + +
+ + +
+ Неправильные имя или пароль +
+
+ + + \ No newline at end of file diff --git a/JWTApp/src/main/resources/templates/auth/registration.html b/JWTApp/src/main/resources/templates/auth/registration.html new file mode 100644 index 00000000..990ab437 --- /dev/null +++ b/JWTApp/src/main/resources/templates/auth/registration.html @@ -0,0 +1,27 @@ + + + + + Registration + + + +
+ + +
Username Error
+
+ + +
Year of birth Error +
+
+ + +
Password Error
+
+ +
+ + + \ No newline at end of file diff --git a/JWTApp/src/main/resources/templates/hello.html b/JWTApp/src/main/resources/templates/hello.html new file mode 100644 index 00000000..b5f49686 --- /dev/null +++ b/JWTApp/src/main/resources/templates/hello.html @@ -0,0 +1,14 @@ + + + + + Hello + + +Hello world! +
+ +
+ + + \ No newline at end of file diff --git a/JWTApp/src/test/java/ru/alishev/springcourse/FirstSecurityApp/SpringSecurityAppTests.java b/JWTApp/src/test/java/ru/alishev/springcourse/FirstSecurityApp/SpringSecurityAppTests.java new file mode 100644 index 00000000..ffd4aff2 --- /dev/null +++ b/JWTApp/src/test/java/ru/alishev/springcourse/FirstSecurityApp/SpringSecurityAppTests.java @@ -0,0 +1,13 @@ +package ru.alishev.springcourse.FirstSecurityApp; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SpringSecurityAppTests { + + @Test + void contextLoads() { + } + +}