Merge pull request InseeFr#21 from SimonDmz/fix-spring4shell-vulnerability

fix spring4shell vulnerability

Author: nicolasTurban

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>fr.insee</groupId>
 	<artifactId>sabdatab</artifactId>
 	<packaging>war</packaging>
-	<version>2.0.2</version>
+	<version>2.0.3</version>
 	<name>Sabiane Data</name>
 
 	<properties>
@@ -23,7 +23,7 @@
 		<xalan.version>2.7.1</xalan.version>
 		<commons-io.version>2.7</commons-io.version>
 		<log4j2.version>2.17.1</log4j2.version>
-		<spring-boot-dependencies.version>2.4.3</spring-boot-dependencies.version>
+		<spring-boot-dependencies.version>2.6.6</spring-boot-dependencies.version>
 
 	</properties>
 

src/main/java/fr/insee/sabianedata/ws/model/queen/SurveyUnitDto.java

@@ -1,6 +1,7 @@
 package fr.insee.sabianedata.ws.model.queen;
 
 import java.io.File;
+import java.util.Date;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -53,6 +54,14 @@ public void extractJsonFromFiles(String folder) {
 
     }
 
+    public void generateStateData() {
+        StateData stateDataToInject = new StateData();
+        stateDataToInject.setCurrentPage("1");
+        stateDataToInject.setDate(new Date().getTime());
+        stateDataToInject.setState("INIT");
+        this.setStateData(stateDataToInject);
+    }
+
     public JsonNode getData() {
         return data;
     }

src/main/java/fr/insee/sabianedata/ws/service/QueenApiService.java

@@ -60,6 +60,7 @@ public ResponseEntity<?> postNomenclaturesToApi(HttpServletRequest request, Nome
         final String apiUri = queenProperties.getHostFromEnum(plateform) + "/api/nomenclature";
         HttpHeaders httpHeaders = createSimpleHeadersAuth(request);
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
+        LOGGER.info("Calling {}", apiUri);
         return restTemplate.exchange(apiUri, HttpMethod.POST, new HttpEntity<>(nomenclatureDto, httpHeaders),
                 String.class);
     }

src/main/java/fr/insee/sabianedata/ws/service/QueenExtractEntities.java

@@ -45,6 +45,7 @@ public List<SurveyUnitDto> getQueenSurveyUnitsFromFods(File fods, String folder)
         List<SurveyUnitDto> surveyUnitsList = surveyUnits.getSurveyUnits().stream().map(s -> {
             SurveyUnitDto suDto = new SurveyUnitDto(s);
             suDto.extractJsonFromFiles(folder);
+            suDto.generateStateData();
             return suDto;
         }).collect(Collectors.toList());
         return surveyUnitsList != null ? surveyUnitsList : lists;