Merge pull request ChargeTimeEU#165 from listestalo/proxied_address

add support for accessing 'X-Forwarded-For' field respectively proxied address

Author: TVolden

OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketListener.java

@@ -54,6 +54,8 @@ public class WebSocketListener implements Listener {
   private static final int OCPPJ_CP_MIN_PASSWORD_LENGTH = 16;
   private static final int OCPPJ_CP_MAX_PASSWORD_LENGTH = 20;
 
+  private static final String HTTP_HEADER_PROXIED_ADDRESS = "X-Forwarded-For";
+
   private final ISessionFactory sessionFactory;
   private final List<Draft> drafts;
 
@@ -110,10 +112,18 @@ public void relay(String message) {
 
             sockets.put(webSocket, receiver);
 
+            String proxiedAddress = clientHandshake.getFieldValue(HTTP_HEADER_PROXIED_ADDRESS);
+
+            logger.debug(
+                    "New web-socket connection opened from address: {} proxied for: {}",
+                    webSocket.getRemoteSocketAddress(),
+                    proxiedAddress);
+
             SessionInformation information =
                 new SessionInformation.Builder()
                     .Identifier(clientHandshake.getResourceDescriptor())
                     .InternetAddress(webSocket.getRemoteSocketAddress())
+                    .ProxiedAddress(proxiedAddress)
                     .build();
 
             handler.newSession(

ocpp-common/src/main/java/eu/chargetime/ocpp/model/SessionInformation.java

@@ -31,6 +31,7 @@ public class SessionInformation {
   private String identifier;
   private InetSocketAddress address;
   private String SOAPtoURL;
+  private String proxiedAddress;
 
   public String getIdentifier() {
     return identifier;
@@ -44,11 +45,16 @@ public String getSOAPtoURL() {
     return SOAPtoURL;
   }
 
+  public String getProxiedAddress() {
+    return proxiedAddress;
+  }
+
   public static class Builder {
 
     private String identifier;
     private InetSocketAddress address;
     private String SOAPtoURL;
+    private String proxiedAddress;
 
     public Builder Identifier(String identifier) {
       this.identifier = identifier;
@@ -60,11 +66,17 @@ public Builder InternetAddress(InetSocketAddress address) {
       return this;
     }
 
+    public Builder ProxiedAddress(String proxiedAddress) {
+      this.proxiedAddress = proxiedAddress;
+      return this;
+    }
+
     public SessionInformation build() {
       SessionInformation sessionInformation = new SessionInformation();
       sessionInformation.identifier = this.identifier;
       sessionInformation.address = this.address;
       sessionInformation.SOAPtoURL = this.SOAPtoURL;
+      sessionInformation.proxiedAddress = this.proxiedAddress;
       return sessionInformation;
     }