From d71fda8c931414b846622746966ee93fee75198d Mon Sep 17 00:00:00 2001
From: Bernd Ritter <comrad@posteo.de>
Date: Sat, 30 Sep 2023 23:15:36 +0200
Subject: [PATCH] Reverse-Proxy raus, weil ROOT-Context kein Reload hat

---
 doc/docker-compose.yml                        |  7 ---
 doc/tomcat/conf/server.xml                    |  5 +-
 .../web/controller/RegisterController.java    | 56 ++++++++++++++++---
 src/main/resources/log4j.properties           |  2 +-
 4 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/doc/docker-compose.yml b/doc/docker-compose.yml
index b108274e..8b269e80 100644
--- a/doc/docker-compose.yml
+++ b/doc/docker-compose.yml
@@ -35,13 +35,6 @@ services:
           - './tomcat/conf/tomcat-users.xml:/usr/local/tomcat/conf/tomcat-users.xml'
           - './tomcat/lib/postgresql-42.3.1.jar:/usr/local/tomcat/lib/postgresql-42.3.1.jar'
           - '../target/holarseweb.war:/usr/local/tomcat/webapps/holarseweb.war'
-  reverse-proxy:
-    container_name: reverse-proxy
-    image: caddy:latest
-    ports:
-      - "80:80"
-    volumes:
-      - ./reverse-proxy/:/etc/caddy/
 volumes:
   website_my_pgdata: 
       external: true
diff --git a/doc/tomcat/conf/server.xml b/doc/tomcat/conf/server.xml
index 22ced8f2..8f233096 100644
--- a/doc/tomcat/conf/server.xml
+++ b/doc/tomcat/conf/server.xml
@@ -148,9 +148,8 @@
                resourceName="UserDatabase"/>
       </Realm>
 
-      <Host name="localhost"  appBase="webapps" unpackWARs="true" autoDeploy="false" deployOnStartup="false">
-        <Context path="" docBase="holarseweb"></Context>
-
+      <Host name="localhost"  appBase="webapps" unpackWARs="true" autoDeploy="true" deployOnStartup="true">
+ 
         <!-- SingleSignOn valve, share authentication between web applications
              Documentation at: /docs/config/valve.html -->
         <!--
diff --git a/src/main/java/de/holarse/web/controller/RegisterController.java b/src/main/java/de/holarse/web/controller/RegisterController.java
index 59643d61..91d8bab4 100644
--- a/src/main/java/de/holarse/web/controller/RegisterController.java
+++ b/src/main/java/de/holarse/web/controller/RegisterController.java
@@ -1,9 +1,12 @@
 package de.holarse.web.controller;
 
 import de.holarse.backend.db.User;
+import de.holarse.backend.db.UserData;
 import de.holarse.backend.db.UserSlug;
+import de.holarse.backend.db.UserStatus;
 import de.holarse.backend.db.repositories.RoleRepository;
 import de.holarse.backend.db.repositories.UserRepository;
+import de.holarse.backend.types.PasswordType;
 import de.holarse.web.controller.commands.RegisterForm;
 import de.holarse.web.defines.WebDefines;
 import de.holarse.web.services.JobService;
@@ -13,13 +16,17 @@
 import java.time.OffsetDateTime;
 import java.util.Optional;
 import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityTransaction;
 import jakarta.persistence.PersistenceContext;
 import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
+import org.apache.commons.math3.random.RandomDataGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -55,6 +62,10 @@ public class RegisterController {
     
     @Autowired
     RegisterFormValidationService rfValidationService;
+    
+    @Autowired
+    @Qualifier("bcryptEncoder")
+    private PasswordEncoder passwordEncoder;      
 
     @GetMapping
     public ModelAndView index(final ModelAndView mv) {
@@ -82,17 +93,42 @@ public ModelAndView register(@Valid @ModelAttribute("registerForm") final Regist
 
         log.info("Registration form ok");
 
+        final EntityTransaction tx = em.getTransaction();
+        tx.begin();
         // Unbestätigten Benutzer anlegen
-        final User newUser = registerService.createUnverifiedUser(registerForm);
-        newUser.getRoles().add(roleRepository.findByCode("TRUSTED_USER"));
+        final User user = new User();
+        user.setLogin(registerForm.getUsername());
+        user.setEmail(registerForm.getEmail());
+        user.setHashType(PasswordType.bcrypt);
+        user.setDigest(passwordEncoder.encode(registerForm.getPassword()));
+        em.persist(user);
+        
+        final UserStatus userStatus = new UserStatus();
+        userStatus.setCreated(OffsetDateTime.now());
+        userStatus.setFailedLogins(0);
+        userStatus.setLocked(false);
+        userStatus.setVerified(false);
+        userStatus.setVerificationHash(generateVerificationHash());
+        userStatus.setVerificationHashValidUntil(OffsetDateTime.now().plusMinutes(30));
+        user.setUserStatus(userStatus); 
+        
+        final UserData userData = new UserData();
+        user.setUserData(userData);
+        
+        user.getRoles().add(roleRepository.findByCode("TRUSTED_USER"));
         
         // Slugs
-        UserSlug userSlug = slugService.slugify(newUser);
-        userSlug.setUser(newUser);
-        newUser.getUserSlugs().add(userSlug);
-        em.persist(newUser);
-        mv.addObject("validationKey", newUser.getUserStatus().getVerificationHash());
-
+        UserSlug userSlug = slugService.slugify(user);
+        userSlug.setUser(user);
+        user.getUserSlugs().add(userSlug);
+        mv.addObject("validationKey", user.getUserStatus().getVerificationHash());
+
+        em.persist(user);
+        em.persist(userStatus);
+        em.persist(userData);
+        em.persist(userSlug);
+        tx.commit();
+        
         mv.addObject(WebDefines.DEFAULT_VIEW_ATTRIBUTE_NAME, "sites/accounts/registered");
         return mv;
     }
@@ -115,5 +151,9 @@ public ModelAndView verify(@NotNull @RequestParam("v") final String verification
 
         return mv;
     }
+    
+    public String generateVerificationHash() {
+        return new RandomDataGenerator().nextSecureHexString(12);
+    }    
 
 }
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 6da366a7..6be007c5 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -15,7 +15,7 @@ log4j.logger.org.hibernate = WARN
 log4j.logger.org.hibernate.SQL=WARN
 log4j.logger.org.hibernate.type=WARN 
 
-log4j.logger.org.springframework.security=TRACE
+log4j.logger.org.springframework.security=WARN
 #log4j.logger.com.fasterxml.jackson=WARN
 log4j.logger.de.holarse=DEBUG
 log4j.logger.de.holarse.renderer=WARN