diff --git a/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/controller/PacketReaderController.java b/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/controller/PacketReaderController.java index bf8459c7ca..468c7f4c2b 100644 --- a/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/controller/PacketReaderController.java +++ b/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/controller/PacketReaderController.java @@ -43,7 +43,8 @@ public class PacketReaderController { @Autowired private PacketReaderService packetReaderService; - @PreAuthorize("hasAnyRole('DATA_READ')") + //@PreAuthorize("hasAnyRole('DATA_READ')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPostsearchfield())") @ResponseFilter @PostMapping(path = "/searchField", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper searchField(@RequestBody(required = true) RequestWrapper fieldDto) { @@ -61,7 +62,8 @@ public ResponseWrapper searchField(@RequestBody(required = tru return response; } - @PreAuthorize("hasAnyRole('DATA_READ')") + //@PreAuthorize("hasAnyRole('DATA_READ')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPostsearchfields())") @ResponseFilter @PostMapping(path = "/searchFields", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper searchFields(@RequestBody(required = true) RequestWrapper request) { @@ -84,7 +86,8 @@ public ResponseWrapper searchFields(@RequestBody(required = tr return response; } - @PreAuthorize("hasAnyRole('DOCUMENT_READ')") + // @PreAuthorize("hasAnyRole('DOCUMENT_READ')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPostdocument())") @ResponseFilter @PostMapping(path = "/document", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper getDocument(@RequestBody(required = true) RequestWrapper request) { @@ -99,7 +102,8 @@ public ResponseWrapper getDocument(@RequestBody(required = true) Reque return response; } - @PreAuthorize("hasAnyRole('BIOMETRIC_READ')") + // @PreAuthorize("hasAnyRole('BIOMETRIC_READ')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPostbiometrics())") @ResponseFilter @PostMapping(path = "/biometrics", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper getBiometrics(@RequestBody(required = true) RequestWrapper request) { @@ -115,7 +119,8 @@ public ResponseWrapper getBiometrics(@RequestBody(required = tr return response; } - @PreAuthorize("hasAnyRole('METADATA_READ')") + //@PreAuthorize("hasAnyRole('METADATA_READ')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPostmetainfo())") @ResponseFilter @PostMapping(path = "/metaInfo", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper getMetaInfo(@RequestBody(required = true) RequestWrapper request) { @@ -129,7 +134,8 @@ public ResponseWrapper getMetaInfo(@RequestBody(required = tru return response; } - @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") + // @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPostaudits())") @ResponseFilter @PostMapping(path = "/audits", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper> getAudits(@RequestBody(required = true) RequestWrapper request) { @@ -149,7 +155,8 @@ public ResponseWrapper> getAudits(@RequestBody(required = return response; } - @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") + // @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPostvalidatepacket())") @ResponseFilter @PostMapping(path = "/validatePacket", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper validatePacket(@RequestBody(required = true) RequestWrapper request) { @@ -161,8 +168,9 @@ public ResponseWrapper validatePacket(@RequestBody(requi return response; } - @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") - @ResponseFilter + //@PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPostgettags())") + @ResponseFilter @PostMapping(path = "/getTags", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper getTags( @RequestBody(required = true) RequestWrapper request) { @@ -174,7 +182,8 @@ public ResponseWrapper getTags( return response; } - @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") + // @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPostinfo())") @ResponseFilter @PostMapping(path = "/info", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper info(@RequestBody(required = true) RequestWrapper request) { diff --git a/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/controller/PacketWriterController.java b/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/controller/PacketWriterController.java index 09c3fafef7..e907e9dec2 100644 --- a/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/controller/PacketWriterController.java +++ b/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/controller/PacketWriterController.java @@ -28,8 +28,9 @@ public class PacketWriterController { - @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") - @ResponseFilter + // @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPutcreatepacket())") + @ResponseFilter @PutMapping(path = "/createPacket", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper> createPacket(@RequestBody(required = true) RequestWrapper requestr) { @@ -47,7 +48,8 @@ private ResponseWrapper getResponseWrapper() { return response; } - @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") + //@PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") + @PreAuthorize("hasAnyRole(@authorizedRoles.getPostaddtag())") @ResponseFilter @PostMapping(path = "/addTag", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper setTags( @@ -59,7 +61,8 @@ public ResponseWrapper setTags( return response; } - @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") +// @PreAuthorize("hasAnyRole('REGISTRATION_PROCESSOR')") +@PreAuthorize("hasAnyRole(@authorizedRoles.getPostaddorupdatetag())") @ResponseFilter @PostMapping(path = "/addOrUpdateTag", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseWrapper updateTags(@RequestBody(required = true) RequestWrapper tagRequest) { diff --git a/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/dto/AuthorizedRolesDTO.java b/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/dto/AuthorizedRolesDTO.java new file mode 100644 index 0000000000..e3026493b4 --- /dev/null +++ b/commons-packet/commons-packet-service/src/main/java/io/mosip/commons/packetmanager/dto/AuthorizedRolesDTO.java @@ -0,0 +1,45 @@ +package io.mosip.commons.packetmanager.dto; + +import java.util.List; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +import lombok.Getter; +import lombok.Setter; + + +@Component("authorizedRoles") +@ConfigurationProperties(prefix = "mosip.role.packetmanager") +@Getter +@Setter +public class AuthorizedRolesDTO { + + private List postsearchfield; + + private List postsearchfields; + + private List postdocument; + + private List postbiometrics; + + private List postmetainfo; + + private List postaudits; + + private List postvalidatepacket; + + private List postgettags; + + private List postinfo; + + private List postcreatepacket; + + private List postaddtag; + + private List postaddorupdatetag; + + private List postdeletetag; + + +} \ No newline at end of file diff --git a/commons-packet/commons-packet-service/src/test/resources/application.properties b/commons-packet/commons-packet-service/src/test/resources/application.properties index 07c49c96e3..af93a822c5 100644 --- a/commons-packet/commons-packet-service/src/test/resources/application.properties +++ b/commons-packet/commons-packet-service/src/test/resources/application.properties @@ -29,3 +29,18 @@ mosip.kernel.machineid.length=5 masterdata.registerdevice.timestamp.validate=+5 mosip.kernel.applicant.type.age.limit = 5 +#adding commons-packet-manager properties +mosip.role.packetmanager.postcreatepacket=REGISTRATION_PROCESSOR +mosip.role.packetmanager.postaddtag=REGISTRATION_PROCESSOR +mosip.role.packetmanager.postaddorupdatetag=REGISTRATION_PROCESSOR +mosip.role.packetmanager.postdeletetag=REGISTRATION_PROCESSOR +mosip.role.packetmanager.postinfo=REGISTRATION_PROCESSOR +mosip.role.packetmanager.postgettags=REGISTRATION_PROCESSOR +mosip.role.packetmanager.postvalidatepacket=REGISTRATION_PROCESSOR +mosip.role.packetmanager.postaudits=REGISTRATION_PROCESSOR +mosip.role.packetmanager.postmetainfo=METADATA_READ +mosip.role.packetmanager.postbiometrics=BIOMETRIC_READ +mosip.role.packetmanager.postdocument=DOCUMENT_READ +mosip.role.packetmanager.postsearchfields=DATA_READ +mosip.role.packetmanager.postsearchfield=DATA_READ +