From bdefcf5162c9464f236eba927d6ed24a50f62a7e Mon Sep 17 00:00:00 2001 From: andre00bejarano00vaca Date: Wed, 10 Sep 2025 17:36:04 -0400 Subject: [PATCH] auth listo y contador terminados --- .gitattributes | 2 + .gitignore | 33 ++ .mvn/wrapper/maven-wrapper.properties | 2 + mvnw | 295 ++++++++++++++++++ mvnw.cmd | 189 +++++++++++ pom.xml | 77 +++++ .../FercoganbackendApplication.java | 13 + .../component/ContadorWebSocketHandler.java | 34 ++ .../configuration/SecurityConfig.java | 55 ++++ .../configuration/WebSocketConfig.java | 21 ++ .../controller/AppController.java | 55 ++++ .../controller/ContadorController.java | 30 ++ .../example/fercoganbackend/entity/Rol.java | 6 + .../fercoganbackend/entity/Usuario.java | 67 ++++ .../otros/UsuarioPrincipal.java | 54 ++++ .../repository/UsuarioRepository.java | 9 + .../service/ContadorService.java | 33 ++ .../service/UsuarioDetailsService.java | 47 +++ .../service/UsuarioService.java | 42 +++ src/main/resources/application.properties | 13 + .../FercoganbackendApplicationTests.java | 13 + 21 files changed, 1090 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/example/fercoganbackend/FercoganbackendApplication.java create mode 100644 src/main/java/com/example/fercoganbackend/component/ContadorWebSocketHandler.java create mode 100644 src/main/java/com/example/fercoganbackend/configuration/SecurityConfig.java create mode 100644 src/main/java/com/example/fercoganbackend/configuration/WebSocketConfig.java create mode 100644 src/main/java/com/example/fercoganbackend/controller/AppController.java create mode 100644 src/main/java/com/example/fercoganbackend/controller/ContadorController.java create mode 100644 src/main/java/com/example/fercoganbackend/entity/Rol.java create mode 100644 src/main/java/com/example/fercoganbackend/entity/Usuario.java create mode 100644 src/main/java/com/example/fercoganbackend/otros/UsuarioPrincipal.java create mode 100644 src/main/java/com/example/fercoganbackend/repository/UsuarioRepository.java create mode 100644 src/main/java/com/example/fercoganbackend/service/ContadorService.java create mode 100644 src/main/java/com/example/fercoganbackend/service/UsuarioDetailsService.java create mode 100644 src/main/java/com/example/fercoganbackend/service/UsuarioService.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/example/fercoganbackend/FercoganbackendApplicationTests.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..44f3cf2 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +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/mvnw b/mvnw new file mode 100755 index 0000000..e9cf8d3 --- /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.3 +# +# 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..2e2dbe0 --- /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.3 +@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..c8501a9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.5.5 + + + com.example + fercoganbackend + 0.0.1-SNAPSHOT + fercoganbackend + Demo project for Spring Boot + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-websocket + + + + com.mysql + mysql-connector-j + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + org.springframework.boot + spring-boot-starter-security + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/example/fercoganbackend/FercoganbackendApplication.java b/src/main/java/com/example/fercoganbackend/FercoganbackendApplication.java new file mode 100644 index 0000000..f4c3b19 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/FercoganbackendApplication.java @@ -0,0 +1,13 @@ +package com.example.fercoganbackend; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class FercoganbackendApplication { + + public static void main(String[] args) { + SpringApplication.run(FercoganbackendApplication.class, args); + } + +} diff --git a/src/main/java/com/example/fercoganbackend/component/ContadorWebSocketHandler.java b/src/main/java/com/example/fercoganbackend/component/ContadorWebSocketHandler.java new file mode 100644 index 0000000..7d10f16 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/component/ContadorWebSocketHandler.java @@ -0,0 +1,34 @@ +package com.example.fercoganbackend.component; + +// ContadorWebSocketHandler.java +import org.springframework.stereotype.Component; +import org.springframework.web.socket.*; +import org.springframework.web.socket.handler.TextWebSocketHandler; + +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + +@Component +public class ContadorWebSocketHandler extends TextWebSocketHandler { + private final List sessions = new CopyOnWriteArrayList<>(); + + @Override + public void afterConnectionEstablished(WebSocketSession session) { + sessions.add(session); + } + + @Override + public void afterConnectionClosed(WebSocketSession session, CloseStatus status) { + sessions.remove(session); + } + + public void broadcast(String message) { + for (WebSocketSession session : sessions) { + try { + session.sendMessage(new TextMessage(message)); + } catch (Exception e) { + e.printStackTrace(); + } + } + } +} diff --git a/src/main/java/com/example/fercoganbackend/configuration/SecurityConfig.java b/src/main/java/com/example/fercoganbackend/configuration/SecurityConfig.java new file mode 100644 index 0000000..fe65c59 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/configuration/SecurityConfig.java @@ -0,0 +1,55 @@ +package com.example.fercoganbackend.configuration; + +import com.example.fercoganbackend.service.UsuarioDetailsService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +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.configurers.AbstractHttpConfigurer; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +public class SecurityConfig { + + private final UsuarioDetailsService usuarioDetailsService; + + public SecurityConfig(UsuarioDetailsService usuarioDetailsService) { + this.usuarioDetailsService = usuarioDetailsService; + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public AuthenticationManager authenticationManager(AuthenticationConfiguration authConfig) throws Exception { + return authConfig.getAuthenticationManager(); + } + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(auth -> auth + .requestMatchers("/auth/**").permitAll() + .requestMatchers("/admin/**").hasAnyAuthority("SUPER_USUARIO","ADMIN") + .anyRequest().authenticated() + ) + .httpBasic(httpBasic -> httpBasic + .authenticationEntryPoint((request, response, authException) -> { + // Log del fallo de autenticación + System.out.println("Fallo de autenticación: " + authException.getMessage()); + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, authException.getMessage()); + }) + ); + return http.build(); + } + +} + + diff --git a/src/main/java/com/example/fercoganbackend/configuration/WebSocketConfig.java b/src/main/java/com/example/fercoganbackend/configuration/WebSocketConfig.java new file mode 100644 index 0000000..1f7997b --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/configuration/WebSocketConfig.java @@ -0,0 +1,21 @@ +package com.example.fercoganbackend.configuration; + +// WebSocketConfig.java +import com.example.fercoganbackend.component.ContadorWebSocketHandler; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.config.annotation.*; + +@Configuration +@EnableWebSocket +public class WebSocketConfig implements WebSocketConfigurer { + private final ContadorWebSocketHandler handler; + + public WebSocketConfig(ContadorWebSocketHandler handler) { + this.handler = handler; + } + + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + registry.addHandler(handler, "/ws/contador").setAllowedOrigins("*"); + } +} diff --git a/src/main/java/com/example/fercoganbackend/controller/AppController.java b/src/main/java/com/example/fercoganbackend/controller/AppController.java new file mode 100644 index 0000000..be4e7d5 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/AppController.java @@ -0,0 +1,55 @@ +package com.example.fercoganbackend.controller; + +import com.example.fercoganbackend.component.ContadorWebSocketHandler; +import com.example.fercoganbackend.entity.Rol; +import com.example.fercoganbackend.entity.Usuario; +import com.example.fercoganbackend.service.ContadorService; +import com.example.fercoganbackend.service.UsuarioService; +import org.springframework.web.bind.annotation.*; +import java.util.Set; +import java.util.List; + +@RestController +public class AppController { + + private final UsuarioService usuarioService; + private final ContadorService contadorService; + private final ContadorWebSocketHandler webSocketHandler; + + public AppController(UsuarioService usuarioService, ContadorService contadorService, ContadorWebSocketHandler webSocketHandler) { + this.usuarioService = usuarioService; + this.contadorService = contadorService; + this.webSocketHandler = webSocketHandler; + } + + // Registro + @PostMapping("/auth/registrar") + public String registrar(@RequestParam String username, + @RequestParam String password, + @RequestParam Set roles) { + usuarioService.registrarUsuario(username, password, roles); + return "Usuario registrado, pendiente de aprobación"; + } + + // Verificar si aprobado + @GetMapping("/auth/verificar/{username}") + public String verificar(@PathVariable String username) { + boolean aprobado = usuarioService.estaAprobado(username); + return aprobado ? "Usuario aprobado ✅" : "Usuario pendiente ❌"; + } + + // Listar pendientes (solo admin/super) + @GetMapping("/admin/pendientes") + public List pendientes() { + return usuarioService.listarPendientes(); + } + + // Aceptar usuario (solo admin/super) + @PostMapping("/admin/aceptar/{id}") + public String aceptar(@PathVariable Long id) { + usuarioService.aceptarUsuario(id); + return "Usuario aprobado ✅"; + } + +} + diff --git a/src/main/java/com/example/fercoganbackend/controller/ContadorController.java b/src/main/java/com/example/fercoganbackend/controller/ContadorController.java new file mode 100644 index 0000000..1c7db7d --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/controller/ContadorController.java @@ -0,0 +1,30 @@ +package com.example.fercoganbackend.controller; + +// ContadorController.java (REST API) +import com.example.fercoganbackend.component.ContadorWebSocketHandler; +import com.example.fercoganbackend.service.ContadorService; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/contador") +public class ContadorController { + private final ContadorService contadorService; + private final ContadorWebSocketHandler webSocketHandler; + + public ContadorController(ContadorService contadorService, ContadorWebSocketHandler webSocketHandler) { + this.contadorService = contadorService; + this.webSocketHandler = webSocketHandler; + } + + @PostMapping("/incrementar") + public int incrementar() { + int nuevoValor = contadorService.incrementar(); + webSocketHandler.broadcast(String.valueOf(nuevoValor)); + return nuevoValor; + } + + @GetMapping + public int getContador() { + return contadorService.getContador(); + } +} diff --git a/src/main/java/com/example/fercoganbackend/entity/Rol.java b/src/main/java/com/example/fercoganbackend/entity/Rol.java new file mode 100644 index 0000000..6aa2b0b --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/entity/Rol.java @@ -0,0 +1,6 @@ +package com.example.fercoganbackend.entity; + + +public enum Rol { + SUPER_USUARIO, ADMIN, COLABORADOR, CLIENTE +} diff --git a/src/main/java/com/example/fercoganbackend/entity/Usuario.java b/src/main/java/com/example/fercoganbackend/entity/Usuario.java new file mode 100644 index 0000000..6619cc6 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/entity/Usuario.java @@ -0,0 +1,67 @@ +package com.example.fercoganbackend.entity; + +import jakarta.persistence.*; +import java.util.Set; + +@Entity +public class Usuario { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String username; + private String password; + + @Column(nullable = false) + private Boolean aprobado = false; + + @ElementCollection(fetch = FetchType.EAGER) + @Enumerated(EnumType.STRING) + private Set roles; // aquí consumes el enum + + // getters y setters + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + 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; + } + + public boolean isAprobado() { + return aprobado; + } + + public void setAprobado(boolean aprobado) { + this.aprobado = aprobado; + } + + public Set getRoles() { + return roles; + } + + public void setRoles(Set roles) { + this.roles = roles; + } +} + + + + diff --git a/src/main/java/com/example/fercoganbackend/otros/UsuarioPrincipal.java b/src/main/java/com/example/fercoganbackend/otros/UsuarioPrincipal.java new file mode 100644 index 0000000..d769c79 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/otros/UsuarioPrincipal.java @@ -0,0 +1,54 @@ +package com.example.fercoganbackend.otros; + +import com.example.fercoganbackend.entity.Usuario; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import java.util.Collection; +import java.util.stream.Collectors; + +public class UsuarioPrincipal implements UserDetails { + private final Usuario usuario; + + public UsuarioPrincipal(Usuario usuario) { + this.usuario = usuario; + } + + @Override + public Collection getAuthorities() { + return usuario.getRoles().stream() + .map(r -> new SimpleGrantedAuthority("ROLE_" + r.name())) + .collect(Collectors.toList()); + } + + @Override + public String getPassword() { + return usuario.getPassword(); + } + + @Override + public String getUsername() { + return usuario.getUsername(); + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return usuario.isAprobado(); // aquí usamos tu booleano + } +} + diff --git a/src/main/java/com/example/fercoganbackend/repository/UsuarioRepository.java b/src/main/java/com/example/fercoganbackend/repository/UsuarioRepository.java new file mode 100644 index 0000000..3805a2a --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/repository/UsuarioRepository.java @@ -0,0 +1,9 @@ +package com.example.fercoganbackend.repository; + +import com.example.fercoganbackend.entity.Usuario; +import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + +public interface UsuarioRepository extends JpaRepository { + Optional findByUsername(String username); +} diff --git a/src/main/java/com/example/fercoganbackend/service/ContadorService.java b/src/main/java/com/example/fercoganbackend/service/ContadorService.java new file mode 100644 index 0000000..dab4964 --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/ContadorService.java @@ -0,0 +1,33 @@ +package com.example.fercoganbackend.service; + +// ContadorService.java +import org.springframework.stereotype.Service; +import java.util.concurrent.atomic.AtomicInteger; + +@Service +public class ContadorService { + private final AtomicInteger contador = new AtomicInteger(200); + private boolean sw = true; + + public int incrementar() { + int valorActual = contador.get(); + int incremento; + if (valorActual < 300) { + incremento = sw ? 20 : 30; + sw = !sw; // alterna el booleano + } else if (valorActual < 1000) { + incremento = 50; + } else if (valorActual < 2000) { + incremento = 100; + } else { + incremento = 500; + } + return contador.getAndAdd(incremento); + } + + + public int getContador() { + return contador.get(); + } +} + diff --git a/src/main/java/com/example/fercoganbackend/service/UsuarioDetailsService.java b/src/main/java/com/example/fercoganbackend/service/UsuarioDetailsService.java new file mode 100644 index 0000000..925e9ff --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/UsuarioDetailsService.java @@ -0,0 +1,47 @@ +package com.example.fercoganbackend.service; + +import com.example.fercoganbackend.entity.Usuario; +import com.example.fercoganbackend.otros.UsuarioPrincipal; +import com.example.fercoganbackend.repository.UsuarioRepository; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +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 org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +@Service +public class UsuarioDetailsService implements UserDetailsService { + + private final UsuarioRepository usuarioRepository; + private final Logger logger = LoggerFactory.getLogger(UsuarioDetailsService.class); + + public UsuarioDetailsService(UsuarioRepository usuarioRepository) { + this.usuarioRepository = usuarioRepository; + } + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + logger.info("Intentando autenticar usuario: {}", username); + + Usuario usuario = usuarioRepository.findByUsername(username) + .orElseThrow(() -> { + logger.warn("Usuario no encontrado: {}", username); + return new UsernameNotFoundException("Usuario no encontrado"); + }); + + logger.info("Usuario encontrado: {}, aprobado: {}", usuario.getUsername(), usuario.isAprobado()); + logger.info("Roles del usuario: {}", usuario.getRoles()); + + return new org.springframework.security.core.userdetails.User( + usuario.getUsername(), + usuario.getPassword(), + usuario.isAprobado(), true, true, true, + usuario.getRoles().stream() + .map(r -> new SimpleGrantedAuthority(r.name())) + .toList() + ); + } +} diff --git a/src/main/java/com/example/fercoganbackend/service/UsuarioService.java b/src/main/java/com/example/fercoganbackend/service/UsuarioService.java new file mode 100644 index 0000000..2b873cd --- /dev/null +++ b/src/main/java/com/example/fercoganbackend/service/UsuarioService.java @@ -0,0 +1,42 @@ +package com.example.fercoganbackend.service; +import com.example.fercoganbackend.entity.Rol; +import com.example.fercoganbackend.entity.Usuario; +import com.example.fercoganbackend.repository.UsuarioRepository; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Set; + +@Service +public class UsuarioService { + private final UsuarioRepository repo; + private final PasswordEncoder encoder; + + public UsuarioService(UsuarioRepository repo, PasswordEncoder encoder) { + this.repo = repo; + this.encoder = encoder; + } + + public Usuario registrarUsuario(String username, String password, Set roles) { + Usuario u = new Usuario(); + u.setUsername(username); + u.setPassword(encoder.encode(password)); + u.setRoles(roles); + u.setAprobado(false); // no aprobado hasta aceptación + return repo.save(u); + } + + public List listarPendientes() { + return repo.findAll().stream().filter(u -> !u.isAprobado()).toList(); + } + + public Usuario aceptarUsuario(Long id) { + Usuario u = repo.findById(id).orElseThrow(); + u.setAprobado(true); + return repo.save(u); + } + + public boolean estaAprobado(String username) { + return repo.findByUsername(username).map(Usuario::isAprobado).orElse(false); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..50f34fb --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,13 @@ +spring.application.name=fercoganbackend +spring.datasource.url=jdbc:mysql://localhost:3306/testdb +spring.datasource.username=andre +spring.datasource.password=andre +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect +# Nivel de log para Spring Security +logging.level.org.springframework.security=DEBUG +logging.level.org.hibernate.SQL=DEBUG +logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE diff --git a/src/test/java/com/example/fercoganbackend/FercoganbackendApplicationTests.java b/src/test/java/com/example/fercoganbackend/FercoganbackendApplicationTests.java new file mode 100644 index 0000000..c861c49 --- /dev/null +++ b/src/test/java/com/example/fercoganbackend/FercoganbackendApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.fercoganbackend; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class FercoganbackendApplicationTests { + + @Test + void contextLoads() { + } + +}