community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Fix reggex issue when configuring wifi' (#298) from osh.silva/device-mgt-core:wifi-10045 into master

Browse Source 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/298
This commit is contained in:
Pahansith Gunathilake 2023-12-17 14:21:51 +00:00
commit 77e13f3c4d
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/MetadataServiceImpl.java
View File

@ -95,6 +95,9 @@ public class MetadataServiceImpl implements MetadataService {
@PathParam("metaKey") String metaKey) {
Metadata metadata;
try {
if (metaKey.contains("-")) {
metaKey = metaKey.replace('-', '_');
}
metadata = DeviceMgtAPIUtils.getMetadataManagementService().retrieveMetadata(metaKey);
return Response.status(Response.Status.OK).entity(metadata).build();
} catch (MetadataManagementException e) {
@ -144,6 +147,9 @@ public class MetadataServiceImpl implements MetadataService {
public Response deleteMetadataEntry(
@PathParam("metaKey") String metaKey) {
try {
if (metaKey.contains("-")) {
metaKey = metaKey.replace('-', '_');
}
DeviceMgtAPIUtils.getMetadataManagementService().deleteMetadata(metaKey);
return Response.status(Response.Status.OK).entity("Metadata entry is deleted successfully.").build();
} catch (MetadataKeyNotFoundException e) {

3
components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/util/RequestValidationUtil.java
View File

@ -805,6 +805,9 @@ public class RequestValidationUtil {
new ErrorResponse.ErrorResponseBuilder()
.setCode(HttpStatus.SC_BAD_REQUEST).setMessage(msg).build());
}
if (metadata.getMetaKey().contains("-")) {
metadata.setMetaKey(metadata.getMetaKey().replace('-', '_'));
}
String regex = "^[a-zA-Z0-9_.]*$";
if (!metadata.getMetaKey().matches(regex)) {
String msg = "Request parameter metaKey should only contain period, " +