+ * consumes: - application/json + *
+ * produces: - application/json */ @RestController @RequestMapping("/") -@Tag(name="Application", description="Application API") -@ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "Success"), - @ApiResponse(responseCode = "204", description = "No Content"), - @ApiResponse(responseCode = "400", description = "Bad Request"), - @ApiResponse(responseCode = "401", description = "Unauthorized"), - @ApiResponse(responseCode = "403", description = "Forbidden"), - @ApiResponse(responseCode = "404", description = "Not found"), - @ApiResponse(responseCode = "406", description = "Not Acceptable"), - @ApiResponse(responseCode = "500", description = "Internal server error") }) -public class PublicResources extends GenericResources { +@Tag(name = "Application", description = "Application API") +@ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Success"), + @ApiResponse(responseCode = "204", description = "No Content"), + @ApiResponse(responseCode = "400", description = "Bad Request"), + @ApiResponse(responseCode = "401", description = "Unauthorized"), + @ApiResponse(responseCode = "403", description = "Forbidden"), + @ApiResponse(responseCode = "404", description = "Not found"), + @ApiResponse(responseCode = "406", description = "Not Acceptable"), + @ApiResponse(responseCode = "500", description = "Internal server error")}) +public class PublicResources extends GenericResources { - static final Logger logger = LogManager.getLogger(PublicResources.class); + static final Logger logger = LoggerFactory.getLogger(PublicResources.class); - @Autowired - UserRolesManagerService userRolesManagerService; - - @Autowired - StampsService stampsService; + private final UserRolesManagerService userRolesManagerService; - @GetMapping(value = "/init", produces = MediaType.APPLICATION_JSON_VALUE) - @Operation(operationId = "getInit", summary = "Initial properties", responses = { @ApiResponse(content = @Content(mediaType = "application/json", schema = @Schema(implementation = Init.class)))}) - public ResponseEntity getProperties() throws RmesException { - JSONObject props = new JSONObject(); - try { - props.put("appHost", config.getAppHost()); - props.put("authorizationHost", config.getSugoiUi()); - props.put("defaultContributor", config.getDefaultContributor()); - props.put("defaultMailSender", config.getDefaultMailSender()); - props.put("maxLengthScopeNote", config.getMaxLengthScopeNote()); - props.put("lg1", config.getLg1()); - props.put("lg2", config.getLg2()); - props.put("authType", AuthType.getAuthType(config)); - props.put("modules", getActiveModules()); - } catch (Exception e) { - logger.error(e.getMessage(), e); - throw new RmesException(HttpStatus.SC_INTERNAL_SERVER_ERROR,e.getMessage(),e.getClass().getSimpleName()); - } - return ResponseEntity.status(HttpStatus.SC_OK).body(props.toString()); - } + private final StampsService stampsService; + private final String env; + private final String lg2; + private final String lg1; + private final String maxLengthScopeNote; + private final String defaultMailSender; + private final String defaultContributor; + private final String sugoiUi; + private final String appHost; + private final List activeModules; - private List getActiveModules() { - String dirPath = config.getDocumentsStorageGestion() + "/BauhausActiveModules.txt"; - File file = new File(dirPath); + public PublicResources(@Autowired UserRolesManagerService userRolesManagerService, + @Autowired StampsService stampsService, + @Value("${fr.insee.rmes.bauhaus.env}") String env, + @Value("${fr.insee.rmes.bauhaus.lg1}") String lg2, + @Value("${fr.insee.rmes.bauhaus.lg2}") String lg1, + @Value("${fr.insee.rmes.bauhaus.concepts.maxLengthScopeNote}") String maxLengthScopeNote, + @Value("${fr.insee.rmes.bauhaus.concepts.defaultMailSender}") String defaultMailSender, + @Value("${fr.insee.rmes.bauhaus.concepts.defaultContributor}") String defaultContributor, + @Value("${fr.insee.rmes.bauhaus.sugoi.ui}") String sugoiUi, + @Value("${fr.insee.rmes.bauhaus.appHost}") String appHost, + @Value("${fr.insee.rmes.bauhaus.activeModules}") List activeModules) { + this.userRolesManagerService = userRolesManagerService; + this.stampsService = stampsService; + this.env = env; + this.lg2 = lg2; + this.lg1 = lg1; + this.maxLengthScopeNote = maxLengthScopeNote; + this.defaultMailSender = defaultMailSender; + this.defaultContributor = defaultContributor; + this.sugoiUi = sugoiUi; + this.appHost = appHost; + this.activeModules=activeModules; + } + + @GetMapping(value = "/init", produces = MediaType.APPLICATION_JSON_VALUE) + @Operation(operationId = "getInit", summary = "Initial properties", responses = {@ApiResponse(content = @Content(mediaType = "application/json", schema = @Schema(implementation = Init.class)))}) + public ResponseEntity getProperties() throws RmesException { + JSONObject props = new JSONObject(); try { - return FileUtils.readLines(file, StandardCharsets.UTF_8);//Read lines in a list - } catch (IOException e) { - logger.error(e.getMessage(), e); - return new ArrayList<>(); - } - } + props.put("appHost", this.appHost); + props.put("authorizationHost", this.sugoiUi); + props.put("defaultContributor", this.defaultContributor); + props.put("defaultMailSender", this.defaultMailSender); + props.put("maxLengthScopeNote", this.maxLengthScopeNote); + props.put("lg1", this.lg1); + props.put("lg2", this.lg2); + props.put("authType", AuthType.getAuthType(this.env)); + props.put("modules", this.activeModules); + } catch (Exception e) { + logger.error(e.getMessage(), e); + throw new RmesException(HttpStatus.SC_INTERNAL_SERVER_ERROR, e.getMessage(), e.getClass().getSimpleName()); + } + return ResponseEntity.status(HttpStatus.SC_OK).body(props.toString()); + } - @GetMapping(value = "/stamps", produces = MediaType.APPLICATION_JSON_VALUE) - @Operation(operationId = "getStamps", summary = "List of stamps", responses = { @ApiResponse(content = @Content(mediaType = "application/json", schema = @Schema(implementation = String.class)))}) - public ResponseEntity getStamps() { - try { - return ResponseEntity.status(HttpStatus.SC_OK).body(stampsService.getStamps()); - } catch (RmesException e) { - return ResponseEntity.status(e.getStatus()).body(e.getDetails()); - } - } + @GetMapping(value = "/stamps", produces = MediaType.APPLICATION_JSON_VALUE) + @Operation(operationId = "getStamps", summary = "List of stamps", responses = {@ApiResponse(content = @Content(mediaType = "application/json", schema = @Schema(implementation = String.class)))}) + public ResponseEntity getStamps() { + try { + return ResponseEntity.status(HttpStatus.SC_OK).body(stampsService.getStamps()); + } catch (RmesException e) { + return ResponseEntity.status(e.getStatus()).body(e.getDetails()); + } + } - @GetMapping(value = "/disseminationStatus", produces = MediaType.APPLICATION_JSON_VALUE) - @Operation(operationId = "getDisseminationStatus", summary = "List of dissemination status", responses = {@ApiResponse(content=@Content(array=@ArraySchema(schema=@Schema(implementation=LabelUrl.class))))}) - public ResponseEntity getDisseminationStatus() { - TreeSet dsList = new TreeSet<>(); - for (DisseminationStatus ds : DisseminationStatus.values()) { - try { - dsList.add(new ObjectMapper().writeValueAsString(ds)); - } catch (JsonProcessingException e) { - return ResponseEntity.status(500).body(e.getMessage()); - } - } - return ResponseEntity.status(HttpStatus.SC_OK).body(dsList.toString()); - } + @GetMapping(value = "/disseminationStatus", produces = MediaType.APPLICATION_JSON_VALUE) + @Operation(operationId = "getDisseminationStatus", summary = "List of dissemination status", responses = {@ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = LabelUrl.class))))}) + public ResponseEntity getDisseminationStatus() { + TreeSet dsList = new TreeSet<>(); + for (DisseminationStatus ds : DisseminationStatus.values()) { + try { + dsList.add(new ObjectMapper().writeValueAsString(ds)); + } catch (JsonProcessingException e) { + return ResponseEntity.status(500).body(e.getMessage()); + } + } + return ResponseEntity.status(HttpStatus.SC_OK).body(dsList.toString()); + } - @GetMapping(value = "/roles", produces = MediaType.APPLICATION_JSON_VALUE) - @Operation(operationId = "getRoles", summary = "List of roles", responses = {@ApiResponse(content=@Content(array=@ArraySchema(schema=@Schema(implementation=Roles.class))))}) - public ResponseEntity getRoles() { - String entity = null; - try { - entity = userRolesManagerService.getRoles(); - } catch (RmesException e) { - return ResponseEntity.status(e.getStatus()).body(e.getDetails()); - } - return ResponseEntity.status(HttpStatus.SC_OK).body(entity); - } + @GetMapping(value = "/roles", produces = MediaType.APPLICATION_JSON_VALUE) + @Operation(operationId = "getRoles", summary = "List of roles", responses = {@ApiResponse(content = @Content(array = @ArraySchema(schema = @Schema(implementation = Roles.class))))}) + public ResponseEntity getRoles() { + String entity = null; + try { + entity = userRolesManagerService.getRoles(); + } catch (RmesException e) { + return ResponseEntity.status(e.getStatus()).body(e.getDetails()); + } + return ResponseEntity.status(HttpStatus.SC_OK).body(entity); + } } \ No newline at end of file diff --git a/src/main/java/fr/insee/rmes/webservice/StructureResources.java b/src/main/java/fr/insee/rmes/webservice/StructureResources.java index bb0448ba9..f895208ca 100644 --- a/src/main/java/fr/insee/rmes/webservice/StructureResources.java +++ b/src/main/java/fr/insee/rmes/webservice/StructureResources.java @@ -1,21 +1,5 @@ package fr.insee.rmes.webservice; -import org.apache.http.HttpStatus; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import fr.insee.rmes.bauhaus_services.Constants; import fr.insee.rmes.bauhaus_services.structures.StructureComponent; import fr.insee.rmes.bauhaus_services.structures.StructureService; @@ -31,6 +15,14 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.http.HttpStatus; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/structures") @@ -47,7 +39,7 @@ @ApiResponse(responseCode = "500", description = "Internal server error")}) public class StructureResources extends GenericResources { - static final Logger logger = LogManager.getLogger(StructureResources.class); + static final Logger logger = LoggerFactory.getLogger(StructureResources.class); @Autowired StructureService structureService; @@ -97,7 +89,7 @@ public ResponseEntity getStructureById(@PathVariable(Constants.ID) Strin } } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @GetMapping(value = "/structure/{id}/publish", produces = MediaType.APPLICATION_JSON_VALUE) @Operation(operationId = "publishStructureById", summary = "Publish a structure") public ResponseEntity publishStructureById(@PathVariable(Constants.ID) String id) { @@ -121,7 +113,7 @@ public ResponseEntity getStructureByIdDetails(@PathVariable(Constants.ID } } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @PostMapping(value = "/structure", consumes = MediaType.APPLICATION_JSON_VALUE) @Operation(operationId = "setStructure", summary = "Create a structure") @@ -135,7 +127,7 @@ public ResponseEntity setStructure( } } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @PutMapping(value = "/structure/{structureId}", consumes = MediaType.APPLICATION_JSON_VALUE) @Operation(operationId = "setStructure", summary = "Update a structure") @@ -150,7 +142,7 @@ public ResponseEntity setStructure( } } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @DeleteMapping("/structure/{structureId}") @Operation(operationId = "deleteStructure", summary = "Delete a structure") public ResponseEntity deleteStructure(@PathVariable("structureId") String structureId) { @@ -206,7 +198,7 @@ public ResponseEntity getComponentById(@PathVariable(Constants.ID) Strin } } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @GetMapping(value = "/components/{id}/publish", produces = MediaType.APPLICATION_JSON_VALUE) @Operation(operationId = "publishComponentById", summary = "Publish a component") public ResponseEntity publishComponentById(@PathVariable(Constants.ID) String id) { @@ -218,7 +210,7 @@ public ResponseEntity publishComponentById(@PathVariable(Constants.ID) S } } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @DeleteMapping(value = "/components/{id}", produces = MediaType.APPLICATION_JSON_VALUE) @Operation(operationId = "deleteComponentById", summary = "delete a mutualized component") public ResponseEntity deleteComponentById(@PathVariable(Constants.ID) String id) { @@ -230,7 +222,7 @@ public ResponseEntity deleteComponentById(@PathVariable(Constants.ID) St } } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @PutMapping(value = "/components/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @Operation(operationId = "updateComponent", summary = "Update a component") @@ -244,7 +236,7 @@ public ResponseEntity updateComponentById(@PathVariable(Constants.ID) St } } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @PostMapping(value = "/components", consumes = MediaType.APPLICATION_JSON_VALUE) @Operation(operationId = "createComponent", summary = "create a component") diff --git a/src/main/java/fr/insee/rmes/webservice/TokenApi.java b/src/main/java/fr/insee/rmes/webservice/TokenApi.java index 606f8cc06..bbec0db94 100644 --- a/src/main/java/fr/insee/rmes/webservice/TokenApi.java +++ b/src/main/java/fr/insee/rmes/webservice/TokenApi.java @@ -2,8 +2,8 @@ import fr.insee.rmes.bauhaus_services.keycloak.KeycloakServices; import fr.insee.rmes.exceptions.RmesException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -19,10 +19,10 @@ public class TokenApi extends GenericResources { protected KeycloakServices keycloakServices; - private static final Logger logger = LogManager.getLogger(TokenApi.class); + private static final Logger logger = LoggerFactory.getLogger(TokenApi.class); - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @GetMapping(value = "/{rdfServerUrl}") public String getToken(@PathVariable String rdfServerUrl) throws RmesException { logger.info("GET /token"); diff --git a/src/main/java/fr/insee/rmes/webservice/UserResources.java b/src/main/java/fr/insee/rmes/webservice/UserResources.java index 0e7bd7166..5e222c411 100644 --- a/src/main/java/fr/insee/rmes/webservice/UserResources.java +++ b/src/main/java/fr/insee/rmes/webservice/UserResources.java @@ -1,23 +1,7 @@ package fr.insee.rmes.webservice; -import org.apache.http.HttpStatus; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.fasterxml.jackson.core.JsonProcessingException; - -import fr.insee.rmes.config.auth.roles.UserRolesManagerService; -import fr.insee.rmes.config.auth.security.restrictions.StampsRestrictionsService; +import fr.insee.rmes.config.auth.user.Stamp; import fr.insee.rmes.config.auth.user.User; -import fr.insee.rmes.exceptions.RmesException; import fr.insee.rmes.external_services.authentication.stamps.StampsService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -27,6 +11,14 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.http.HttpStatus; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; /** * WebService class for resources of Concepts @@ -56,38 +48,37 @@ @ApiResponse(responseCode = "500", description = "Internal server error") }) public class UserResources extends GenericResources { - static final Logger logger = LogManager.getLogger(UserResources.class); + static final Logger logger = LoggerFactory.getLogger(UserResources.class); + + private final StampsService stampsService; - @Autowired - UserRolesManagerService userRolesManagerService; - - @Autowired - StampsService stampsService; @Autowired - StampsRestrictionsService stampsRestrictionService; + public UserResources(StampsService stampsService) { + this.stampsService = stampsService; + } @GetMapping(value = "/stamp", produces = MediaType.APPLICATION_JSON_VALUE) @Operation(operationId = "getStamp", summary = "User's stamp", responses = { @ApiResponse(content = @Content(mediaType = "application/json", schema = @Schema(implementation = String.class)))}) - public ResponseEntity getStamp() { - String stamp = null; + public ResponseEntity getStamp(@AuthenticationPrincipal Object principal) { + Stamp stamp; try { - stamp = stampsService.getStamp(); - } catch (RmesException e) { - return ResponseEntity.status(e.getStatus()).body(e.getDetails()); + stamp = stampsService.findStampFrom(principal); + } catch (Exception e) { + logger.error("exception while retrieving stamp",e); + return ResponseEntity.status(HttpStatus.SC_INTERNAL_SERVER_ERROR).body("exception while retrieving stamp"); } return ResponseEntity.status(HttpStatus.SC_OK).body(stamp); } + @PostMapping(value = "/login", produces = MediaType.APPLICATION_JSON_VALUE) @Operation(operationId = "login", summary = "Fake Login", responses = { @ApiResponse(content = @Content(mediaType = "application/json", schema = @Schema(implementation = User.class)))}) public ResponseEntity login( - @Parameter(description = "Component", required = true) @RequestBody String user) - throws JsonProcessingException { - stampsRestrictionService.setFakeUser(user); - return ResponseEntity.status(HttpStatus.SC_OK).build(); + @Parameter(description = "Component", required = true) @RequestBody String user) { + throw new RuntimeException("Deprecated to be removed: noop"); } diff --git a/src/main/java/fr/insee/rmes/webservice/operations/FamilyResources.java b/src/main/java/fr/insee/rmes/webservice/operations/FamilyResources.java index a9b4b1656..1f5853644 100644 --- a/src/main/java/fr/insee/rmes/webservice/operations/FamilyResources.java +++ b/src/main/java/fr/insee/rmes/webservice/operations/FamilyResources.java @@ -1,18 +1,5 @@ package fr.insee.rmes.webservice.operations; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import fr.insee.rmes.bauhaus_services.Constants; import fr.insee.rmes.config.swagger.model.IdLabel; import fr.insee.rmes.exceptions.RmesException; @@ -25,6 +12,12 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; /*************************************************************************************************** @@ -75,7 +68,7 @@ public ResponseEntity getFamilyByID(@PathVariable(Constants.ID) String i return ResponseEntity.status(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(jsonResultat); } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @PutMapping("/family/{id}") @io.swagger.v3.oas.annotations.Operation(operationId = "setFamilyById", summary = "Update an existing family" ) public ResponseEntity setFamilyById( @@ -90,7 +83,7 @@ public ResponseEntity setFamilyById( } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @PostMapping("/family") @io.swagger.v3.oas.annotations.Operation(operationId = "createFamily", summary = "Create a new family") public ResponseEntity createFamily( @@ -105,7 +98,7 @@ public ResponseEntity createFamily( return ResponseEntity.status(HttpStatus.OK).body(id); } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @PutMapping("/family/validate/{id}") @io.swagger.v3.oas.annotations.Operation(operationId = "setFamilyValidation", summary = "Validate a family") public ResponseEntity setFamilyValidation( diff --git a/src/main/java/fr/insee/rmes/webservice/operations/IndicatorsResources.java b/src/main/java/fr/insee/rmes/webservice/operations/IndicatorsResources.java index f2afe287c..5d3557759 100644 --- a/src/main/java/fr/insee/rmes/webservice/operations/IndicatorsResources.java +++ b/src/main/java/fr/insee/rmes/webservice/operations/IndicatorsResources.java @@ -1,19 +1,5 @@ package fr.insee.rmes.webservice.operations; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import fr.insee.rmes.bauhaus_services.Constants; import fr.insee.rmes.config.swagger.model.IdLabelAltLabel; import fr.insee.rmes.config.swagger.model.IdLabelAltLabelSims; @@ -26,6 +12,12 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; @Qualifier("Indicator") @@ -91,7 +83,8 @@ public ResponseEntity getIndicatorByID(@PathVariable(Constants.ID) Strin * @param body * @return */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() || @AuthorizeMethodDecider.isIndicatorContributor()") + //TODO Test : admin then INDICATOR_CONTRIBUTOR with stamp fit then not + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN || T(fr.insee.rmes.config.auth.roles.Roles).INDICATOR_CONTRIBUTOR)") @PutMapping(value="/indicator/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "setIndicatorById", summary = "Update indicator") public ResponseEntity setIndicatorById( @@ -111,7 +104,7 @@ public ResponseEntity setIndicatorById( * @param id * @return response */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() || @AuthorizeMethodDecider.isIndicatorContributor()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN || T(fr.insee.rmes.config.auth.roles.Roles).INDICATOR_CONTRIBUTOR)") @PutMapping(value="/indicator/validate/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "setIndicatorValidation", summary = "Indicator validation") public ResponseEntity setIndicatorValidation( @@ -129,7 +122,7 @@ public ResponseEntity setIndicatorValidation( * @param body * @return */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() || @AuthorizeMethodDecider.isIndicatorContributor()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN || T(fr.insee.rmes.config.auth.roles.Roles).INDICATOR_CONTRIBUTOR)") @PostMapping(value="/indicator", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "setIndicator", summary = "Create indicator", responses = { @ApiResponse(content = @Content(mediaType = MediaType.TEXT_PLAIN_VALUE))}) diff --git a/src/main/java/fr/insee/rmes/webservice/operations/MetadataReportResources.java b/src/main/java/fr/insee/rmes/webservice/operations/MetadataReportResources.java index 875475e02..cd33f3148 100644 --- a/src/main/java/fr/insee/rmes/webservice/operations/MetadataReportResources.java +++ b/src/main/java/fr/insee/rmes/webservice/operations/MetadataReportResources.java @@ -173,7 +173,7 @@ public ResponseEntity getMetadataReportOwner(@PathVariable(Constants.ID) * @param body * @return */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() || @AuthorizeMethodDecider.isIndicatorContributor() || @AuthorizeMethodDecider.isSeriesContributor()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN || T(fr.insee.rmes.config.auth.roles.Roles).INDICATOR_CONTRIBUTOR || T(fr.insee.rmes.config.auth.roles.Roles).SERIES_CONTRIBUTOR)") @PostMapping(value = "/metadataReport", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "setMetadataReport", summary = "Create metadata report", responses = { @ApiResponse(content = @Content(mediaType = MediaType.TEXT_PLAIN_VALUE))}) @@ -197,10 +197,10 @@ public ResponseEntity setMetadataReport( * @param body * @return */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() " - + "|| @AuthorizeMethodDecider.isIndicatorContributor() " - + "|| @AuthorizeMethodDecider.isSeriesContributor() " - + "|| @AuthorizeMethodDecider.isCnis()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN " + + ", T(fr.insee.rmes.config.auth.roles.Roles).INDICATOR_CONTRIBUTOR " + + ", T(fr.insee.rmes.config.auth.roles.Roles).SERIES_CONTRIBUTOR " + + ", T(fr.insee.rmes.config.auth.roles.Roles).CNIS)") @PutMapping(value = "/metadataReport/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "setMetadataReportById", summary = "Update metadata report") public ResponseEntity setMetadataReportById( @@ -220,7 +220,7 @@ public ResponseEntity setMetadataReportById( * @param id * @return */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() ") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @DeleteMapping(value = "/metadataReport/delete/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "deleteMetadataReportById", summary = "Delete metadata report") public ResponseEntity deleteMetadataReportById( @@ -241,9 +241,9 @@ public ResponseEntity deleteMetadataReportById( * @param id * @return response */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() " - + "|| @AuthorizeMethodDecider.isIndicatorContributor() " - + "|| @AuthorizeMethodDecider.isSeriesContributor() ") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN " + + ", T(fr.insee.rmes.config.auth.roles.Roles).INDICATOR_CONTRIBUTOR " + + ", T(fr.insee.rmes.config.auth.roles.Roles).SERIES_CONTRIBUTOR)") @PutMapping(value = "/metadataReport/validate/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "setMetadataReportValidation", summary = "Sims validation") public ResponseEntity setSimsValidation( diff --git a/src/main/java/fr/insee/rmes/webservice/operations/OperationsResources.java b/src/main/java/fr/insee/rmes/webservice/operations/OperationsResources.java index ad76223e7..2dd628f97 100644 --- a/src/main/java/fr/insee/rmes/webservice/operations/OperationsResources.java +++ b/src/main/java/fr/insee/rmes/webservice/operations/OperationsResources.java @@ -181,8 +181,8 @@ public ResponseEntity getCodeBookCheck( * @param body * @return */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() " + "|| @AuthorizeMethodDecider.isSeriesContributor() " - + "|| @AuthorizeMethodDecider.isCnis()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN " + ", T(fr.insee.rmes.config.auth.roles.Roles).SERIES_CONTRIBUTOR " + + ", T(fr.insee.rmes.config.auth.roles.Roles).CNIS)") @PutMapping(value = "/operation/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "setOperationById", summary = "Update operation") public ResponseEntity setOperationById(@PathVariable(Constants.ID) String id, @@ -201,7 +201,7 @@ public ResponseEntity setOperationById(@PathVariable(Constants.ID) Strin * @param body * @return */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() " + "|| @AuthorizeMethodDecider.isSeriesContributor() ") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN " + ", T(fr.insee.rmes.config.auth.roles.Roles).SERIES_CONTRIBUTOR)") @PostMapping(value = "/operation", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "createOperation", summary = "Create operation") public ResponseEntity createOperation( @@ -221,7 +221,7 @@ public ResponseEntity createOperation( * @param id * @return response */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() " + "|| @AuthorizeMethodDecider.isSeriesContributor() ") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN " + ", T(fr.insee.rmes.config.auth.roles.Roles).SERIES_CONTRIBUTOR)") @PutMapping(value = "/operation/validate/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "setOperationValidation", summary = "Operation validation") public ResponseEntity setOperationValidation(@PathVariable(Constants.ID) String id) throws RmesException { diff --git a/src/main/java/fr/insee/rmes/webservice/operations/SeriesResources.java b/src/main/java/fr/insee/rmes/webservice/operations/SeriesResources.java index 321196ad2..51ab91ea2 100644 --- a/src/main/java/fr/insee/rmes/webservice/operations/SeriesResources.java +++ b/src/main/java/fr/insee/rmes/webservice/operations/SeriesResources.java @@ -1,19 +1,5 @@ package fr.insee.rmes.webservice.operations; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import fr.insee.rmes.bauhaus_services.Constants; import fr.insee.rmes.config.swagger.model.IdLabelAltLabel; import fr.insee.rmes.config.swagger.model.IdLabelAltLabelSims; @@ -27,6 +13,12 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; @Qualifier("Series") @@ -105,9 +97,9 @@ public ResponseEntity getSeriesForSearchWithStamps(@Parameter( return ResponseEntity.status(HttpStatus.OK).body(jsonResultat); } - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() " - + "|| @AuthorizeMethodDecider.isSeriesContributor() " - + "|| @AuthorizeMethodDecider.isCnis()") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN " + + ", T(fr.insee.rmes.config.auth.roles.Roles).SERIES_CONTRIBUTOR " + + ", T(fr.insee.rmes.config.auth.roles.Roles).CNIS)") @PutMapping(value = "/series/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "setSeriesById", summary = "Update series") @@ -153,7 +145,7 @@ public ResponseEntity getOperationsWithReport(@PathVariable(Constants.ID * @param body * @return response */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() ") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN)") @PostMapping(value = "/series", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "createSeries", summary = "Create series") @@ -174,8 +166,8 @@ public ResponseEntity createSeries( * @param id * @return response */ - @PreAuthorize("@AuthorizeMethodDecider.isAdmin() " - + "|| @AuthorizeMethodDecider.isSeriesContributor() ") + @PreAuthorize("hasAnyRole(T(fr.insee.rmes.config.auth.roles.Roles).ADMIN " + + ", T(fr.insee.rmes.config.auth.roles.Roles).SERIES_CONTRIBUTOR)") @PutMapping(value = "/series/validate/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @io.swagger.v3.oas.annotations.Operation(operationId = "setSeriesValidation", summary = "Series validation") diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 572bcb193..6fe0e2f41 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,7 +4,6 @@ spring.config.import=classpath:bauhaus-core.properties,optional:classpath:bauhau spring.servlet.multipart.max-file-size=40MB spring.servlet.multipart.max-request-size=40MB - # Config Swagger (only for display) fr.insee.rmes.bauhaus.version=@project.version@ #springdoc.api-docs.path= @@ -14,3 +13,9 @@ springdoc.swagger-ui.path=/index.html server.servlet.contextPath=/api/ spring.security.oauth2.resourceserver.jwt.issuer-uri=${fr.insee.rmes.bauhaus.auth-server-url} + +# to log exchanges with repo rdf, switch to debug +logging.level.org.apache.http.wire=info +# to log sparql queries and results, switch to trace +logging.level.fr.insee.rmes.bauhaus_services.rdf_utils.RepositoryUtils=info + diff --git a/src/main/resources/bauhaus-core.properties b/src/main/resources/bauhaus-core.properties index 0490ffaa4..82bef0f05 100644 --- a/src/main/resources/bauhaus-core.properties +++ b/src/main/resources/bauhaus-core.properties @@ -10,6 +10,7 @@ fr.insee.rmes.bauhaus.cors.allowedOrigin=* jwt.id-claim = preferred_username jwt.role-claim = realm_access jwt.stamp-claim = timbre +jwt.role-claim.roles = roles fr.insee.rmes.bauhaus.sugoi.application = RMESGNCS fr.insee.rmes.bauhaus.sugoi.realm = SSP @@ -30,6 +31,8 @@ fr.insee.rmes.bauhaus.concepts.maxLengthScopeNote = 350 ############################### fr.insee.rmes.bauhaus.classifications.families.graph = codes/nomenclatures +fr.insee.rmes.bauhaus.activeModules = concepts,classifications,operations,habilitations + ############################### #OPERATIONS ############################### diff --git a/src/main/resources/bauhaus-dev.properties b/src/main/resources/bauhaus-dev.properties index b2196f15e..6ea106459 100644 --- a/src/main/resources/bauhaus-dev.properties +++ b/src/main/resources/bauhaus-dev.properties @@ -18,7 +18,7 @@ fr.insee.rmes.bauhaus.rdf.auth=ENABLED #HorsProd = /opt/tomcat9/logs/rmesgncs.log # Bdd Sesame de gestion -fr.insee.rmes.bauhaus.sesame.gestion.sesameServer = +fr.insee.rmes.bauhaus.sesame.gestion.sesameServer = XXX fr.insee.rmes.bauhaus.sesame.gestion.repository = XXX fr.insee.rmes.bauhaus.sesame.gestion.baseURI = http://bauhaus/ fr.insee.rmes.bauhaus.keycloak-configuration.zoneByServers.[interne.insee.fr].zone=interne @@ -29,7 +29,7 @@ fr.insee.rmes.bauhaus.sesame.publication.sesameServer = XXX fr.insee.rmes.bauhaus.sesame.publication.repository = XXX fr.insee.rmes.bauhaus.sesame.publication.baseURI = http://id.insee.fr/ fr.insee.rmes.bauhaus.keycloak-configuration.zoneByServers.[dmz.insee.fr].zone=dmz -fr.insee.rmes.bauhaus.keycloak-configuration.zoneByServers.[gestion.insee.fr].zone=interne" +fr.insee.rmes.bauhaus.keycloak-configuration.zoneByServers.[gestion.insee.fr].zone=interne # Bdd Sesame de publication interne fr.insee.rmes.bauhaus.sesame.publication.interne.repository = XXX @@ -75,6 +75,7 @@ fr.insee.rmes.bauhaus.dmz.auth-server-url = SECRET # Swagger fr.insee.rmes.bauhaus.api.host = SECRET fr.insee.rmes.bauhaus.api.basepath= XXX +fr.insee.rmes.bauhaus.api.ssl= false # Stockage fr.insee.rmes.bauhaus.storage.document.gestion = XXX diff --git a/src/main/resources/gestion/BauhausActiveModules.txt b/src/main/resources/gestion/BauhausActiveModules.txt deleted file mode 100644 index 28910b869..000000000 --- a/src/main/resources/gestion/BauhausActiveModules.txt +++ /dev/null @@ -1,5 +0,0 @@ -concepts -classifications -operations -structures -habilitations \ No newline at end of file diff --git a/src/main/resources/request/operations/series/getSeriesCreatorsByUriQuery.ftlh b/src/main/resources/request/operations/series/getSeriesCreatorsByUriQuery.ftlh index 941a23ff1..55d1a8a42 100644 --- a/src/main/resources/request/operations/series/getSeriesCreatorsByUriQuery.ftlh +++ b/src/main/resources/request/operations/series/getSeriesCreatorsByUriQuery.ftlh @@ -3,11 +3,11 @@ FROM <${OPERATIONS_GRAPH}> WHERE { { ?series dc:creator ?creators . - VALUES ?series { <${URI_SERIES}>} + VALUES ?series { ${URI_SERIES?no_esc}} } UNION { ?series dc:creator ?creators . - ?series dcterms:hasPart <${URI_SERIES}> + ?series dcterms:hasPart ${URI_SERIES?no_esc} } } \ No newline at end of file diff --git a/src/main/resources/xslTransformerFiles/collection/collectionEnPatternContent.xml b/src/main/resources/xslTransformerFiles/collection/collectionEnPatternContent.xml index 07fbe5cf2..91670c72a 100644 --- a/src/main/resources/xslTransformerFiles/collection/collectionEnPatternContent.xml +++ b/src/main/resources/xslTransformerFiles/collection/collectionEnPatternContent.xml @@ -1,35 +1,21 @@ + xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" + xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" + xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" + xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" + xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" + xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" + xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" + xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" + xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" + xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" + xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" + xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" + xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" + xmlns:officeooo="http://openoffice.org/2009/office" office:version="1.3"> + xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" + xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" + xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" + xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" + xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" + xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" + xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" + xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" + xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" + xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" + xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" + xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" + xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" + xmlns:officeooo="http://openoffice.org/2009/office" office:version="1.3"> + xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" + xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" + xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" + xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" + xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" + xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" + xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" + xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" + xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" + xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" + xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" + xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" + xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" + xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" + xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" + office:version="1.3"> + xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" + xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" + xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" + xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" + xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" + xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" + xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" + xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" + xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" + xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" + xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" + xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" + xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" + xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" + xmlns:officeooo="http://openoffice.org/2009/office" + office:version="1.2"> diff --git a/src/main/resources/xslTransformerFiles/dico-codes.xsl b/src/main/resources/xslTransformerFiles/dico-codes.xsl index 481520fda..281bbc511 100644 --- a/src/main/resources/xslTransformerFiles/dico-codes.xsl +++ b/src/main/resources/xslTransformerFiles/dico-codes.xsl @@ -1,8 +1,7 @@ - + diff --git a/src/main/resources/xslTransformerFiles/dicoCodes/dicoConcisDescrPatternContent.xml b/src/main/resources/xslTransformerFiles/dicoCodes/dicoConcisDescrPatternContent.xml index ac084d6d5..6e0c44862 100644 --- a/src/main/resources/xslTransformerFiles/dicoCodes/dicoConcisDescrPatternContent.xml +++ b/src/main/resources/xslTransformerFiles/dicoCodes/dicoConcisDescrPatternContent.xml @@ -1,33 +1,20 @@ - + - + - + - + - + xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" + xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" + xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" + xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" + xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" + xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" + xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" + xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" + xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" + xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" + xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" + xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" + xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" + xmlns:officeooo="http://openoffice.org/2009/office" + office:version="1.2"> + xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" + xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" + xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" + xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" + xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" + office:version="1.2"> diff --git a/src/test/java/fr/insee/rmes/bauhaus_services/IndicatorsUtilsTest.java b/src/test/java/fr/insee/rmes/bauhaus_services/IndicatorsUtilsTest.java index de1df553d..69edeeabb 100644 --- a/src/test/java/fr/insee/rmes/bauhaus_services/IndicatorsUtilsTest.java +++ b/src/test/java/fr/insee/rmes/bauhaus_services/IndicatorsUtilsTest.java @@ -1,8 +1,10 @@ package fr.insee.rmes.bauhaus_services; -import java.util.ArrayList; -import java.util.List; - +import fr.insee.rmes.bauhaus_services.operations.famopeserind_utils.FamOpeSerIndUtils; +import fr.insee.rmes.bauhaus_services.operations.indicators.IndicatorsUtils; +import fr.insee.rmes.exceptions.RmesException; +import fr.insee.rmes.model.links.OperationsLink; +import fr.insee.rmes.model.operations.Indicator; import org.json.JSONException; import org.json.JSONObject; import org.junit.jupiter.api.Assertions; @@ -12,11 +14,8 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import fr.insee.rmes.bauhaus_services.operations.famopeserind_utils.FamOpeSerIndUtils; -import fr.insee.rmes.bauhaus_services.operations.indicators.IndicatorsUtils; -import fr.insee.rmes.exceptions.RmesException; -import fr.insee.rmes.model.links.OperationsLink; -import fr.insee.rmes.model.operations.Indicator; +import java.util.ArrayList; +import java.util.List; class IndicatorsUtilsTest { @@ -49,8 +48,6 @@ public void init() { } - //getCodeListByNotation// - @Test void givenBuildIndicatorFromJson_whenCorrectRequest_thenResponseIsOk() throws RmesException { diff --git a/src/test/java/fr/insee/rmes/bauhaus_services/keycloak/KeycloakServicesTest.java b/src/test/java/fr/insee/rmes/bauhaus_services/keycloak/KeycloakServicesTest.java index 2a56e257e..01379eca2 100644 --- a/src/test/java/fr/insee/rmes/bauhaus_services/keycloak/KeycloakServicesTest.java +++ b/src/test/java/fr/insee/rmes/bauhaus_services/keycloak/KeycloakServicesTest.java @@ -27,7 +27,7 @@ @TestPropertySource(properties = { "fr.insee.rmes.bauhaus.keycloak.client.secret = XXX", "fr.insee.rmes.bauhaus.keycloak.client.id = XXX", - "fr.insee.rmes.bauhaus.auth-server-url= keycloak.interne", + "fr.insee.rmes.bauhaus.auth-server-url = keycloak.interne", "fr.insee.rmes.bauhaus.keycloak.client.dmz.secret = XXX", "fr.insee.rmes.bauhaus.keycloak.client.dmz.id = XXX", "fr.insee.rmes.bauhaus.dmz.auth-server-url = keycloak.dmz", @@ -42,7 +42,6 @@ class KeycloakServicesTest { @Autowired private KeycloakServicesStub keycloakServices; - private Token token; @Test void nowPlus1Second() { diff --git a/src/test/java/fr/insee/rmes/bauhaus_services/operations/documentations/DocumentationsUtilsTest.java b/src/test/java/fr/insee/rmes/bauhaus_services/operations/documentations/DocumentationsUtilsTest.java index 8f6fed947..1b746acd7 100644 --- a/src/test/java/fr/insee/rmes/bauhaus_services/operations/documentations/DocumentationsUtilsTest.java +++ b/src/test/java/fr/insee/rmes/bauhaus_services/operations/documentations/DocumentationsUtilsTest.java @@ -1,26 +1,21 @@ package fr.insee.rmes.bauhaus_services.operations.documentations; -import static org.junit.jupiter.api.Assertions.fail; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.when; - -import org.apache.http.HttpStatus; -import org.json.JSONException; -import org.json.JSONObject; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.MockitoAnnotations; -import org.mockito.Spy; - import fr.insee.rmes.bauhaus_services.Constants; import fr.insee.rmes.bauhaus_services.operations.ParentUtils; import fr.insee.rmes.bauhaus_services.rdf_utils.RepositoryGestion; import fr.insee.rmes.exceptions.RmesException; import fr.insee.rmes.model.operations.documentations.Documentation; import fr.insee.rmes.model.operations.documentations.DocumentationRubric; +import org.apache.http.HttpStatus; +import org.json.JSONException; +import org.json.JSONObject; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.*; + +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.when; class DocumentationsUtilsTest { diff --git a/src/test/java/fr/insee/rmes/bauhaus_services/rdf_utils/RepositoryInitiatorWithAuthentTest.java b/src/test/java/fr/insee/rmes/bauhaus_services/rdf_utils/RepositoryInitiatorWithAuthentTest.java index 55833190b..b80bcfaa4 100644 --- a/src/test/java/fr/insee/rmes/bauhaus_services/rdf_utils/RepositoryInitiatorWithAuthentTest.java +++ b/src/test/java/fr/insee/rmes/bauhaus_services/rdf_utils/RepositoryInitiatorWithAuthentTest.java @@ -11,7 +11,6 @@ import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; diff --git a/src/test/java/fr/insee/rmes/bauhaus_services/stamps/StampsRestrictionServiceImplTest.java b/src/test/java/fr/insee/rmes/bauhaus_services/stamps/StampsRestrictionServiceImplTest.java new file mode 100644 index 000000000..886db7f3b --- /dev/null +++ b/src/test/java/fr/insee/rmes/bauhaus_services/stamps/StampsRestrictionServiceImplTest.java @@ -0,0 +1,62 @@ +package fr.insee.rmes.bauhaus_services.stamps; + +import fr.insee.rmes.bauhaus_services.rdf_utils.RepositoryGestion; +import fr.insee.rmes.bauhaus_services.rdf_utils.RepositoryUtils; +import fr.insee.rmes.config.ConfigStub; +import fr.insee.rmes.config.auth.UserProvider; +import fr.insee.rmes.config.auth.user.User; +import fr.insee.rmes.exceptions.RmesException; +import fr.insee.rmes.persistance.sparql_queries.operations.series.OpSeriesQueries; +import org.eclipse.rdf4j.model.IRI; +import org.eclipse.rdf4j.model.impl.SimpleValueFactory; +import org.json.JSONArray; +import org.json.JSONObject; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.net.URISyntaxException; +import java.nio.file.Path; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class StampsRestrictionServiceImplTest { + + String timbre = "FR01-XXX"; + @Mock + private RepositoryGestion repoGestion; + @Mock + private UserProvider userProvider; + private final IRI iriToCheck = SimpleValueFactory.getInstance().createIRI("http://bauhaus/operations/serie/s2132"); + + @BeforeAll + static void activateTraceLevel() throws URISyntaxException { + var logbackConfigFilePath = Path.of(StampsRestrictionServiceImplTest.class + .getClassLoader() + .getResource(".") + .toURI()) + .resolve("logback-test-trace.xml"); + + System.setProperty("logback.configurationFile", logbackConfigFilePath.toString()); + } + + @BeforeAll + static void configureOpSeriesQueries() { + OpSeriesQueries.setConfig(new ConfigStub()); + } + + @Test + void isSeriesManager_OK_whenStampIsManager() throws RmesException { + var owners=new JSONArray("[{\"creators\":\""+timbre+"\"}]"); + when(repoGestion.getResponseAsArray(anyString())).thenReturn(owners); + when(userProvider.findUserDefaultToEmpty()).thenReturn(new User("", List.of(), timbre)); + var stampsRestrictionServiceImpl = new StampsRestrictionServiceImpl(repoGestion, null, userProvider); + assertTrue(stampsRestrictionServiceImpl.isSeriesManager(this.iriToCheck)); + } +} \ No newline at end of file diff --git a/src/test/java/fr/insee/rmes/config/ConfigStub.java b/src/test/java/fr/insee/rmes/config/ConfigStub.java new file mode 100644 index 000000000..62128a720 --- /dev/null +++ b/src/test/java/fr/insee/rmes/config/ConfigStub.java @@ -0,0 +1,29 @@ +package fr.insee.rmes.config; + +public class ConfigStub extends Config { + + @Override + public String getLg2() { + return "en"; + } + + @Override + public String getLg1() { + return "fr"; + } + + @Override + public String getOperationsGraph() { + return "http://rdf.insee.fr/graphes/operations"; + } + + @Override + public String getOrganizationsGraph() { + return "http://rdf.insee.fr/graphes/organisations"; + } + + @Override + public String getOrgInseeGraph() { + return "http://rdf.insee.fr/graphes/organisations/insee"; + } +} diff --git a/src/test/java/fr/insee/rmes/config/auth/security/OpenIDConnectSecurityContextTest.java b/src/test/java/fr/insee/rmes/config/auth/security/OpenIDConnectSecurityContextTest.java new file mode 100644 index 000000000..c30118ebe --- /dev/null +++ b/src/test/java/fr/insee/rmes/config/auth/security/OpenIDConnectSecurityContextTest.java @@ -0,0 +1,142 @@ +package fr.insee.rmes.config.auth.security; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.encoder.PatternLayoutEncoder; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.Appender; +import ch.qos.logback.core.OutputStreamAppender; +import com.nimbusds.jose.shaded.json.JSONArray; +import com.nimbusds.jose.shaded.json.JSONObject; +import fr.insee.rmes.config.auth.user.User; +import fr.insee.rmes.exceptions.RmesException; +import org.jetbrains.annotations.NotNull; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.slf4j.LoggerFactory; + +import java.io.ByteArrayOutputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static fr.insee.rmes.config.auth.security.OpenIDConnectSecurityContext.LOG_INFO_DEFAULT_STAMP; +import static fr.insee.rmes.config.auth.security.OpenIDConnectSecurityContext.TIMBRE_ANONYME; +import static org.assertj.core.api.Assertions.assertThat; + +class OpenIDConnectSecurityContextTest { + + private static final ByteArrayOutputStream logOutputStream=new ByteArrayOutputStream(); + private static final String idep = "zzzzzz"; + private static final String timbre="DR59-SNDI"; + private static final List roles = List.of("role1", "role2", "role3", "role4", "role5"); + + private static final JSONArray rolesOfAccount=initJsonArray("manage-account", + "manage-account-links", + "view-profile"); + + private static final JSONArray allowedOrigins = initJsonArray("https://gestion-metadonnees.insee.fr", + "https://preprod.gestion-metadonnees.insee.fr", + "https://test-gestion-metadonnees.insee.fr"); + + private static final JSONArray rolesOfJwt = initJsonArray(roles); + + private static final JSONArray rolesOfRealmAccess = rolesOfJwt; + + private static final Map jwtDecoded=initJwtDecoded(); + + + private static JSONArray initJsonArray(List elements) { + var retour=new JSONArray(); + retour.addAll(elements); + return retour; + } + + private static JSONArray initJsonArray(String... elements) { + return initJsonArray(List.of(elements)); + } + + private static Map initJwtDecoded() { + Map retour =new HashMap<>(); + retour.put("sub", "f:fblabbalbalba:ZZZZZZ"); + retour.put("resource_access", new JSONObject(Map.of( + "account", new JSONObject(Map.of( + "roles", rolesOfAccount) + ) + ))); + retour.put("matricule", "0000000000054"); + retour.put("allowed-origins", allowedOrigins); + retour.put("roles", rolesOfJwt); + retour.put("iss", "https://blabla.fr/a/r/a"); + retour.put("typ", "Bearer"); + retour.put("preferred_username", idep); + retour.put("given_name", "Fabrice"); + retour.put("sid", "c3000000-0000-0000-0000-000000000"); + retour.put("aud", List.of("account")); + retour.put("timbre", timbre); + retour.put("realm_access", new JSONObject(Map.of("roles", rolesOfRealmAccess))); + retour.put("idminefi", "1010101010101"); + retour.put("azp", "blblblblbl-frontend"); + retour.put("auth_time", 1693372846); + retour.put("scope", "insee-timbre-matricule"); + retour.put("name", "Fabrice Vivonne"); + retour.put("exp", "Wed Aug 30 15,15,33 CEST 2023"); + retour.put("session_state", "c000000-0000-0000-0000-00000000000"); + retour.put("iat", "Wed Aug 30 15,10,33 CEST 2023"); + retour.put("family_name", "Vivonne"); + retour.put("jti", "000000-0000-0000-0000-000000000"); + retour.put("email", "fabrice.vivonne@insee.fr"); + return retour; + } + + @BeforeAll + static void configureLog4j(){ + LoggerContext context = ((LoggerContext) LoggerFactory.getILoggerFactory()); + addAppenderToOidcSecurityContextLogger(createOutputStreamAppender(context), context); + } + + private static void addAppenderToOidcSecurityContextLogger(Appender appender, LoggerContext context) { + var oidcSecurityContextLogger = context.getLogger(OpenIDConnectSecurityContext.class); + oidcSecurityContextLogger.setLevel(Level.INFO); + oidcSecurityContextLogger.addAppender(appender); + } + + @NotNull + private static Appender createOutputStreamAppender(LoggerContext context) { + PatternLayoutEncoder ple=new PatternLayoutEncoder(); + ple.setPattern("%msg"); + ple.setContext(context); + ple.start(); + var appender = new OutputStreamAppender(); + appender.setContext(context); + appender.setEncoder(ple); + appender.setOutputStream(logOutputStream); + appender.start(); + + return appender; + } + + @Test + void testJwt() throws RmesException { + var oidcContext = new OpenIDConnectSecurityContext("timbre", "realm_access", "preferred_username", false, "roles"); + + User user = oidcContext.buildUserFromToken(jwtDecoded); + assertThat(user.id()).isEqualTo(idep); + assertThat(user.getStamp()).isEqualTo(timbre); + assertThat(user.roles()).isEqualTo(roles); + } + + @Test + void testJwt_sansTimbre() throws RmesException { + logOutputStream.reset(); + + var oidcContext = new OpenIDConnectSecurityContext( "timbr", "realm_access", "preferred_username", false, "roles"); + + User user = oidcContext.buildUserFromToken(jwtDecoded); + assertThat(user.id()).isEqualTo(idep); + assertThat(user.getStamp()).isEqualTo(TIMBRE_ANONYME); + assertThat(user.roles()).isEqualTo(roles); + assertThat(logOutputStream.toString().trim()).hasToString(String.format(LOG_INFO_DEFAULT_STAMP.replace("{}", "%s"), idep)); + logOutputStream.reset(); + } +} \ No newline at end of file diff --git a/src/test/java/fr/insee/rmes/integration/authorizations/PublicResourcesAuthorizationsTest.java b/src/test/java/fr/insee/rmes/integration/authorizations/PublicResourcesAuthorizationsTest.java new file mode 100644 index 000000000..25c7cc958 --- /dev/null +++ b/src/test/java/fr/insee/rmes/integration/authorizations/PublicResourcesAuthorizationsTest.java @@ -0,0 +1,65 @@ +package fr.insee.rmes.integration.authorizations; + +import fr.insee.rmes.config.Config; +import fr.insee.rmes.config.auth.UserProviderFromSecurityContext; +import fr.insee.rmes.config.auth.roles.UserRolesManagerService; +import fr.insee.rmes.config.auth.security.CommonSecurityConfiguration; +import fr.insee.rmes.config.auth.security.DefaultSecurityContext; +import fr.insee.rmes.config.auth.security.OpenIDConnectSecurityContext; +import fr.insee.rmes.external_services.authentication.stamps.StampsService; +import fr.insee.rmes.webservice.PublicResources; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.stream.Stream; + +import static fr.insee.rmes.config.auth.security.OpenIDConnectSecurityContext.PUBLIC_RESOURCES_ANT_PATTERNS; +import static fr.insee.rmes.integration.authorizations.TokenForTestsConfiguration.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + + +@WebMvcTest(controllers= PublicResources.class, + properties = {"fr.insee.rmes.bauhaus.env=PROD", + "jwt.stamp-claim=" + STAMP_CLAIM, + "jwt.role-claim=" + ROLE_CLAIM, + "jwt.id-claim=" + ID_CLAIM, + "jwt.role-claim.roles=" + KEY_FOR_ROLES_IN_ROLE_CLAIM, + "logging.level.org.springframework.security=DEBUG", + "logging.level.org.springframework.security.web.access=TRACE", + "logging.level.fr.insee.rmes.config.auth=TRACE"}) +@Import({Config.class, + OpenIDConnectSecurityContext.class, + DefaultSecurityContext.class, + CommonSecurityConfiguration.class, + UserProviderFromSecurityContext.class}) +class PublicResourcesAuthorizationsTest { + + @Autowired + private MockMvc mvc; + + @MockBean + private StampsService stampsService; + + @MockBean + private UserRolesManagerService userRolesManagerService; + + public static Stream endpointsProvider() { + return Stream.of(PUBLIC_RESOURCES_ANT_PATTERNS).map(Arguments::of); + } + + @ParameterizedTest + @MethodSource("endpointsProvider") + void ok_withoutAuth(String endpoint) throws Exception { + this.mvc.perform(get(endpoint).accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + +} diff --git a/src/test/java/fr/insee/rmes/integration/authorizations/TestGeographyResourcesAuthorizationsEnvHorsProd.java b/src/test/java/fr/insee/rmes/integration/authorizations/TestGeographyResourcesAuthorizationsEnvHorsProd.java new file mode 100644 index 000000000..51c23b6d9 --- /dev/null +++ b/src/test/java/fr/insee/rmes/integration/authorizations/TestGeographyResourcesAuthorizationsEnvHorsProd.java @@ -0,0 +1,116 @@ +package fr.insee.rmes.integration.authorizations; + +import fr.insee.rmes.bauhaus_services.GeographyService; +import fr.insee.rmes.config.Config; +import fr.insee.rmes.config.auth.UserProviderFromSecurityContext; +import fr.insee.rmes.config.auth.security.DefaultSecurityContext; +import fr.insee.rmes.config.auth.security.OpenIDConnectSecurityContext; +import fr.insee.rmes.webservice.GeographyResources; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; +import org.springframework.http.MediaType; +import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.List; + +import static fr.insee.rmes.integration.authorizations.TokenForTestsConfiguration.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@WebMvcTest(controllers = GeographyResources.class, + properties = {"fr.insee.rmes.bauhaus.env=HORSPROD", + "jwt.stamp-claim=" + STAMP_CLAIM, + "jwt.role-claim=" + ROLE_CLAIM, + "jwt.id-claim=" + ID_CLAIM, + "jwt.role-claim.roles=" + KEY_FOR_ROLES_IN_ROLE_CLAIM + } +) +@Import({Config.class, + OpenIDConnectSecurityContext.class, + DefaultSecurityContext.class, + UserProviderFromSecurityContext.class}) +class TestGeographyResourcesAuthorizationsEnvHorsProd { + + @Autowired + private MockMvc mvc; + + @MockBean + private GeographyService geographyService; + + @MockBean + private JwtDecoder jwtDecoder; + + private final String idep = "xxxxux"; + private final String timbre = "XX59-YYY"; + + @Test + void getTerritoriesAuthentified_ok() throws Exception { + String idep = "xxxxux"; + String timbre = "XX59-YYY"; + configureJwtDecoderMock(jwtDecoder, idep, timbre, List.of("bidon")); + + mvc.perform(get("/geo/territories").header("Authorization", "Bearer toto") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + void getTerritoriesUnauthentified_ok() throws Exception { + mvc.perform(get("/geo/territories") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + void postTerritoriesUnauthentified_ok() throws Exception { + mvc.perform(post("/geo/territory") + .contentType(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON) + .content("{\"id\": \"1\"}")) + .andExpect(status().isOk()); + } + + @Test + void postTerritoriesNoAdmin_ok() throws Exception { + configureJwtDecoderMock(jwtDecoder, idep, timbre, List.of("bidon")); + mvc.perform(post("/geo/territory") + .header("Authorization", "Bearer toto") + .contentType(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON) + .content("{\"id\": \"1\"}")) + .andExpect(status().isOk()); + } + + @Test + void postTerritoriesAdmin_ok() throws Exception { + configureJwtDecoderMock(jwtDecoder, idep, timbre, List.of("Administrateur_RMESGNCS")); + mvc.perform(post("/geo/territory") + .header("Authorization", "Bearer toto") + .contentType(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON) + .content("{\"id\": \"1\"}")) + .andExpect(status().isOk()); + } + + @Test + void optionCreateTerritoriesUnauthentified_ok() throws Exception { + mvc.perform(options("/geo/territory") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + void optionCreateTerritoriesNoAdmin_ok() throws Exception { + configureJwtDecoderMock(jwtDecoder, idep, timbre, List.of("bidon")); + + mvc.perform(options("/geo/territory") + .header("Authorization", "Bearer toto") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + +} diff --git a/src/test/java/fr/insee/rmes/integration/authorizations/TestGeographyResourcesAuthorizationsEnvProd.java b/src/test/java/fr/insee/rmes/integration/authorizations/TestGeographyResourcesAuthorizationsEnvProd.java new file mode 100644 index 000000000..7fdc0e2a6 --- /dev/null +++ b/src/test/java/fr/insee/rmes/integration/authorizations/TestGeographyResourcesAuthorizationsEnvProd.java @@ -0,0 +1,129 @@ +package fr.insee.rmes.integration.authorizations; + +import fr.insee.rmes.bauhaus_services.GeographyService; +import fr.insee.rmes.config.Config; +import fr.insee.rmes.config.auth.UserProviderFromSecurityContext; +import fr.insee.rmes.config.auth.security.CommonSecurityConfiguration; +import fr.insee.rmes.config.auth.security.DefaultSecurityContext; +import fr.insee.rmes.config.auth.security.OpenIDConnectSecurityContext; +import fr.insee.rmes.webservice.GeographyResources; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Import; +import org.springframework.http.MediaType; +import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.List; + +import static fr.insee.rmes.integration.authorizations.TokenForTestsConfiguration.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@WebMvcTest(controllers = GeographyResources.class, + properties = {"fr.insee.rmes.bauhaus.env=PROD", + "jwt.stamp-claim=" + STAMP_CLAIM, + "jwt.role-claim=" + ROLE_CLAIM, + "jwt.id-claim=" + ID_CLAIM, + "jwt.role-claim.roles=" + KEY_FOR_ROLES_IN_ROLE_CLAIM, + "logging.level.org.springframework.security=DEBUG", + "logging.level.org.springframework.security.web.access=TRACE", + "logging.level.fr.insee.rmes.config.auth=TRACE"} +) +@Import({Config.class, + OpenIDConnectSecurityContext.class, + DefaultSecurityContext.class, + CommonSecurityConfiguration.class, + UserProviderFromSecurityContext.class}) +class TestGeographyResourcesAuthorizationsEnvProd { + + @Autowired + private MockMvc mvc; + + @MockBean + private GeographyService geographyService; + + @MockBean + private JwtDecoder jwtDecoder; + + private final String idep = "xxxxux"; + private final String timbre = "XX59-YYY"; + + + @Test + void getTerritoriesAuthentified_ok() throws Exception { + configureJwtDecoderMock(jwtDecoder, idep, timbre, List.of("bidon")); + + mvc.perform(get("/geo/territories").header("Authorization", "Bearer toto") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + void getTerritoriesUnauthentified_401() throws Exception { + mvc.perform(get("/geo/territories") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isUnauthorized()); + } + + @Test + void postTerritoriesUnauthentified_401() throws Exception { + mvc.perform(post("/geo/territory") + .contentType(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON) + .content("{\"id\": \"1\"}")) + .andExpect(status().isUnauthorized()); + } + + @Test + void postTerritoriesNoAdmin_403() throws Exception { + configureJwtDecoderMock(jwtDecoder, idep, timbre, List.of("bidon")); + mvc.perform(post("/geo/territory") + .header("Authorization", "Bearer toto") + .contentType(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON) + .content("{\"id\": \"1\"}")) + .andExpect(status().isForbidden()); + + } + + @Test + void postTerritoriesAdmin_ok() throws Exception { + configureJwtDecoderMock(jwtDecoder, idep, timbre, List.of("Administrateur_RMESGNCS")); + + mvc.perform(post("/geo/territory").header("Authorization", "Bearer toto") + .contentType(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON) + .content("{\"id\": \"1\"}")) + .andExpect(status().isOk()); + } + + @Test + void optionCreateTerritoriesNoAdmin_ok() throws Exception { + configureJwtDecoderMock(jwtDecoder, idep, timbre, List.of("bidon")); + + mvc.perform(options("/geo/territory") + .header("Authorization", "Bearer toto") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + void optionCreateTerritoriesUnauthentified_ok() throws Exception { + mvc.perform(options("/geo/territory") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + void optionCreateTerritoriesAsAdmin_ok() throws Exception { + configureJwtDecoderMock(jwtDecoder, idep, timbre, List.of("Administrateur_RMESGNCS")); + mvc.perform(options("/geo/territory") + .header("Authorization", "Bearer toto") + .accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + +} diff --git a/src/test/java/fr/insee/rmes/integration/authorizations/TokenForTestsConfiguration.java b/src/test/java/fr/insee/rmes/integration/authorizations/TokenForTestsConfiguration.java new file mode 100644 index 000000000..b3aeeac4a --- /dev/null +++ b/src/test/java/fr/insee/rmes/integration/authorizations/TokenForTestsConfiguration.java @@ -0,0 +1,38 @@ +package fr.insee.rmes.integration.authorizations; + +import com.nimbusds.jose.shaded.json.JSONArray; +import com.nimbusds.jose.shaded.json.JSONObject; +import org.springframework.security.oauth2.jwt.Jwt; +import org.springframework.security.oauth2.jwt.JwtDecoder; + +import java.util.List; + +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.when; + +public class TokenForTestsConfiguration { + + public static final String ROLE_CLAIM = "realm_access"; + public static final String KEY_FOR_ROLES_IN_ROLE_CLAIM = "roles"; + public static final String STAMP_CLAIM = "timbre"; + public static final String ID_CLAIM = "preferred_username"; + + public static void configureJwtDecoderMock(JwtDecoder jwtDecoderMock, String idep, String timbre, List roles) { + when(jwtDecoderMock.decode(anyString())).then(invocation -> Jwt.withTokenValue(invocation.getArgument(0)) + .header("typ", "JWT") + .header("alg", "none") + .claim(ID_CLAIM, idep) + .claim(STAMP_CLAIM, timbre) + .claim(ROLE_CLAIM, jsonRoles(roles)) + .build()); + } + + private static JSONObject jsonRoles(List roles) { + var jsonObject = new JSONObject(); + var jsonArray=new JSONArray(); + jsonArray.addAll(roles); + jsonObject.put(KEY_FOR_ROLES_IN_ROLE_CLAIM, jsonArray); + return jsonObject; + } + +} diff --git a/src/test/java/fr/insee/rmes/persistance/sparql_queries/operations/series/OpSeriesQueriesTest.java b/src/test/java/fr/insee/rmes/persistance/sparql_queries/operations/series/OpSeriesQueriesTest.java new file mode 100644 index 000000000..d6bd45e12 --- /dev/null +++ b/src/test/java/fr/insee/rmes/persistance/sparql_queries/operations/series/OpSeriesQueriesTest.java @@ -0,0 +1,58 @@ +package fr.insee.rmes.persistance.sparql_queries.operations.series; + +import fr.insee.rmes.bauhaus_services.rdf_utils.ObjectType; +import fr.insee.rmes.bauhaus_services.rdf_utils.RdfUtils; +import fr.insee.rmes.bauhaus_services.rdf_utils.UriUtils; +import fr.insee.rmes.config.ConfigStub; +import fr.insee.rmes.persistance.sparql_queries.GenericQueries; +import org.eclipse.rdf4j.model.IRI; +import org.junit.jupiter.api.Test; + +import java.util.List; +import java.util.Optional; + +import static fr.insee.rmes.utils.StringUtils.urisAsString; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; + +class OpSeriesQueriesTest { + + public static final String SERIES_BASE_URI="operations/serie"; + + private String actualRequest; + + + @Test + void getCreatorsBySeriesUri_requestIsWellGenerated() { + var id="s2132"; + prepareRdfUtils(); + prepareGenericQueries(); + List uris=List.of(RdfUtils.objectIRI(ObjectType.SERIES,id)); + String expectedGeneratedQuery= """ + SELECT ?creators\s + FROM + WHERE { + { + ?series dc:creator ?creators . + VALUES ?series {