Merge pull request #308 from Joo200/feat/configure_pw_length

TVolden · web-flow · commit 0293ce1007d3 · 2024-01-31T10:59:00.000+01:00
Allow configuration of allowed password string length
diff --git a/OCPP-J/src/main/java/eu/chargetime/ocpp/JSONConfiguration.java b/OCPP-J/src/main/java/eu/chargetime/ocpp/JSONConfiguration.java
@@ -39,6 +39,11 @@ public class JSONConfiguration {
   public static final String CONNECT_NON_BLOCKING_PARAMETER = "CONNECT_NON_BLOCKING";
   public static final String CONNECT_TIMEOUT_IN_MS_PARAMETER = "CONNECT_TIMEOUT_IN_MS";
   public static final String WEBSOCKET_WORKER_COUNT = "WEBSOCKET_WORKER_COUNT";
+  public static final String HTTP_HEALTH_CHECK_ENABLED = "HTTP_HEALTH_CHECK_ENABLED";
+  public static final String OCPPJ_CP_MIN_PASSWORD_LENGTH = "OCPPJ_CP_MIN_PASSWORD_LENGTH";
+  public static final String OCPPJ_CP_MAX_PASSWORD_LENGTH = "OCPPJ_CP_MAX_PASSWORD_LENGTH";
+  public static final String OCPP2J_CP_MIN_PASSWORD_LENGTH = "OCPP2J_CP_MIN_PASSWORD_LENGTH";
+  public static final String OCPP2J_CP_MAX_PASSWORD_LENGTH = "OCPP2J_CP_MAX_PASSWORD_LENGTH";
 
   private final HashMap<String, Object> parameters = new HashMap<>();
 
diff --git a/OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketListener.java b/OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketListener.java
@@ -166,8 +166,8 @@ public ServerHandshakeBuilder onWebsocketHandshakeReceivedAsServer(
                 }
               }
               if (password == null
-                  || password.length < OCPPJ_CP_MIN_PASSWORD_LENGTH
-                  || password.length > OCPPJ_CP_MAX_PASSWORD_LENGTH)
+                  || password.length < configuration.getParameter(JSONConfiguration.OCPPJ_CP_MIN_PASSWORD_LENGTH, OCPPJ_CP_MIN_PASSWORD_LENGTH)
+                  || password.length > configuration.getParameter(JSONConfiguration.OCPPJ_CP_MAX_PASSWORD_LENGTH, OCPPJ_CP_MAX_PASSWORD_LENGTH))
                 throw new InvalidDataException(401, "Invalid password length");
             }
 
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONServer.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONServer.java
@@ -69,7 +69,7 @@ public JSONServer(ServerCoreProfile coreProfile, JSONConfiguration configuration
     protocols.add(new Protocol(""));
     draftOcppOnly = new Draft_6455(Collections.emptyList(), protocols);
 
-    if(configuration.getParameter("HTTP_HEALTH_CHECK_ENABLED", true)) {
+    if(configuration.getParameter(JSONConfiguration.HTTP_HEALTH_CHECK_ENABLED, true)) {
       logger.info("JSONServer 1.6 with HttpHealthCheckDraft");
       this.listener = new WebSocketListener(sessionFactory, configuration, draftOcppOnly, new Draft_HttpHealthCheck());
     } else {
diff --git a/ocpp-v2/src/main/java/eu/chargetime/ocpp/MultiProtocolJSONServer.java b/ocpp-v2/src/main/java/eu/chargetime/ocpp/MultiProtocolJSONServer.java
@@ -73,7 +73,7 @@ public MultiProtocolJSONServer(
     }
     Draft draft = new Draft_6455(Collections.emptyList(), protocols);
 
-    if (configuration.getParameter("HTTP_HEALTH_CHECK_ENABLED", true)) {
+    if (configuration.getParameter(JSONConfiguration.HTTP_HEALTH_CHECK_ENABLED, true)) {
       logger.info("JSONServer with HttpHealthCheckDraft");
       listener =
           new MultiProtocolWebSocketListener(
diff --git a/ocpp-v2/src/main/java/eu/chargetime/ocpp/MultiProtocolWebSocketListener.java b/ocpp-v2/src/main/java/eu/chargetime/ocpp/MultiProtocolWebSocketListener.java
@@ -186,13 +186,13 @@ public ServerHandshakeBuilder onWebsocketHandshakeReceivedAsServer(
               }
               if (protocolVersion == null || protocolVersion == ProtocolVersion.OCPP1_6) {
                 if (password == null
-                    || password.length < OCPPJ_CP_MIN_PASSWORD_LENGTH
-                    || password.length > OCPPJ_CP_MAX_PASSWORD_LENGTH)
+                    || password.length < configuration.getParameter(JSONConfiguration.OCPPJ_CP_MIN_PASSWORD_LENGTH, OCPPJ_CP_MIN_PASSWORD_LENGTH)
+                    || password.length > configuration.getParameter(JSONConfiguration.OCPPJ_CP_MAX_PASSWORD_LENGTH, OCPPJ_CP_MAX_PASSWORD_LENGTH))
                   throw new InvalidDataException(401, "Invalid password length");
               } else {
                 if (password == null
-                    || password.length < OCPP2J_CP_MIN_PASSWORD_LENGTH
-                    || password.length > OCPP2J_CP_MAX_PASSWORD_LENGTH)
+                    || password.length < configuration.getParameter(JSONConfiguration.OCPP2J_CP_MIN_PASSWORD_LENGTH, OCPP2J_CP_MIN_PASSWORD_LENGTH)
+                    || password.length > configuration.getParameter(JSONConfiguration.OCPP2J_CP_MAX_PASSWORD_LENGTH, OCPP2J_CP_MAX_PASSWORD_LENGTH))
                   throw new InvalidDataException(401, "Invalid password length");
               }
             }

Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,8 @@ public ServerHandshakeBuilder onWebsocketHandshakeReceivedAsServer(`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`if (password == null`
`169`		`- \|\| password.length < OCPPJ_CP_MIN_PASSWORD_LENGTH`
`170`		`- \|\| password.length > OCPPJ_CP_MAX_PASSWORD_LENGTH)`
	`169`	`+ \|\| password.length < configuration.getParameter(JSONConfiguration.OCPPJ_CP_MIN_PASSWORD_LENGTH, OCPPJ_CP_MIN_PASSWORD_LENGTH)`
	`170`	`+ \|\| password.length > configuration.getParameter(JSONConfiguration.OCPPJ_CP_MAX_PASSWORD_LENGTH, OCPPJ_CP_MAX_PASSWORD_LENGTH))`
`171`	`171`	`throw new InvalidDataException(401, "Invalid password length");`
`172`	`172`	`}`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public MultiProtocolJSONServer(`
`73`	`73`	`}`
`74`	`74`	`Draft draft = new Draft_6455(Collections.emptyList(), protocols);`
`75`	`75`
`76`		`- if (configuration.getParameter("HTTP_HEALTH_CHECK_ENABLED", true)) {`
	`76`	`+ if (configuration.getParameter(JSONConfiguration.HTTP_HEALTH_CHECK_ENABLED, true)) {`
`77`	`77`	`logger.info("JSONServer with HttpHealthCheckDraft");`
`78`	`78`	`listener =`
`79`	`79`	`new MultiProtocolWebSocketListener(`
Original file line number	Diff line number	Diff line change
`@@ -186,13 +186,13 @@ public ServerHandshakeBuilder onWebsocketHandshakeReceivedAsServer(`
`186`	`186`	`}`
`187`	`187`	`if (protocolVersion == null \|\| protocolVersion == ProtocolVersion.OCPP1_6) {`
`188`	`188`	`if (password == null`
`189`		`- \|\| password.length < OCPPJ_CP_MIN_PASSWORD_LENGTH`
`190`		`- \|\| password.length > OCPPJ_CP_MAX_PASSWORD_LENGTH)`
	`189`	`+ \|\| password.length < configuration.getParameter(JSONConfiguration.OCPPJ_CP_MIN_PASSWORD_LENGTH, OCPPJ_CP_MIN_PASSWORD_LENGTH)`
	`190`	`+ \|\| password.length > configuration.getParameter(JSONConfiguration.OCPPJ_CP_MAX_PASSWORD_LENGTH, OCPPJ_CP_MAX_PASSWORD_LENGTH))`
`191`	`191`	`throw new InvalidDataException(401, "Invalid password length");`
`192`	`192`	`} else {`
`193`	`193`	`if (password == null`
`194`		`- \|\| password.length < OCPP2J_CP_MIN_PASSWORD_LENGTH`
`195`		`- \|\| password.length > OCPP2J_CP_MAX_PASSWORD_LENGTH)`
	`194`	`+ \|\| password.length < configuration.getParameter(JSONConfiguration.OCPP2J_CP_MIN_PASSWORD_LENGTH, OCPP2J_CP_MIN_PASSWORD_LENGTH)`
	`195`	`+ \|\| password.length > configuration.getParameter(JSONConfiguration.OCPP2J_CP_MAX_PASSWORD_LENGTH, OCPP2J_CP_MAX_PASSWORD_LENGTH))`
`196`	`196`	`throw new InvalidDataException(401, "Invalid password length");`
`197`	`197`	`}`
`198`	`198`	`}`