You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2023/08/02 00:33:42 UTC
[ranger] branch RANGER-3923 updated (33ea44fa4 -> 6d5cce6b2)
This is an automated email from the ASF dual-hosted git repository.
madhan pushed a change to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git
from 33ea44fa4 Merge branch 'master' into RANGER-3923
add 1fa02389e RANGER-4329: fix for tagsync failure during startup - included guava and commons-logging libraries
add 52f07b944 RANGER-4332: updated AuditBatchQueue.log() to block instead of throwing 'Queue full' exception
add f004731e5 RANGER-4293: Addendum change for Long User/group/role name overflowing from delete confirmation dialog box
add f0b07d363 RANGER-4317: Error message displayed when resource lookup fails is not formatted properly
add 786bdc82d RANGER-4331: Fixes for search filter on Audits tabs
add f46357f16 RANGER-4337: Upgrade spring-framework and spring-security
add 3114baac5 RANGER-4336: added configurations to enable status logging in audit framework
new 839271d33 Merge branch 'master' into RANGER-3923
new 6d5cce6b2 RANGER-3923: removed RangerSharedResource.resourceSignature
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../ranger/audit/provider/BaseAuditHandler.java | 36 ++++-
.../apache/ranger/audit/queue/AuditAsyncQueue.java | 18 +++
.../apache/ranger/audit/queue/AuditBatchQueue.java | 9 +-
pom.xml | 6 +-
.../java/org/apache/ranger/biz/GdsDBStore.java | 6 -
.../service/RangerGdsSharedResourceService.java | 2 -
.../ranger/validation/RangerGdsValidator.java | 35 +----
.../main/webapp/react-webapp/src/styles/style.css | 9 ++
.../main/webapp/react-webapp/src/utils/XAUtils.js | 11 +-
.../src/views/AuditEvent/AccessLogs.jsx | 169 ++++++++++-----------
.../src/views/AuditEvent/AuditLayout.jsx | 38 ++++-
.../src/views/AuditEvent/PluginStatusLogs.jsx | 81 ++--------
.../src/views/AuditEvent/PluginsLog.jsx | 14 +-
.../views/ServiceManager/ServiceDefinitions.jsx | 4 +-
.../groups_details/GroupListing.jsx | 7 +-
.../role_details/RoleListing.jsx | 7 +-
.../users_details/UserListing.jsx | 7 +-
.../org/apache/ranger/audit/TestAuditQueue.java | 2 +-
.../java/org/apache/ranger/audit/TestConsumer.java | 26 ++--
tagsync/pom.xml | 10 ++
20 files changed, 257 insertions(+), 240 deletions(-)
[ranger] 01/02: Merge branch 'master' into RANGER-3923
Posted by ma...@apache.org.
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
commit 839271d33f2d732794327b740b2b2e4a266c3727
Merge: 33ea44fa4 3114baac5
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Tue Aug 1 13:37:10 2023 -0700
Merge branch 'master' into RANGER-3923
.../ranger/audit/provider/BaseAuditHandler.java | 36 ++++-
.../apache/ranger/audit/queue/AuditAsyncQueue.java | 18 +++
.../apache/ranger/audit/queue/AuditBatchQueue.java | 9 +-
pom.xml | 6 +-
.../main/webapp/react-webapp/src/styles/style.css | 9 ++
.../main/webapp/react-webapp/src/utils/XAUtils.js | 11 +-
.../src/views/AuditEvent/AccessLogs.jsx | 169 ++++++++++-----------
.../src/views/AuditEvent/AuditLayout.jsx | 38 ++++-
.../src/views/AuditEvent/PluginStatusLogs.jsx | 81 ++--------
.../src/views/AuditEvent/PluginsLog.jsx | 14 +-
.../views/ServiceManager/ServiceDefinitions.jsx | 4 +-
.../groups_details/GroupListing.jsx | 7 +-
.../role_details/RoleListing.jsx | 7 +-
.../users_details/UserListing.jsx | 7 +-
.../org/apache/ranger/audit/TestAuditQueue.java | 2 +-
.../java/org/apache/ranger/audit/TestConsumer.java | 26 ++--
tagsync/pom.xml | 10 ++
17 files changed, 250 insertions(+), 204 deletions(-)
[ranger] 02/02: RANGER-3923: removed RangerSharedResource.resourceSignature
Posted by ma...@apache.org.
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
commit 6d5cce6b29fe38592986d6375810a9a727dc48f3
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Tue Aug 1 17:32:37 2023 -0700
RANGER-3923: removed RangerSharedResource.resourceSignature
---
.../java/org/apache/ranger/biz/GdsDBStore.java | 6 ----
.../service/RangerGdsSharedResourceService.java | 2 --
.../ranger/validation/RangerGdsValidator.java | 35 +++++-----------------
3 files changed, 7 insertions(+), 36 deletions(-)
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 817bc3d38..1991a3dca 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/GdsDBStore.java
@@ -37,7 +37,6 @@ import org.apache.ranger.plugin.model.RangerGds.RangerDataset;
import org.apache.ranger.plugin.model.RangerGds.RangerDatasetInProject;
import org.apache.ranger.plugin.model.RangerGds.RangerProject;
import org.apache.ranger.plugin.model.RangerGds.RangerSharedResource;
-import org.apache.ranger.plugin.model.RangerPolicyResourceSignature;
import org.apache.ranger.plugin.store.AbstractGdsStore;
import org.apache.ranger.plugin.store.PList;
import org.apache.ranger.plugin.util.SearchFilter;
@@ -508,9 +507,6 @@ public class GdsDBStore extends AbstractGdsStore {
validator.validateCreate(resource);
- // TODO: enforce RangerSharedResource.acl
- resource.setResourceSignature(RangerPolicyResourceSignature.toSignatureString(resource.getResource()));
-
if (StringUtils.isBlank(resource.getGuid())) {
resource.setGuid(guidUtil.genGUID());
}
@@ -538,8 +534,6 @@ public class GdsDBStore extends AbstractGdsStore {
validator.validateUpdate(resource, existing);
- resource.setResourceSignature(RangerPolicyResourceSignature.toSignatureString(resource.getResource()));
-
RangerSharedResource ret = sharedResourceService.update(resource);
sharedResourceService.createObjectHistory(ret, existing, RangerServiceService.OPERATION_UPDATE_CONTEXT);
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java
index 23cd355cc..d22274c76 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsSharedResourceService.java
@@ -193,7 +193,6 @@ public class RangerGdsSharedResourceService extends RangerGdsBaseModelService<XX
xObj.setDataShareId(vObj.getDataShareId());
xObj.setResource(JsonUtils.mapToJson(vObj.getResource()));
xObj.setSubResourceNames(JsonUtils.listToJson(vObj.getSubResourceNames()));
- xObj.setResourceSignature(vObj.getResourceSignature());
xObj.setConditionExpr(vObj.getConditionExpr());
xObj.setAccessTypes(JsonUtils.objectToJson(vObj.getAccessTypes()));
xObj.setRowFilter(JsonUtils.objectToJson(vObj.getRowFilter()));
@@ -215,7 +214,6 @@ public class RangerGdsSharedResourceService extends RangerGdsBaseModelService<XX
vObj.setDataShareId(xObj.getDataShareId());
vObj.setResource(JsonUtils.jsonToMapPolicyResource(xObj.getResource()));
vObj.setSubResourceNames(JsonUtils.jsonToListString(xObj.getSubResourceNames()));
- vObj.setResourceSignature(xObj.getResourceSignature());
vObj.setConditionExpr(xObj.getConditionExpr());
vObj.setAccessTypes(JsonUtils.jsonToSetString(xObj.getAccessTypes()));
vObj.setRowFilter(JsonUtils.jsonToObject(xObj.getRowFilter(), RangerPolicy.RangerPolicyItemRowFilterInfo.class));
diff --git a/security-admin/src/main/java/org/apache/ranger/validation/RangerGdsValidator.java b/security-admin/src/main/java/org/apache/ranger/validation/RangerGdsValidator.java
index 55da4a238..88fc64c98 100644
--- a/security-admin/src/main/java/org/apache/ranger/validation/RangerGdsValidator.java
+++ b/security-admin/src/main/java/org/apache/ranger/validation/RangerGdsValidator.java
@@ -32,7 +32,6 @@ import org.apache.ranger.plugin.model.RangerGds.RangerGdsObjectACL;
import org.apache.ranger.plugin.model.RangerGds.RangerProject;
import org.apache.ranger.plugin.model.RangerGds.RangerSharedResource;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItemDataMaskInfo;
-import org.apache.ranger.plugin.model.RangerPrincipal;
import org.apache.ranger.plugin.model.validation.ValidationFailureDetails;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -396,9 +395,9 @@ public class RangerGdsValidator {
case NONE:
if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.REQUESTED) {
requireDatasetAdmin = true;
- } else if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.GRANTED) {
+ } else if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.GRANTED || dshInDataset.getStatus() == RangerGds.GdsShareStatus.DENIED) {
requireDataShareAdmin = true;
- } else if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.ACCEPTED) {
+ } else if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.ACTIVE) {
result.addValidationFailure(new ValidationFailureDetails(ValidationErrorCode.GDS_VALIDATION_ERR_INVALID_STATUS_CHANGE, "status", existing.getStatus(), dshInDataset.getStatus()));
}
break;
@@ -406,20 +405,21 @@ public class RangerGdsValidator {
case REQUESTED:
if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.NONE) {
requireDatasetAdmin = true;
- } else if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.GRANTED) {
+ } else if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.GRANTED || dshInDataset.getStatus() == RangerGds.GdsShareStatus.DENIED) {
requireDataShareAdmin = true;
- } else if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.ACCEPTED) {
+ } else if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.ACTIVE) {
result.addValidationFailure(new ValidationFailureDetails(ValidationErrorCode.GDS_VALIDATION_ERR_INVALID_STATUS_CHANGE, "status", existing.getStatus(), dshInDataset.getStatus()));
}
break;
case GRANTED:
- if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.ACCEPTED) {
+ if (dshInDataset.getStatus() == RangerGds.GdsShareStatus.ACTIVE) {
requireDatasetAdmin = true;
}
break;
- case ACCEPTED:
+ case ACTIVE:
+ case DENIED:
default:
break;
}
@@ -519,27 +519,6 @@ public class RangerGdsValidator {
LOG.debug("<== validateDelete(dsInProjectId={}, existing={})", dsInProjectId, existing);
}
-
- private void validatePrincipals(List<RangerPrincipal> principals, String fieldName, ValidationResult result) {
- if (principals != null) {
- for (RangerPrincipal principal : principals) {
- switch (principal.getType()) {
- case USER:
- validateUser(principal.getName(), fieldName, result);
- break;
-
- case GROUP:
- validateGroup(principal.getName(), fieldName, result);
- break;
-
- case ROLE:
- validateRole(principal.getName(), fieldName, result);
- break;
- }
- }
- }
- }
-
private void validateAcl(RangerGdsObjectACL acl, String fieldName, ValidationResult result) {
if (acl != null) {
if (MapUtils.isNotEmpty(acl.getUsers())) {