checking logged in method + analysing debugger

Author: Hattinger04

src/main/java/io/github/Hattinger04/configuration/AuthController.java

@@ -1,12 +1,20 @@
 package io.github.Hattinger04.configuration;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -43,4 +51,24 @@ public ResponseEntity<?> register(@RequestBody User user) throws Exception {
 		userService.saveUser(user);
 		return new ResponseEntity<>(HttpStatus.OK); 
 	}
+	
+	
+	@GetMapping("login")
+	public ResponseEntity<?> isLoggedIn() {
+		if (SecurityContextHolder.getContext().getAuthentication() instanceof AnonymousAuthenticationToken) {
+			return new ResponseEntity<>(HttpStatus.UNAUTHORIZED); 
+		}
+		return new ResponseEntity<>(HttpStatus.OK); 
+	}
+	
+	@GetMapping("/logout")
+	@PreAuthorize("isAuthenticated()") // not really needed
+	public ResponseEntity<?> logoutPage(HttpServletRequest request, HttpServletResponse response) {
+		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+		if (auth != null) {
+			new SecurityContextLogoutHandler().logout(request, response, auth);
+		}
+		return new ResponseEntity<>(HttpStatus.OK);
+	}
+
 }

src/main/java/io/github/Hattinger04/hamsterEvaluation/debugger/controller/DebuggerController.java

@@ -1,7 +1,5 @@
 package io.github.Hattinger04.hamsterEvaluation.debugger.controller;
 
-import com.sun.jdi.StackFrame;
-
 import io.github.Hattinger04.hamsterEvaluation.debugger.model.DebuggerModel;
 import io.github.Hattinger04.hamsterEvaluation.model.HamsterFile;
 import io.github.Hattinger04.hamsterEvaluation.workbench.Workbench;

src/main/java/io/github/Hattinger04/hamsterEvaluation/debugger/model/DebuggerModel.java

@@ -157,7 +157,6 @@ public void start(HamsterFile file) {
 			}
 		} else {
 			this.className = this.currentFile.getName();
-
 			LaunchingConnector connector = Bootstrap.virtualMachineManager().defaultConnector();
 			Map args = connector.defaultArguments();
 			Connector.Argument main = (Connector.Argument) args.get("main");

src/main/java/io/github/Hattinger04/hamsterEvaluation/debugger/model/Hamster.java

@@ -11,7 +11,6 @@
 import io.github.Hattinger04.hamsterEvaluation.model.MauerDaException;
 import io.github.Hattinger04.hamsterEvaluation.model.MaulLeerException;
 import io.github.Hattinger04.hamsterEvaluation.model.MouthEmptyException;
-import io.github.Hattinger04.hamsterEvaluation.model.TerminalInstruction;
 import io.github.Hattinger04.hamsterEvaluation.model.WallInFrontException;
 import io.github.Hattinger04.hamsterEvaluation.model.TileEmptyException;
 

src/main/java/io/github/Hattinger04/user/UserController.java

@@ -1,15 +1,9 @@
 package io.github.Hattinger04.user;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -161,15 +155,4 @@ public ResponseEntity<?> removeRole(@RequestBody JsonNode node) {
 		}
 		return new ResponseEntity<>(HttpStatus.OK);
 	}
-
-
-	@GetMapping("/logout")
-	@PreAuthorize("isAuthenticated()") // not really needed
-	public ResponseEntity<?> logoutPage(HttpServletRequest request, HttpServletResponse response) {
-		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-		if (auth != null) {
-			new SecurityContextLogoutHandler().logout(request, response, auth);
-		}
-		return new ResponseEntity<>(HttpStatus.OK);
-	}
 }

src/main/resources/allLogs.log

@@ -414,3 +414,13 @@ Dez. 25, 2022 8:52:29 PM io.github.Hattinger04.aop.LogAspect loginLog
 FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
 Dez. 26, 2022 6:58:04 PM io.github.Hattinger04.aop.LogAspect loginLog
 FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Jän. 19, 2023 5:40:13 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Jän. 20, 2023 2:34:25 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Jän. 28, 2023 1:03:13 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Jän. 28, 2023 1:03:32 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin2, password=admin, active=null, roles=null) - [logged in]
+Jän. 28, 2023 1:09:43 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]

src/main/resources/hamster/admin/test/test.class

@@ -1 +1 @@
-void main() {vor();linksUm();linksUm();linksUm();vor();}
+void main() {int i = 0; vor(); i+=2;}

src/main/resources/hamster/admin/test/test.ham

@@ -1 +1 @@
-import io.github.Hattinger04.hamsterEvaluation.debugger.model.Territorium;import io.github.Hattinger04.hamsterEvaluation.debugger.model.Territory;import io.github.Hattinger04.hamsterEvaluation.model.HamsterException;import io.github.Hattinger04.hamsterEvaluation.model.HamsterInitialisierungsException;import io.github.Hattinger04.hamsterEvaluation.model.HamsterNichtInitialisiertException;import io.github.Hattinger04.hamsterEvaluation.model.KachelLeerException;import io.github.Hattinger04.hamsterEvaluation.model.MauerDaException;import io.github.Hattinger04.hamsterEvaluation.model.MaulLeerException;import io.github.Hattinger04.hamsterEvaluation.model.MouthEmptyException;import io.github.Hattinger04.hamsterEvaluation.model.WallInFrontException;import io.github.Hattinger04.hamsterEvaluation.model.TileEmptyException;public class test extends io.github.Hattinger04.hamsterEvaluation.debugger.model.IHamster implements io.github.Hattinger04.hamsterEvaluation.model.HamsterProgram {public void main() {vor();linksUm();linksUm();linksUm();vor();}}
+import io.github.Hattinger04.hamsterEvaluation.debugger.model.Territorium;import io.github.Hattinger04.hamsterEvaluation.debugger.model.Territory;import io.github.Hattinger04.hamsterEvaluation.model.HamsterException;import io.github.Hattinger04.hamsterEvaluation.model.HamsterInitialisierungsException;import io.github.Hattinger04.hamsterEvaluation.model.HamsterNichtInitialisiertException;import io.github.Hattinger04.hamsterEvaluation.model.KachelLeerException;import io.github.Hattinger04.hamsterEvaluation.model.MauerDaException;import io.github.Hattinger04.hamsterEvaluation.model.MaulLeerException;import io.github.Hattinger04.hamsterEvaluation.model.MouthEmptyException;import io.github.Hattinger04.hamsterEvaluation.model.WallInFrontException;import io.github.Hattinger04.hamsterEvaluation.model.TileEmptyException;public class test extends io.github.Hattinger04.hamsterEvaluation.debugger.model.IHamster implements io.github.Hattinger04.hamsterEvaluation.model.HamsterProgram {public void main() {int i = 0; vor(); i+=2;}}