Skip to content

Commit d25b771

Browse files
author
Hattinger04
committed
checking logged in method + analysing debugger
1 parent f15d42a commit d25b771

File tree

9 files changed

+40
-23
lines changed

9 files changed

+40
-23
lines changed

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
package io.github.Hattinger04.configuration;
22

3+
import javax.servlet.http.HttpServletRequest;
4+
import javax.servlet.http.HttpServletResponse;
5+
36
import org.springframework.beans.factory.annotation.Autowired;
47
import org.springframework.http.HttpStatus;
58
import org.springframework.http.ResponseEntity;
9+
import org.springframework.security.access.prepost.PreAuthorize;
10+
import org.springframework.security.authentication.AnonymousAuthenticationToken;
611
import org.springframework.security.authentication.AuthenticationManager;
712
import org.springframework.security.authentication.BadCredentialsException;
813
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
14+
import org.springframework.security.core.Authentication;
915
import org.springframework.security.core.context.SecurityContextHolder;
16+
import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
17+
import org.springframework.web.bind.annotation.GetMapping;
1018
import org.springframework.web.bind.annotation.PostMapping;
1119
import org.springframework.web.bind.annotation.RequestBody;
1220
import org.springframework.web.bind.annotation.RestController;
@@ -43,4 +51,24 @@ public ResponseEntity<?> register(@RequestBody User user) throws Exception {
4351
userService.saveUser(user);
4452
return new ResponseEntity<>(HttpStatus.OK);
4553
}
54+
55+
56+
@GetMapping("login")
57+
public ResponseEntity<?> isLoggedIn() {
58+
if (SecurityContextHolder.getContext().getAuthentication() instanceof AnonymousAuthenticationToken) {
59+
return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
60+
}
61+
return new ResponseEntity<>(HttpStatus.OK);
62+
}
63+
64+
@GetMapping("/logout")
65+
@PreAuthorize("isAuthenticated()") // not really needed
66+
public ResponseEntity<?> logoutPage(HttpServletRequest request, HttpServletResponse response) {
67+
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
68+
if (auth != null) {
69+
new SecurityContextLogoutHandler().logout(request, response, auth);
70+
}
71+
return new ResponseEntity<>(HttpStatus.OK);
72+
}
73+
4674
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package io.github.Hattinger04.hamsterEvaluation.debugger.controller;
22

3-
import com.sun.jdi.StackFrame;
4-
53
import io.github.Hattinger04.hamsterEvaluation.debugger.model.DebuggerModel;
64
import io.github.Hattinger04.hamsterEvaluation.model.HamsterFile;
75
import io.github.Hattinger04.hamsterEvaluation.workbench.Workbench;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ public void start(HamsterFile file) {
157157
}
158158
} else {
159159
this.className = this.currentFile.getName();
160-
161160
LaunchingConnector connector = Bootstrap.virtualMachineManager().defaultConnector();
162161
Map args = connector.defaultArguments();
163162
Connector.Argument main = (Connector.Argument) args.get("main");

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.github.Hattinger04.hamsterEvaluation.model.MauerDaException;
1212
import io.github.Hattinger04.hamsterEvaluation.model.MaulLeerException;
1313
import io.github.Hattinger04.hamsterEvaluation.model.MouthEmptyException;
14-
import io.github.Hattinger04.hamsterEvaluation.model.TerminalInstruction;
1514
import io.github.Hattinger04.hamsterEvaluation.model.WallInFrontException;
1615
import io.github.Hattinger04.hamsterEvaluation.model.TileEmptyException;
1716

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
package io.github.Hattinger04.user;
22

3-
import javax.servlet.http.HttpServletRequest;
4-
import javax.servlet.http.HttpServletResponse;
5-
63
import org.springframework.beans.factory.annotation.Autowired;
74
import org.springframework.http.HttpStatus;
85
import org.springframework.http.ResponseEntity;
96
import org.springframework.security.access.prepost.PreAuthorize;
10-
import org.springframework.security.core.Authentication;
11-
import org.springframework.security.core.context.SecurityContextHolder;
12-
import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
137
import org.springframework.web.bind.annotation.DeleteMapping;
148
import org.springframework.web.bind.annotation.GetMapping;
159
import org.springframework.web.bind.annotation.PathVariable;
@@ -161,15 +155,4 @@ public ResponseEntity<?> removeRole(@RequestBody JsonNode node) {
161155
}
162156
return new ResponseEntity<>(HttpStatus.OK);
163157
}
164-
165-
166-
@GetMapping("/logout")
167-
@PreAuthorize("isAuthenticated()") // not really needed
168-
public ResponseEntity<?> logoutPage(HttpServletRequest request, HttpServletResponse response) {
169-
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
170-
if (auth != null) {
171-
new SecurityContextLogoutHandler().logout(request, response, auth);
172-
}
173-
return new ResponseEntity<>(HttpStatus.OK);
174-
}
175158
}

‎src/main/resources/allLogs.log

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,3 +414,13 @@ Dez. 25, 2022 8:52:29 PM io.github.Hattinger04.aop.LogAspect loginLog
414414
FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
415415
Dez. 26, 2022 6:58:04 PM io.github.Hattinger04.aop.LogAspect loginLog
416416
FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
417+
Jän. 19, 2023 5:40:13 PM io.github.Hattinger04.aop.LogAspect loginLog
418+
FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
419+
Jän. 20, 2023 2:34:25 PM io.github.Hattinger04.aop.LogAspect loginLog
420+
FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
421+
Jän. 28, 2023 1:03:13 PM io.github.Hattinger04.aop.LogAspect loginLog
422+
FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
423+
Jän. 28, 2023 1:03:32 PM io.github.Hattinger04.aop.LogAspect loginLog
424+
FEIN: User(id=null, username=admin2, password=admin, active=null, roles=null) - [logged in]
425+
Jän. 28, 2023 1:09:43 PM io.github.Hattinger04.aop.LogAspect loginLog
426+
FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]

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

-13 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
void main() {vor();linksUm();linksUm();linksUm();vor();}
1+
void main() {int i = 0; vor(); i+=2;}

‎src/main/resources/hamster/admin/test/test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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();}}
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() {int i = 0; vor(); i+=2;}}

0 commit comments

Comments
 (0)