From be0af7d86f28667da003e76200754f592e7c923d Mon Sep 17 00:00:00 2001 From: klaas Date: Tue, 4 Nov 2025 12:49:23 +0100 Subject: [PATCH] =?UTF-8?q?Login,=20Registrierung=20und=20Freischalten=20p?= =?UTF-8?q?er=20api=20und=20web=20mit=20absolut=20rudiment=C3=A4ren=20webs?= =?UTF-8?q?eiten.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 2 + .gitignore | 33 ++ .mvn/wrapper/maven-wrapper.properties | 3 + LICENSE.md | 21 ++ README.md | 4 + mvnw | 295 ++++++++++++++++++ mvnw.cmd | 189 +++++++++++ pom.xml | 141 +++++++++ .../boergmann/tkd_api/TkdApiApplication.java | 13 + .../tkd_api/config/SecurityConfig.java | 70 +++++ .../controller/api/AuthController.java | 73 +++++ .../api/UserAdminApiController.java | 32 ++ .../controller/api/UserController.java | 27 ++ .../controller/web/AdminController.java | 46 +++ .../controller/web/HomeController.java | 5 + .../controller/web/RegisterController.java | 56 ++++ .../tkd_api/controller/web/WebController.java | 27 ++ .../it/boergmann/tkd_api/domain/AppUser.java | 45 +++ .../it/boergmann/tkd_api/domain/Role.java | 7 + .../tkd_api/dto/AppUserResponse.java | 16 + .../boergmann/tkd_api/dto/LoginRequest.java | 9 + .../boergmann/tkd_api/dto/LoginResponse.java | 10 + .../tkd_api/dto/RegisterRequest.java | 20 ++ .../tkd_api/repository/AppUserRepository.java | 11 + .../security/CustomUserDetailsService.java | 29 ++ .../security/JwtAuthenticationFilter.java | 58 ++++ .../tkd_api/security/JwtTokenProvider.java | 59 ++++ .../tkd_api/service/AppUserService.java | 45 +++ src/main/resources/application.properties | 8 + src/main/resources/application.yml | 16 + src/main/resources/templates/admin_users.html | 31 ++ src/main/resources/templates/login.html | 14 + src/main/resources/templates/profile.html | 11 + src/main/resources/templates/register.html | 25 ++ .../tkd_api/TkdApiApplicationTests.java | 13 + 35 files changed, 1464 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 LICENSE.md create mode 100644 README.md create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/it/boergmann/tkd_api/TkdApiApplication.java create mode 100644 src/main/java/it/boergmann/tkd_api/config/SecurityConfig.java create mode 100644 src/main/java/it/boergmann/tkd_api/controller/api/AuthController.java create mode 100644 src/main/java/it/boergmann/tkd_api/controller/api/UserAdminApiController.java create mode 100644 src/main/java/it/boergmann/tkd_api/controller/api/UserController.java create mode 100644 src/main/java/it/boergmann/tkd_api/controller/web/AdminController.java create mode 100644 src/main/java/it/boergmann/tkd_api/controller/web/HomeController.java create mode 100644 src/main/java/it/boergmann/tkd_api/controller/web/RegisterController.java create mode 100644 src/main/java/it/boergmann/tkd_api/controller/web/WebController.java create mode 100644 src/main/java/it/boergmann/tkd_api/domain/AppUser.java create mode 100644 src/main/java/it/boergmann/tkd_api/domain/Role.java create mode 100644 src/main/java/it/boergmann/tkd_api/dto/AppUserResponse.java create mode 100644 src/main/java/it/boergmann/tkd_api/dto/LoginRequest.java create mode 100644 src/main/java/it/boergmann/tkd_api/dto/LoginResponse.java create mode 100644 src/main/java/it/boergmann/tkd_api/dto/RegisterRequest.java create mode 100644 src/main/java/it/boergmann/tkd_api/repository/AppUserRepository.java create mode 100644 src/main/java/it/boergmann/tkd_api/security/CustomUserDetailsService.java create mode 100644 src/main/java/it/boergmann/tkd_api/security/JwtAuthenticationFilter.java create mode 100644 src/main/java/it/boergmann/tkd_api/security/JwtTokenProvider.java create mode 100644 src/main/java/it/boergmann/tkd_api/service/AppUserService.java create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml create mode 100644 src/main/resources/templates/admin_users.html create mode 100644 src/main/resources/templates/login.html create mode 100644 src/main/resources/templates/profile.html create mode 100644 src/main/resources/templates/register.html create mode 100644 src/test/java/it/boergmann/tkd_api/TkdApiApplicationTests.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..667aaef --- /dev/null +++ b/.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/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..c0bcafe --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..01264d8 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Klaas Börgmann + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..5d7eff9 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# Fullstack TKD App +Backend in Java mit API und Webserver +Frontend in Thymeleaf von Java und Svelte für node. +Spätere Anbindung an iOS App, Android App etc. \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..bd8896b --- /dev/null +++ b/mvnw @@ -0,0 +1,295 @@ +#!/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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.4 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..92450f9 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@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 http://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 Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..3bcb755 --- /dev/null +++ b/pom.xml @@ -0,0 +1,141 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.5.7 + + + it.boergmann + TkdApp + 0.0.1-SNAPSHOT + tkd_api + tkd_api + + + + + + + + + + + + + + + 21 + + + + 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-web + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity6 + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + io.jsonwebtoken + jjwt-api + 0.11.5 + + + io.jsonwebtoken + jjwt-impl + 0.11.5 + runtime + + + io.jsonwebtoken + jjwt-jackson + 0.11.5 + runtime + + + + jakarta.validation + jakarta.validation-api + 3.0.2 + + + + + org.hibernate.validator + hibernate-validator + 8.0.1.Final + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/it/boergmann/tkd_api/TkdApiApplication.java b/src/main/java/it/boergmann/tkd_api/TkdApiApplication.java new file mode 100644 index 0000000..bf8c029 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/TkdApiApplication.java @@ -0,0 +1,13 @@ +package it.boergmann.tkd_api; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TkdApiApplication { + + public static void main(String[] args) { + SpringApplication.run(TkdApiApplication.class, args); + } + +} diff --git a/src/main/java/it/boergmann/tkd_api/config/SecurityConfig.java b/src/main/java/it/boergmann/tkd_api/config/SecurityConfig.java new file mode 100644 index 0000000..35525a2 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/config/SecurityConfig.java @@ -0,0 +1,70 @@ +package it.boergmann.tkd_api.config; + +import it.boergmann.tkd_api.security.CustomUserDetailsService; +import it.boergmann.tkd_api.security.JwtAuthenticationFilter; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +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.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + private final CustomUserDetailsService userDetailsService; + private final JwtAuthenticationFilter jwtAuthFilter; + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http + .csrf(csrf -> csrf.disable()) + .sessionManagement(session -> session + .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED) + ) + .authorizeHttpRequests(auth -> auth + .requestMatchers("/api/login", "/api/register").permitAll() + .requestMatchers("/admin/**", "/api/users/**").hasRole("ADMIN") + .requestMatchers("/api/**").authenticated() + .requestMatchers("/register", "/login", "/css/**", "/js/**").permitAll() + .anyRequest().authenticated() + ) + .formLogin(form -> form + .loginPage("/login") + .defaultSuccessUrl("/me", true) + .permitAll() + ) + .addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter.class); + + + return http.build(); + } + + @Bean + public AuthenticationProvider authProvider() { + DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); + provider.setUserDetailsService(userDetailsService); + provider.setPasswordEncoder(passwordEncoder()); + return provider; + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public AuthenticationManager authManager(AuthenticationConfiguration config) throws Exception { + return config.getAuthenticationManager(); + } +} diff --git a/src/main/java/it/boergmann/tkd_api/controller/api/AuthController.java b/src/main/java/it/boergmann/tkd_api/controller/api/AuthController.java new file mode 100644 index 0000000..3fd459b --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/controller/api/AuthController.java @@ -0,0 +1,73 @@ +package it.boergmann.tkd_api.controller.api; + +import it.boergmann.tkd_api.domain.AppUser; +import it.boergmann.tkd_api.domain.Role; +import it.boergmann.tkd_api.dto.LoginRequest; +import it.boergmann.tkd_api.dto.LoginResponse; +import it.boergmann.tkd_api.dto.RegisterRequest; +import it.boergmann.tkd_api.repository.AppUserRepository; +import it.boergmann.tkd_api.security.JwtTokenProvider; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.web.bind.annotation.*; + +import jakarta.validation.Valid; +import java.util.List; +import java.util.Optional; + +@RestController +@RequestMapping("/api") +@RequiredArgsConstructor +public class AuthController { + + private final AuthenticationManager authenticationManager; + private final JwtTokenProvider tokenProvider; + private final AppUserRepository userRepository; + private final PasswordEncoder passwordEncoder; + + @PostMapping("/login") + public ResponseEntity login(@RequestBody LoginRequest loginRequest) { + try { + Authentication authentication = authenticationManager.authenticate( + new UsernamePasswordAuthenticationToken( + loginRequest.getUsername(), + loginRequest.getPassword() + ) + ); + + String token = tokenProvider.generateToken(authentication); + return ResponseEntity.ok(new LoginResponse(token)); + + } catch (AuthenticationException e) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Invalid credentials"); + } + } + + @PostMapping("/register") + public ResponseEntity register(@RequestBody @Valid RegisterRequest request) { + if (userRepository.findByUsername(request.getUsername()).isPresent()) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Benutzername bereits vergeben"); + } + + if (userRepository.findAll().stream().anyMatch(u -> u.getEmail().equalsIgnoreCase(request.getEmail()))) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Email bereits registriert"); + } + + AppUser user = AppUser.builder() + .username(request.getUsername()) + .password(passwordEncoder.encode(request.getPassword())) + .email(request.getEmail()) + .roles(List.of(Role.NONE)) // 👉 noch nicht freigeschaltet + .build(); + + userRepository.save(user); + + return ResponseEntity.status(HttpStatus.CREATED).body("Registrierung erfolgreich. Admin muss freischalten."); + } +} diff --git a/src/main/java/it/boergmann/tkd_api/controller/api/UserAdminApiController.java b/src/main/java/it/boergmann/tkd_api/controller/api/UserAdminApiController.java new file mode 100644 index 0000000..4d07b7e --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/controller/api/UserAdminApiController.java @@ -0,0 +1,32 @@ +package it.boergmann.tkd_api.controller.api; + +import it.boergmann.tkd_api.domain.Role; +import it.boergmann.tkd_api.service.AppUserService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.UUID; + +@RestController +@RequestMapping("/api/users") +@RequiredArgsConstructor +@PreAuthorize("hasRole('ADMIN')") +public class UserAdminApiController { + + private final AppUserService userService; + + @PostMapping("/{id}/enable") + public ResponseEntity enableUser(@PathVariable UUID id, @RequestParam Role role) { + userService.activateUser(id, role); + return ResponseEntity.ok(Map.of("message", "Benutzer freigeschaltet")); + } + + @PutMapping("/{id}/role") + public ResponseEntity updateRole(@PathVariable UUID id, @RequestParam Role role) { + userService.changeUserRole(id, role); + return ResponseEntity.ok(Map.of("message", "Benutzerrolle aktualisiert")); + } +} diff --git a/src/main/java/it/boergmann/tkd_api/controller/api/UserController.java b/src/main/java/it/boergmann/tkd_api/controller/api/UserController.java new file mode 100644 index 0000000..c511367 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/controller/api/UserController.java @@ -0,0 +1,27 @@ +package it.boergmann.tkd_api.controller.api; + +import it.boergmann.tkd_api.dto.AppUserResponse; +import it.boergmann.tkd_api.domain.AppUser; +import it.boergmann.tkd_api.service.AppUserService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api") +@RequiredArgsConstructor +public class UserController { + + private final AppUserService appUserService; + + @GetMapping("/me") + public ResponseEntity getCurrentUser() { + AppUser user = appUserService.getCurrentUser(); + AppUserResponse response = new AppUserResponse( + user.getId(), + user.getUsername(), + user.getRoles() + ); + return ResponseEntity.ok(response); + } +} diff --git a/src/main/java/it/boergmann/tkd_api/controller/web/AdminController.java b/src/main/java/it/boergmann/tkd_api/controller/web/AdminController.java new file mode 100644 index 0000000..dead173 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/controller/web/AdminController.java @@ -0,0 +1,46 @@ +package it.boergmann.tkd_api.controller.web; + +import it.boergmann.tkd_api.domain.AppUser; +import it.boergmann.tkd_api.domain.Role; +import it.boergmann.tkd_api.service.AppUserService; +import it.boergmann.tkd_api.repository.AppUserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.UUID; + +@Controller +@RequestMapping("/admin") +@RequiredArgsConstructor +@PreAuthorize("hasRole('ADMIN')") +public class AdminController { + + private final AppUserRepository userRepository; + private final AppUserService userService; + + @GetMapping("/users") + public String showPendingUsers(Model model) { + List pendingUsers = userRepository.findAll().stream() + .filter(u -> u.getRoles().contains(Role.NONE)) + .toList(); + + model.addAttribute("users", pendingUsers); + return "admin_users"; + } + + @PostMapping("/users/{id}/enable") + public String enableUser(@PathVariable UUID id, @RequestParam Role role) { + userService.activateUser(id, role); + return "redirect:/admin/users"; + } + + @PostMapping("/users/{id}/role") + public String changeUserRole(@PathVariable UUID id, @RequestParam Role role) { + userService.changeUserRole(id, role); + return "redirect:/admin/users"; + } +} diff --git a/src/main/java/it/boergmann/tkd_api/controller/web/HomeController.java b/src/main/java/it/boergmann/tkd_api/controller/web/HomeController.java new file mode 100644 index 0000000..846a62c --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/controller/web/HomeController.java @@ -0,0 +1,5 @@ +package it.boergmann.tkd_api.controller.web; + + +public class HomeController { +} diff --git a/src/main/java/it/boergmann/tkd_api/controller/web/RegisterController.java b/src/main/java/it/boergmann/tkd_api/controller/web/RegisterController.java new file mode 100644 index 0000000..7913985 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/controller/web/RegisterController.java @@ -0,0 +1,56 @@ +package it.boergmann.tkd_api.controller.web; + +import it.boergmann.tkd_api.dto.RegisterRequest; +import it.boergmann.tkd_api.domain.AppUser; +import it.boergmann.tkd_api.domain.Role; +import it.boergmann.tkd_api.repository.AppUserRepository; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Controller +@RequiredArgsConstructor +public class RegisterController { + + private final AppUserRepository userRepository; + private final PasswordEncoder passwordEncoder; + + @GetMapping("/register") + public String showRegisterForm(Model model) { + model.addAttribute("user", new RegisterRequest()); + return "register"; + } + + @PostMapping("/register") + public String handleRegister(@ModelAttribute("user") @Valid RegisterRequest request, BindingResult result, Model model) { + if (userRepository.findByUsername(request.getUsername()).isPresent()) { + result.rejectValue("username", "error.user", "Benutzername existiert bereits"); + } + + if (userRepository.findAll().stream().anyMatch(u -> u.getEmail().equalsIgnoreCase(request.getEmail()))) { + result.rejectValue("email", "error.email", "Email-Adresse ist bereits registriert"); + } + + if (result.hasErrors()) { + return "register"; + } + + AppUser newUser = AppUser.builder() + .username(request.getUsername()) + .email(request.getEmail()) + .password(passwordEncoder.encode(request.getPassword())) + .roles(List.of(Role.NONE)) + .build(); + + userRepository.save(newUser); + + model.addAttribute("message", "Registrierung erfolgreich! Bitte auf Freischaltung durch Admin warten."); + return "login"; + } +} diff --git a/src/main/java/it/boergmann/tkd_api/controller/web/WebController.java b/src/main/java/it/boergmann/tkd_api/controller/web/WebController.java new file mode 100644 index 0000000..c01ace1 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/controller/web/WebController.java @@ -0,0 +1,27 @@ +package it.boergmann.tkd_api.controller.web; + +import it.boergmann.tkd_api.service.AppUserService; +import it.boergmann.tkd_api.domain.AppUser; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@RequiredArgsConstructor +public class WebController { + + private final AppUserService appUserService; + + @GetMapping("/login") + public String loginPage() { + return "login"; // src/main/resources/templates/login.html + } + + @GetMapping("/me") + public String profilePage(Model model) { + AppUser user = appUserService.getCurrentUser(); + model.addAttribute("user", user); + return "profile"; // src/main/resources/templates/profile.html + } +} diff --git a/src/main/java/it/boergmann/tkd_api/domain/AppUser.java b/src/main/java/it/boergmann/tkd_api/domain/AppUser.java new file mode 100644 index 0000000..c8e962d --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/domain/AppUser.java @@ -0,0 +1,45 @@ +package it.boergmann.tkd_api.domain; + +import jakarta.persistence.*; +import lombok.*; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.List; +import java.util.UUID; + + +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class AppUser implements UserDetails{ + @Id + @GeneratedValue + private UUID id; + @Column(nullable = false, unique = true) + private String username; + + @Column(nullable = false, unique = true) + private String email; + + private String password; + + @ElementCollection(fetch = FetchType.EAGER) + @Enumerated(EnumType.STRING) + private List roles; + + @Override + public Collection getAuthorities() { + return roles.stream() + .map(role ->(GrantedAuthority)() -> "ROLE_" +role) + .toList(); + } + + @Override public boolean isAccountNonExpired() { return true; } + @Override public boolean isAccountNonLocked() { return true; } + @Override public boolean isCredentialsNonExpired() { return true; } + @Override public boolean isEnabled() { return true; } +} diff --git a/src/main/java/it/boergmann/tkd_api/domain/Role.java b/src/main/java/it/boergmann/tkd_api/domain/Role.java new file mode 100644 index 0000000..096059a --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/domain/Role.java @@ -0,0 +1,7 @@ +package it.boergmann.tkd_api.domain; + +public enum Role { + NONE, + USER, + ADMIN +} diff --git a/src/main/java/it/boergmann/tkd_api/dto/AppUserResponse.java b/src/main/java/it/boergmann/tkd_api/dto/AppUserResponse.java new file mode 100644 index 0000000..1033f18 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/dto/AppUserResponse.java @@ -0,0 +1,16 @@ +package it.boergmann.tkd_api.dto; + +import it.boergmann.tkd_api.domain.Role; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; +import java.util.UUID; + +@Data +@AllArgsConstructor +public class AppUserResponse { + private UUID id; + private String username; + private List roles; +} diff --git a/src/main/java/it/boergmann/tkd_api/dto/LoginRequest.java b/src/main/java/it/boergmann/tkd_api/dto/LoginRequest.java new file mode 100644 index 0000000..eb7215c --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/dto/LoginRequest.java @@ -0,0 +1,9 @@ +package it.boergmann.tkd_api.dto; + +import lombok.Data; + +@Data +public class LoginRequest { + private String username; + private String password; +} \ No newline at end of file diff --git a/src/main/java/it/boergmann/tkd_api/dto/LoginResponse.java b/src/main/java/it/boergmann/tkd_api/dto/LoginResponse.java new file mode 100644 index 0000000..c1c04d5 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/dto/LoginResponse.java @@ -0,0 +1,10 @@ +package it.boergmann.tkd_api.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class LoginResponse { + private String token; +} diff --git a/src/main/java/it/boergmann/tkd_api/dto/RegisterRequest.java b/src/main/java/it/boergmann/tkd_api/dto/RegisterRequest.java new file mode 100644 index 0000000..f5c0519 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/dto/RegisterRequest.java @@ -0,0 +1,20 @@ +package it.boergmann.tkd_api.dto; + + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +@Data +public class RegisterRequest { + @NotBlank + private String username; + + @NotBlank + private String password; + + @Email + @NotBlank + private String email; + +} diff --git a/src/main/java/it/boergmann/tkd_api/repository/AppUserRepository.java b/src/main/java/it/boergmann/tkd_api/repository/AppUserRepository.java new file mode 100644 index 0000000..f04f5b4 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/repository/AppUserRepository.java @@ -0,0 +1,11 @@ +package it.boergmann.tkd_api.repository; + +import it.boergmann.tkd_api.domain.AppUser; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; +import java.util.UUID; + +public interface AppUserRepository extends JpaRepository { + Optional findByUsername(String username); +} \ No newline at end of file diff --git a/src/main/java/it/boergmann/tkd_api/security/CustomUserDetailsService.java b/src/main/java/it/boergmann/tkd_api/security/CustomUserDetailsService.java new file mode 100644 index 0000000..6308f4d --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/security/CustomUserDetailsService.java @@ -0,0 +1,29 @@ +package it.boergmann.tkd_api.security; + +import it.boergmann.tkd_api.domain.AppUser; +import it.boergmann.tkd_api.domain.Role; +import it.boergmann.tkd_api.repository.AppUserRepository; +import lombok.RequiredArgsConstructor; +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; + +@Service +@RequiredArgsConstructor +public class CustomUserDetailsService implements UserDetailsService { + + private final AppUserRepository userRepository; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + AppUser user = userRepository.findByUsername(username) + .orElseThrow(() -> new UsernameNotFoundException("User not found: " + username)); + + if (user.getRoles() == null || user.getRoles().contains(Role.NONE) || user.getRoles().isEmpty()) { + throw new UsernameNotFoundException("User has no active roles"); + } + + return user; + } +} diff --git a/src/main/java/it/boergmann/tkd_api/security/JwtAuthenticationFilter.java b/src/main/java/it/boergmann/tkd_api/security/JwtAuthenticationFilter.java new file mode 100644 index 0000000..490e457 --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/security/JwtAuthenticationFilter.java @@ -0,0 +1,58 @@ +package it.boergmann.tkd_api.security; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Component +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + private final JwtTokenProvider jwtTokenProvider; + private final CustomUserDetailsService userDetailsService; + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain) + throws ServletException, IOException { + + final String authHeader = request.getHeader("Authorization"); + + String jwt = null; + String username = null; + + if (authHeader != null && authHeader.startsWith("Bearer ")) { + jwt = authHeader.substring(7); + username = jwtTokenProvider.getUsernameFromToken(jwt); + } + + if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { + UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (jwtTokenProvider.validateToken(jwt)) { + UsernamePasswordAuthenticationToken authToken = + new UsernamePasswordAuthenticationToken( + userDetails, + null, + userDetails.getAuthorities() + ); + authToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + + SecurityContextHolder.getContext().setAuthentication(authToken); + } + } + + filterChain.doFilter(request, response); + } +} diff --git a/src/main/java/it/boergmann/tkd_api/security/JwtTokenProvider.java b/src/main/java/it/boergmann/tkd_api/security/JwtTokenProvider.java new file mode 100644 index 0000000..60fe77d --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/security/JwtTokenProvider.java @@ -0,0 +1,59 @@ +package it.boergmann.tkd_api.security; + +import io.jsonwebtoken.*; +import io.jsonwebtoken.security.Keys; +import jakarta.annotation.PostConstruct; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; + +import java.security.Key; +import java.util.Date; + +@Component +public class JwtTokenProvider { + + @Value("${jwt.secret}") + private String secret; + + @Value("${jwt.expiration-ms}") + private long expirationMs; + + private Key key; + + @PostConstruct + public void init() { + this.key = Keys.hmacShaKeyFor(secret.getBytes()); + } + + public String generateToken(Authentication authentication) { + String username = authentication.getName(); + Date now = new Date(); + Date expiryDate = new Date(now.getTime() + expirationMs); + + return Jwts.builder() + .setSubject(username) + .setIssuedAt(now) + .setExpiration(expiryDate) + .signWith(key, SignatureAlgorithm.HS256) + .compact(); + } + + public String getUsernameFromToken(String token) { + return Jwts.parserBuilder() + .setSigningKey(key) + .build() + .parseClaimsJws(token) + .getBody() + .getSubject(); + } + + public boolean validateToken(String token) { + try { + Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token); + return true; + } catch (JwtException | IllegalArgumentException e) { + return false; + } + } +} diff --git a/src/main/java/it/boergmann/tkd_api/service/AppUserService.java b/src/main/java/it/boergmann/tkd_api/service/AppUserService.java new file mode 100644 index 0000000..4f3b6eb --- /dev/null +++ b/src/main/java/it/boergmann/tkd_api/service/AppUserService.java @@ -0,0 +1,45 @@ +package it.boergmann.tkd_api.service; + +import it.boergmann.tkd_api.domain.AppUser; +import it.boergmann.tkd_api.domain.Role; +import it.boergmann.tkd_api.repository.AppUserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class AppUserService { + + private final AppUserRepository userRepository; + + public AppUser getCurrentUser() { + String username = SecurityContextHolder.getContext().getAuthentication().getName(); + return userRepository.findByUsername(username) + .orElseThrow(() -> new UsernameNotFoundException("User not found: " + username)); + } + + public void activateUser(UUID userId, Role newRole) { + AppUser user = userRepository.findById(userId) + .orElseThrow(() -> new IllegalArgumentException("User not found")); + + if (!user.getRoles().contains(Role.NONE)) { + throw new IllegalStateException("User is already activated"); + } + + user.setRoles(List.of(newRole)); // Nur eine Rolle zuweisen – oder erweitern + userRepository.save(user); + } + + public void changeUserRole(UUID userId, Role newRole) { + AppUser user = userRepository.findById(userId) + .orElseThrow(() -> new IllegalArgumentException("User not found")); + + user.setRoles(List.of(newRole)); // 👈 Rolle hart überschrieben (alternativ: erweitern) + userRepository.save(user); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..2bdfcff --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,8 @@ +spring.application.name=tkd_api + +# tkduser +# Sanctuary1-Crane-Erupt-Bogged + +# admin +# $2a$12$NP7fEloraNQqA4rP28ftPOeKmYLAAY2MeRwKcsUmXXFrwfDhbhZge +# 2d4dfde4-6a0b-4be7-8973-e5edc4452a56 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..f675606 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,16 @@ +spring: + datasource: + url: jdbc:postgresql://localhost:5432/tkd + username: tkduser + password: Sanctuary1-Crane-Erupt-Bogged + jpa: + hibernate: + ddl-auto: update + properties: + hibernate: + dialect: org.hibernate.dialect.PostgreSQLDialect + open-in-view: false + +jwt: + secret: 2T5tOkcLVT8vKfi0qyS0HxYnI2DklK9Mr0BHWWQgsjaAtO3aX5QhVi93h7jVPYiY + expiration-ms: 86400000 # 1 Tag \ No newline at end of file diff --git a/src/main/resources/templates/admin_users.html b/src/main/resources/templates/admin_users.html new file mode 100644 index 0000000..ee40913 --- /dev/null +++ b/src/main/resources/templates/admin_users.html @@ -0,0 +1,31 @@ + + + + Benutzer freischalten + + +

