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

[Minor] Get remote IP earlier in WebSocketClient.java

This commit is contained in:
Robert von Burg 2019-03-12 19:03:37 +01:00
parent 7c11292199
commit d3ffce4089
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
private ComponentContainer container; private ComponentContainer container;
private final Session session; private final Session session;
private final EndpointConfig config; private final EndpointConfig config;
private String remoteIp;
private Certificate certificate; private Certificate certificate;
private Map<String, WebSocketObserverHandler> observerHandlersByRealm; private Map<String, WebSocketObserverHandler> observerHandlersByRealm;
@ -42,6 +43,7 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
this.container = container; this.container = container;
this.session = session; this.session = session;
this.config = config; this.config = config;
this.remoteIp = WebSocketRemoteIp.get();
this.observerHandlersByRealm = new HashMap<>(1); this.observerHandlersByRealm = new HashMap<>(1);
} }
@ -50,6 +52,7 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
JsonObject jsonObject = new JsonParser().parse(message).getAsJsonObject(); JsonObject jsonObject = new JsonParser().parse(message).getAsJsonObject();
String msgType = jsonObject.get(MSG_TYPE).getAsString(); String msgType = jsonObject.get(MSG_TYPE).getAsString();
logger.info("Handling message " + msgType);
switch (msgType) { switch (msgType) {
@ -75,13 +78,13 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
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!");
close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Not yet authed!"); close(CloseReason.CloseCodes.PROTOCOL_ERROR, "Not yet authed!");
return; return;
} }
try { try {
StrolchSessionHandler sessionHandler = RestfulStrolchComponent.getInstance().getSessionHandler(); StrolchSessionHandler sessionHandler = RestfulStrolchComponent.getInstance().getSessionHandler();
sessionHandler.validate(this.certificate); 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));
@ -144,13 +147,14 @@ public class WebSocketClient implements MessageHandler.Whole<String> {
try { try {
StrolchSessionHandler sessionHandler = RestfulStrolchComponent.getInstance().getSessionHandler(); StrolchSessionHandler sessionHandler = RestfulStrolchComponent.getInstance().getSessionHandler();
this.certificate = sessionHandler.validate(authToken, WebSocketRemoteIp.get()); 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");
return; return;
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("Failed to authenticate user " + username, e);
close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Invalid authentication"); close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Invalid authentication");
return; return;
} }