This is an automated email from the ASF dual-hosted git repository. pradeep pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ranger.git
commit fc3d9d9daa061f2e4ac6388b15b7504887aa2232 Author: Kishor Gollapalliwar <[email protected]> AuthorDate: Mon Jan 27 13:58:33 2020 +0530 RANGER-2711: "Service display Name" attribute on all tabs in Ranger Added Service DisplayName & ServiceDef DisplayName in list API on Audit page. ServiceDisplayName: Access (GET http://HOST:PORT/service/assets/accessAudit) Plugins (GET http://HOST:PORT/service/assets/exportAudit) Plugins Status (GET http://HOST:PORT/service/plugins/plugins/info) ServiceDefDisplayName: Access (GET http://HOST:PORT/service/assets/accessAudit) Plugins Status (GET http://HOST:PORT/service/plugins/plugins/info) Signed-off-by: Pradeep <[email protected]> --- .../ranger/plugin/model/RangerPluginInfo.java | 38 +++++++++++++++----- .../ranger/service/RangerPluginInfoService.java | 17 ++++++--- .../apache/ranger/service/XAccessAuditService.java | 7 +++- .../service/XPolicyExportAuditServiceBase.java | 6 ++++ .../ranger/solr/SolrAccessAuditsService.java | 7 ++++ .../java/org/apache/ranger/view/VXAccessAudit.java | 41 ++++++++++++++++++++++ .../apache/ranger/view/VXPolicyExportAudit.java | 22 ++++++++++++ 7 files changed, 125 insertions(+), 13 deletions(-) diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java index 90367fe..5552ce9 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java @@ -72,12 +72,15 @@ public class RangerPluginInfo implements Serializable { private Date updateTime; private String serviceName; - private String serviceType; + private String serviceDisplayName; + private String serviceType; + private String serviceTypeDisplayName; private String hostName; private String appType; private String ipAddress; private Map<String, String> info; + //FIXME UNUSED public RangerPluginInfo(Long id, Date createTime, Date updateTime, String serviceName, String appType, String hostName, String ipAddress, Map<String, String> info) { super(); @@ -91,6 +94,7 @@ public class RangerPluginInfo implements Serializable { setInfo(info); } + //FIXME UNUSED public RangerPluginInfo() { this(null, null, null, null, null, null, null, null); } @@ -119,13 +123,21 @@ public class RangerPluginInfo implements Serializable { this.updateTime = updateTime; } - public String getServiceType() { - return serviceType; - } + public String getServiceType() { + return serviceType; + } + + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } + + public String getServiceTypeDisplayName() { + return serviceTypeDisplayName; + } - public void setServiceType(String serviceType) { - this.serviceType = serviceType; - } + public void setServiceTypeDisplayName(String serviceTypeDisplayName) { + this.serviceTypeDisplayName = serviceTypeDisplayName; + } public String getServiceName() { return serviceName; @@ -135,6 +147,14 @@ public class RangerPluginInfo implements Serializable { this.serviceName = serviceName; } + public String getServiceDisplayName() { + return serviceDisplayName; + } + + public void setServiceDisplayName(String serviceDisplayName) { + this.serviceDisplayName = serviceDisplayName; + } + public String getHostName() { return hostName; } @@ -370,7 +390,9 @@ public class RangerPluginInfo implements Serializable { sb.append("createTime={").append(createTime).append("} "); sb.append("updateTime={").append(updateTime).append("} "); sb.append("serviceName={").append(serviceName).append("} "); - sb.append("serviceType={").append(serviceType).append("} "); + sb.append("serviceType={").append(serviceType).append("} "); + sb.append("serviceTypeDisplayName{").append(serviceTypeDisplayName).append("} "); + sb.append("serviceDisplayName={").append(serviceDisplayName).append("} "); sb.append("hostName={").append(hostName).append("} "); sb.append("appType={").append(appType).append("} "); sb.append("ipAddress={").append(ipAddress).append("} "); diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerPluginInfoService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerPluginInfoService.java index e2ccb5b..55bbd1a 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerPluginInfoService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerPluginInfoService.java @@ -36,6 +36,7 @@ import org.apache.ranger.common.SortField; import org.apache.ranger.db.RangerDaoManager; import org.apache.ranger.entity.XXPluginInfo; import org.apache.ranger.entity.XXService; +import org.apache.ranger.entity.XXServiceDef; import org.apache.ranger.entity.XXServiceVersionInfo; import org.apache.ranger.plugin.model.RangerPluginInfo; import org.apache.ranger.plugin.store.PList; @@ -198,14 +199,22 @@ public class RangerPluginInfoService { ret.setUpdateTime(xObj.getUpdateTime()); ret.setServiceName(xObj.getServiceName()); - String serviceType = daoManager.getXXServiceDef().findServiceDefTypeByServiceName(ret.getServiceName()); - if (StringUtils.isNotBlank(serviceType)) { - ret.setServiceType(serviceType); - } + String serviceDefName = daoManager.getXXServiceDef().findServiceDefTypeByServiceName(ret.getServiceName()); + if (StringUtils.isNotBlank(serviceDefName)) { + ret.setServiceType(serviceDefName); + XXServiceDef xxServiceDef = daoManager.getXXServiceDef().findByName(serviceDefName); + + ret.setServiceTypeDisplayName(xxServiceDef.getDisplayName()); + } ret.setHostName(xObj.getHostName()); ret.setAppType(xObj.getAppType()); ret.setIpAddress(xObj.getIpAddress()); ret.setInfo(jsonStringToMap(xObj.getInfo(), xxServiceVersionInfo, hasAssociatedTagService)); + + XXService xxService = daoManager.getXXService().findByName(ret.getServiceName()); + if (xxService != null) { + ret.setServiceDisplayName(xxService.getDisplayName()); + } return ret; } diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java index 5afe299..cc23d39 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java @@ -149,8 +149,13 @@ public class XAccessAuditService extends XAccessAuditServiceBase<XXAccessAudit, XXService xService = daoManager.getXXService().findByName(mObj.getRepoName()); if (xService != null) { + vObj.setRepoDisplayName(xService.getDisplayName()); XXServiceDef xServiceDef = daoManager.getXXServiceDef().getById(xService.getType()); - vObj.setServiceType(xServiceDef.getName()); + + if (xServiceDef != null) { + vObj.setServiceType(xServiceDef.getName()); + vObj.setServiceTypeDisplayName(xServiceDef.getDisplayName()); + } } return vObj; diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java index 48940ba..275da23 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyExportAuditServiceBase.java @@ -29,6 +29,7 @@ import java.util.List; import org.apache.ranger.common.MapUtil; import org.apache.ranger.common.SearchCriteria; import org.apache.ranger.entity.XXPolicyExportAudit; +import org.apache.ranger.entity.XXService; import org.apache.ranger.view.VXPolicyExportAudit; import org.apache.ranger.view.VXPolicyExportAuditList; @@ -85,6 +86,11 @@ public abstract class XPolicyExportAuditServiceBase<T extends XXPolicyExportAudi // Iterate over the result list and create the return list for (T gjXPolicyExportAudit : resultList) { VXPolicyExportAudit vXPolicyExportAudit = populateViewBean(gjXPolicyExportAudit); + XXService xxService = daoManager.getXXService().findByName(vXPolicyExportAudit.getRepositoryName()); + + if (xxService != null) { + vXPolicyExportAudit.setRepositoryDisplayName(xxService.getDisplayName()); + } xPolicyExportAuditList.add(vXPolicyExportAudit); } diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java index b422e7c..453c7dc 100644 --- a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java +++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java @@ -40,6 +40,7 @@ import org.apache.ranger.common.SortField; import org.apache.ranger.common.SortField.SORT_ORDER; import org.apache.ranger.common.StringUtil; import org.apache.ranger.db.RangerDaoManager; +import org.apache.ranger.entity.XXService; import org.apache.ranger.entity.XXServiceDef; import org.apache.ranger.plugin.store.EmbeddedServiceDefsUtil; import org.apache.ranger.view.VXAccessAudit; @@ -294,6 +295,11 @@ public class SolrAccessAuditsService { value = doc.getFieldValue("repo"); if (value != null) { accessAudit.setRepoName(value.toString()); + XXService xxService = daoManager.getXXService().findByName(accessAudit.getRepoName()); + + if(xxService != null) { + accessAudit.setRepoDisplayName(xxService.getDisplayName()); + } } value = doc.getFieldValue("sess"); if (value != null) { @@ -334,6 +340,7 @@ public class SolrAccessAuditsService { XXServiceDef xServiceDef = daoManager.getXXServiceDef().getById((long) accessAudit.getRepoType()); if (xServiceDef != null) { accessAudit.setServiceType(xServiceDef.getName()); + accessAudit.setServiceTypeDisplayName(xServiceDef.getDisplayName()); } } value = doc.getFieldValue("resType"); diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java index a7ffb98..a9a9cb9 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXAccessAudit.java @@ -83,6 +83,10 @@ public class VXAccessAudit extends VXDataObject implements java.io.Serializable */ protected String repoName; /** + * Repository Display Name + */ + protected String repoDisplayName; + /** * Repository Type */ protected int repoType; @@ -91,6 +95,10 @@ public class VXAccessAudit extends VXDataObject implements java.io.Serializable */ protected String serviceType; /** + * Service Type Display Name + */ + protected String serviceTypeDisplayName; + /** * Reason of result */ protected String resultReason; @@ -305,6 +313,23 @@ public class VXAccessAudit extends VXDataObject implements java.io.Serializable } /** + * This method sets the value to the member attribute <b>repoDisplayName</b>. + * You cannot set null to the attribute. + * @param repoDisplayName Value to set member attribute <b>repoDisplayName</b> + */ + public void setRepoDisplayName(String repoDisplayName) { + this.repoDisplayName = repoDisplayName; + } + + /** + * Returns the value for the member attribute <b>repoDisplayName</b> + * @return String - value of member attribute <b>repoDisplayName</b>. + */ + public String getRepoDisplayName() { + return repoDisplayName; + } + + /** * This method sets the value to the member attribute <b>repoType</b>. * You cannot set null to the attribute. * @param repoType Value to set member attribute <b>repoType</b> @@ -336,6 +361,20 @@ public class VXAccessAudit extends VXDataObject implements java.io.Serializable } /** + * @return the serviceTypeDisplayName + */ + public String getServiceTypeDisplayName() { + return serviceTypeDisplayName; + } + + /** + * @param serviceTypeDisplayName the serviceTypeDisplayName to set + */ + public void setServiceTypeDisplayName(String serviceTypeDisplayName) { + this.serviceTypeDisplayName = serviceTypeDisplayName; + } + + /** * This method sets the value to the member attribute <b>resultReason</b>. * You cannot set null to the attribute. * @param resultReason Value to set member attribute <b>resultReason</b> @@ -583,8 +622,10 @@ public class VXAccessAudit extends VXDataObject implements java.io.Serializable str += "policyId={" + policyId + "} "; str += "policyVersion={" + policyVersion + "} "; str += "repoName={" + repoName + "} "; + str += "repoDisplayName={" + repoDisplayName + "} "; str += "repoType={" + repoType + "} "; str += "serviceType={" + serviceType + "} "; + str += "serviceTypeDisplayName={" + serviceTypeDisplayName + "} "; str += "resultReason={" + resultReason + "} "; str += "sessionId={" + sessionId + "} "; str += "eventTime={" + eventTime + "} "; diff --git a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java index e7178a4..4c074f7 100644 --- a/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java +++ b/security-admin/src/main/java/org/apache/ranger/view/VXPolicyExportAudit.java @@ -65,6 +65,10 @@ public class VXPolicyExportAudit extends VXDataObject implements java.io.Seriali */ protected String repositoryName; /** + * Repository Display Name + */ + protected String repositoryDisplayName; + /** * JSON of the policies exported */ protected String exportedJson; @@ -173,6 +177,23 @@ public class VXPolicyExportAudit extends VXDataObject implements java.io.Seriali } /** + * This method sets the value to the member attribute <b>repositoryDisplayName</b>. + * You cannot set null to the attribute. + * @param repositoryDisplayName Value to set member attribute <b>repositoryDisplayName</b> + */ + public void setRepositoryDisplayName(String repositoryDisplayName) { + this.repositoryDisplayName = repositoryDisplayName; + } + + /** + * Returns the value for the member attribute <b>repositoryDisplayName</b> + * @return String - value of member attribute <b>repositoryDisplayName</b>. + */ + public String getRepositoryDisplayName() { + return repositoryDisplayName; + } + + /** * This method sets the value to the member attribute <b>exportedJson</b>. * You cannot set null to the attribute. * @param exportedJson Value to set member attribute <b>exportedJson</b> @@ -256,6 +277,7 @@ public class VXPolicyExportAudit extends VXDataObject implements java.io.Seriali str += "requestedEpoch={" + requestedEpoch + "} "; str += "lastUpdated={" + lastUpdated + "} "; str += "repositoryName={" + repositoryName + "} "; + str += "repositoryDisplayName={" + repositoryDisplayName + "} "; str += "exportedJson={" + exportedJson + "} "; str += "httpRetCode={" + httpRetCode + "} "; str += "syncStatus={" + syncStatus + "} ";
