Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minof] Inject StrolchSessionHandler into WebSocketClient by constructor

This commit is contained in:
Robert von Burg 2020-01-28 12:32:58 +01:00
parent a7a0549984
commit efdc522925
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketClient.java
View File

@ -21,7 +21,6 @@ import li.strolch.agent.api.ComponentContainer;
import li.strolch.agent.api.ObserverHandler; import li.strolch.agent.api.ObserverHandler;
import li.strolch.model.Tags; import li.strolch.model.Tags;
import li.strolch.privilege.model.Certificate; import li.strolch.privilege.model.Certificate;
import li.strolch.rest.RestfulStrolchComponent;
import li.strolch.rest.StrolchSessionHandler; import li.strolch.rest.StrolchSessionHandler;
import li.strolch.utils.helper.ExceptionHelper; import li.strolch.utils.helper.ExceptionHelper;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -31,6 +30,7 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
public static final Logger logger = LoggerFactory.getLogger(WebSocketClient.class); public static final Logger logger = LoggerFactory.getLogger(WebSocketClient.class);
private StrolchSessionHandler sessionHandler;
private ComponentContainer container; private ComponentContainer container;
private final Session session; private final Session session;
private final EndpointConfig config; private final EndpointConfig config;
@ -41,6 +41,7 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
public WebSocketClient(ComponentContainer container, Session session, EndpointConfig config) { public WebSocketClient(ComponentContainer container, Session session, EndpointConfig config) {
this.container = container; this.container = container;
this.sessionHandler = container.getComponent(StrolchSessionHandler.class);
this.session = session; this.session = session;
this.config = config; this.config = config;
this.remoteIp = WebSocketRemoteIp.get(); this.remoteIp = WebSocketRemoteIp.get();
@ -74,7 +75,7 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
} }
} }
private void assertAuthenticated(String type) { public void assertAuthenticated(String type) {
if (this.certificate == null) { if (this.certificate == null) {
logger.error("Received " + type + " request, but not yet authed!"); logger.error("Received " + type + " request, but not yet authed!");
@ -83,8 +84,7 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
} }
try { try {
StrolchSessionHandler sessionHandler = RestfulStrolchComponent.getInstance().getSessionHandler(); this.sessionHandler.validate(this.certificate, this.remoteIp);
sessionHandler.validate(this.certificate, this.remoteIp);
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.error("Received " + type + " request, but authentication is not valid anymore: " + ExceptionHelper logger.error("Received " + type + " request, but authentication is not valid anymore: " + ExceptionHelper
.getExceptionMessage(e)); .getExceptionMessage(e));
@ -150,8 +150,7 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
String username = jsonObject.get("username").getAsString(); String username = jsonObject.get("username").getAsString();
try { try {
StrolchSessionHandler sessionHandler = RestfulStrolchComponent.getInstance().getSessionHandler(); this.certificate = this.sessionHandler.validate(authToken, this.remoteIp);
this.certificate = sessionHandler.validate(authToken, this.remoteIp);
if (!this.certificate.getUsername().equals(username)) { if (!this.certificate.getUsername().equals(username)) {
logger.error("Invalid authentication for " + username); logger.error("Invalid authentication for " + username);
close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Invalid authentication"); close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Invalid authentication");
@ -190,6 +189,8 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
} }
public synchronized void sendMessage(String data) { public synchronized void sendMessage(String data) {
assertAuthenticated("sendMessage");
try { try {
this.session.getBasicRemote().sendText(data); this.session.getBasicRemote().sendText(data);
} catch (Exception e) { } catch (Exception e) {