[ranger] branch RANGER-3923 updated: RANGER-4437: trim leading/trialing spaces in datashare/dataset/project/shared-resource names

[madhan]

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/RANGER-3923 by this push:
     new af4fdfd1b RANGER-4437: trim leading/trialing spaces in 
datashare/dataset/project/shared-resource names
af4fdfd1b is described below

commit af4fdfd1b63392eb39a0f7be3b8993fe8da697fc
Author: root <prashant.sa...@privacera.com>
AuthorDate: Mon Oct 23 15:27:05 2023 +0530

    RANGER-4437: trim leading/trialing spaces in 
datashare/dataset/project/shared-resource names
    
    Signed-off-by: Madhan Neethiraj <mad...@apache.org>
---
 .../src/main/java/org/apache/ranger/biz/GdsDBStore.java  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java 
b/security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java
index a9ce4fab2..4249b1121 100755
--- a/security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java
@@ -120,6 +120,8 @@ public class GdsDBStore extends AbstractGdsStore {
     public RangerDataset createDataset(RangerDataset dataset) {
         LOG.debug("==> createDataset({})", dataset);
 
+        dataset.setName(StringUtils.trim(dataset.getName()));
+
         validator.validateCreate(dataset);
 
         if (StringUtils.isBlank(dataset.getGuid())) {
@@ -155,6 +157,8 @@ public class GdsDBStore extends AbstractGdsStore {
             // ignore
         }
 
+        dataset.setName(StringUtils.trim(dataset.getName()));
+
         validator.validateUpdate(dataset, existing);
 
         RangerDataset ret = datasetService.update(dataset);
@@ -408,6 +412,8 @@ public class GdsDBStore extends AbstractGdsStore {
     public RangerProject createProject(RangerProject project) {
         LOG.debug("==> createProject({})", project);
 
+        project.setName(StringUtils.trim(project.getName()));
+
         validator.validateCreate(project);
 
         if (StringUtils.isBlank(project.getGuid())) {
@@ -443,6 +449,8 @@ public class GdsDBStore extends AbstractGdsStore {
             // ignore
         }
 
+        project.setName(StringUtils.trim(project.getName()));
+
         validator.validateUpdate(project, existing);
 
         RangerProject ret = projectService.update(project);
@@ -706,6 +714,8 @@ public class GdsDBStore extends AbstractGdsStore {
     public RangerDataShare createDataShare(RangerDataShare dataShare) {
         LOG.debug("==> createDataShare({})", dataShare);
 
+        dataShare.setName(StringUtils.trim(dataShare.getName()));
+
         validator.validateCreate(dataShare);
 
         if (StringUtils.isBlank(dataShare.getGuid())) {
@@ -741,6 +751,8 @@ public class GdsDBStore extends AbstractGdsStore {
             // ignore
         }
 
+        dataShare.setName(StringUtils.trim(dataShare.getName()));
+
         validator.validateUpdate(dataShare, existing);
 
         RangerDataShare ret = dataShareService.update(dataShare);
@@ -820,6 +832,8 @@ public class GdsDBStore extends AbstractGdsStore {
     public RangerSharedResource addSharedResource(RangerSharedResource 
resource) {
         LOG.debug("==> addSharedResource({})", resource);
 
+        resource.setName(StringUtils.trim(resource.getName()));
+
         validator.validateCreate(resource);
 
         if (StringUtils.isBlank(resource.getGuid())) {
@@ -849,6 +863,8 @@ public class GdsDBStore extends AbstractGdsStore {
             // ignore
         }
 
+        resource.setName(StringUtils.trim(resource.getName()));
+
         validator.validateUpdate(resource, existing);
 
         RangerSharedResource ret = sharedResourceService.update(resource);