Skip to content

Commit 83beb9b

Browse files
RANGER-5315: Enhance Audit Log Filters to Support Resource Name Exclusions
1 parent 5f48480 commit 83beb9b

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

security-admin/src/main/java/org/apache/ranger/AccessAuditsService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public AccessAuditsService() {
7171
*/
7272
searchFields.add(new SearchField("-repoType", "-repoType", SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL));
7373
searchFields.add(new SearchField("-requestUser", "-reqUser", SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.FULL));
74+
searchFields.add(new SearchField("excludeResourcePath", "-resource", SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
7475
searchFields.add(new SearchField("resourceType", "resType", SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.FULL));
7576
searchFields.add(new SearchField("reason", "reason", SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.FULL));
7677
searchFields.add(new SearchField("action", "action", SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.FULL));

security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,7 @@ public VXAccessAuditList getAccessLogs(@Context HttpServletRequest request, @Que
552552
searchUtil.extractStringList(request, searchCriteria, "excludeUser", "Exclude Users", "-requestUser", null, StringUtil.VALIDATION_TEXT);
553553
searchUtil.extractString(request, searchCriteria, "requestData", "Request Data", StringUtil.VALIDATION_TEXT);
554554
searchUtil.extractString(request, searchCriteria, "resourcePath", "Resource Name", StringUtil.VALIDATION_TEXT);
555+
searchUtil.extractString(request, searchCriteria, "excludeResourcePath", "Exclude Resource Name", StringUtil.VALIDATION_TEXT);
555556
searchUtil.extractString(request, searchCriteria, "clientIP", "Client IP", StringUtil.VALIDATION_TEXT);
556557
searchUtil.extractString(request, searchCriteria, "resourceType", "Resource Type", StringUtil.VALIDATION_TEXT);
557558
searchUtil.extractString(request, searchCriteria, "excludeServiceUser", "Exclude Service User", StringUtil.VALIDATION_TEXT);

security-admin/src/main/webapp/react-webapp/src/views/AuditEvent/AccessLogs.jsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,12 @@ function Access() {
10091009
urlLabel: "zoneName",
10101010
type: "textoptions",
10111011
options: getZones
1012+
},
1013+
{
1014+
category: "excludeResourcePath",
1015+
label: "Exclude Resource Name",
1016+
urlLabel: "excludeResourceName",
1017+
type: "text"
10121018
}
10131019
];
10141020

security-admin/src/test/java/org/apache/ranger/rest/TestAssetREST.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ public void testGetAccessLogs() {
569569
Mockito.verify(msBizUtil).isKeyAdmin();
570570
Mockito.verify(assetMgr).getAccessLogs(searchCriteria);
571571
Mockito.verify(daoManager).getXXServiceDef();
572-
Mockito.verify(searchUtil, Mockito.times(15)).extractString(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.nullable(String.class));
572+
Mockito.verify(searchUtil, Mockito.times(16)).extractString(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.nullable(String.class));
573573
Mockito.verify(searchUtil, Mockito.times(4)).extractInt(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString());
574574
Mockito.verify(searchUtil, Mockito.times(2)).extractDate(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
575575
Mockito.verify(searchUtil).extractLong(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString());
@@ -604,7 +604,7 @@ public void testGetAccessLogsForKms() {
604604
Mockito.verify(msBizUtil).isKeyAdmin();
605605
Mockito.verify(assetMgr).getAccessLogs(searchCriteria);
606606
Mockito.verify(daoManager).getXXServiceDef();
607-
Mockito.verify(searchUtil, Mockito.times(15)).extractString(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.nullable(String.class));
607+
Mockito.verify(searchUtil, Mockito.times(16)).extractString(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.nullable(String.class));
608608
Mockito.verify(searchUtil, Mockito.times(4)).extractInt(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString());
609609
Mockito.verify(searchUtil, Mockito.times(2)).extractDate(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
610610
Mockito.verify(searchUtil).extractLong(Mockito.any(), Mockito.any(), Mockito.anyString(), Mockito.anyString());

0 commit comments

Comments
 (0)