Offene Registrierungen

+ + + + + + + + + + + + +
BenutzernameEmailAktion
BenutzerEmail +
+ + +
+
+ + diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html new file mode 100644 index 0000000..b935668 --- /dev/null +++ b/src/main/resources/templates/login.html @@ -0,0 +1,14 @@ + + + + Login + + +

Login

+
+
+
+ +
+ + diff --git a/src/main/resources/templates/profile.html b/src/main/resources/templates/profile.html new file mode 100644 index 0000000..fdc8141 --- /dev/null +++ b/src/main/resources/templates/profile.html @@ -0,0 +1,11 @@ + + + + Profil + + +

Willkommen, Nutzer!

+

Deine Rollen: []

+Logout + + diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html new file mode 100644 index 0000000..28255bb --- /dev/null +++ b/src/main/resources/templates/register.html @@ -0,0 +1,25 @@ + + + + Registrierung + + +

Registrierung

+ +
+
+
+
+ +
+ +
+

+
+
+

+
+ +

Zurück zum Login

+ + diff --git a/src/test/java/it/boergmann/tkd_api/TkdApiApplicationTests.java b/src/test/java/it/boergmann/tkd_api/TkdApiApplicationTests.java new file mode 100644 index 0000000..ac03adc --- /dev/null +++ b/src/test/java/it/boergmann/tkd_api/TkdApiApplicationTests.java @@ -0,0 +1,13 @@ +package it.boergmann.tkd_api; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TkdApiApplicationTests { + + @Test + void contextLoads() { + } + +}