Skip to content

Commit ca0a9d0

Browse files
committed
upgraded org.json lib to 20240303 fixing some vulnerabilities
1 parent 511aaf1 commit ca0a9d0

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

source/pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<spring.version>5.3.27</spring.version>
4343
<spring-security.version>5.6.12</spring-security.version>
4444
<!-- JSON Lib Version -->
45-
<json.version>20080701</json.version>
45+
<json.version>20240303</json.version>
4646
<gson.version>2.9.0</gson.version>
4747
<jackson-databind.version>2.14.0-rc1</jackson-databind.version>
4848
<jackson-datatype-jsr310.version>2.13.2</jackson-datatype-jsr310.version>
@@ -177,11 +177,13 @@
177177
<artifactId>spring-expression</artifactId>
178178
<version>${spring.version}</version>
179179
</dependency>
180-
<!-- <dependency>
180+
<!--
181+
<dependency>
181182
<groupId>org.hibernate</groupId>
182183
<artifactId>hibernate-validator</artifactId>
183184
<version>7.0.4.Final</version>
184-
</dependency>-->
185+
</dependency>
186+
-->
185187
<dependency>
186188
<groupId>org.springframework.security</groupId>
187189
<artifactId>spring-security-core</artifactId>

source/src/main/java/org/cerberus/core/servlet/crud/test/UpdateTestCaseWithDependencies.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ private List<TestCaseCountryProperties> getTestCaseCountryPropertiesFromParamete
261261
if (propJson.has("value3")) {
262262
value3 = propJson.getString("value3");
263263
}
264-
String length = propJson.getString("length");
264+
String length = String.valueOf(propJson.getInt("length"));
265265
int rowLimit = propJson.getInt("rowLimit");
266266
int retryNb = propJson.optInt("retryNb");
267267
int retryPeriod = propJson.optInt("retryPeriod");
@@ -313,7 +313,7 @@ private List<TestCaseStep> getTestCaseStepsFromParameter(HttpServletRequest requ
313313
String conditionValue1 = step.getString("conditionValue1");
314314
String conditionValue2 = step.getString("conditionValue2");
315315
String conditionValue3 = step.getString("conditionValue3");
316-
JSONArray conditionOptions = ParameterParserUtil.parseJSONArrayParamAndDecode(step.getString("conditionOptions"), new JSONArray(), "UTF8");
316+
JSONArray conditionOptions = step.getJSONArray("conditionOptions");
317317
String description = step.getString("description");
318318
boolean isUsingLibraryStep = step.getBoolean("isUsingLibraryStep");
319319
String libraryStepTest = step.getString("libraryStepTest");
@@ -361,7 +361,7 @@ private List<TestCaseStepAction> getTestCaseStepActionsFromParameter(HttpServlet
361361
String conditionValue1 = tcsaJson.getString("conditionValue1");
362362
String conditionValue2 = tcsaJson.getString("conditionValue2");
363363
String conditionValue3 = tcsaJson.getString("conditionValue3");
364-
JSONArray condOptionsArray = ParameterParserUtil.parseJSONArrayParamAndDecode(tcsaJson.getString("conditionOptions"), new JSONArray(), "UTF8");
364+
JSONArray condOptionsArray = tcsaJson.getJSONArray("conditionOptions");
365365
String action = tcsaJson.getString("action");
366366
String value1 = tcsaJson.getString("object");
367367
String value2 = tcsaJson.getString("property");
@@ -403,7 +403,7 @@ private List<TestCaseStepActionControl> getTestCaseStepActionControlsFromParamet
403403
String conditionValue1 = controlJson.isNull("conditionValue1") ? "" : controlJson.getString("conditionValue1");
404404
String conditionValue2 = controlJson.isNull("conditionValue2") ? "" : controlJson.getString("conditionValue2");
405405
String conditionValue3 = controlJson.isNull("conditionValue3") ? "" : controlJson.getString("conditionValue3");
406-
JSONArray conditionOptions = ParameterParserUtil.parseJSONArrayParamAndDecode(controlJson.getString("conditionOptions"), new JSONArray(), "UTF8");
406+
JSONArray conditionOptions = controlJson.getJSONArray("conditionOptions");
407407
//String type = controlJson.getString("objType");
408408
String controlValue = controlJson.getString("control");
409409
String value1 = controlJson.getString("value1");

0 commit comments

Comments
 (0)