Repository: incubator-ranger Updated Branches: refs/heads/master 24543ec1d -> 87446272e
Mainly potential NPE problems in security-admin process. Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/87446272 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/87446272 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/87446272 Branch: refs/heads/master Commit: 87446272e0e3678463aad96770c7f957f1d9418b Parents: 24543ec Author: Abhay Kulkarni <[email protected]> Authored: Wed Mar 25 09:26:51 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Mar 26 15:59:59 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/ranger/biz/AssetMgr.java | 16 +++++++++------- .../java/org/apache/ranger/biz/UserMgr.java | 3 +-- .../java/org/apache/ranger/biz/XUserMgr.java | 2 +- .../org/apache/ranger/common/SearchGroup.java | 2 +- .../apache/ranger/service/XAuditMapService.java | 4 ++-- .../apache/ranger/service/XPermMapService.java | 4 ++-- .../apache/ranger/service/XResourceService.java | 20 ++++++++++---------- .../org/apache/ranger/service/XUserService.java | 6 ++---- .../services/storm/client/StormClient.java | 3 +-- 9 files changed, 29 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87446272/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java index 839f1fc..9d11256 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java @@ -1047,13 +1047,15 @@ public class AssetMgr extends AssetMgrBase { xaBizUtil.createTrxLog(trxLogList); return createdVXAsset; } else { - logger.debug("User id : " + usb.getUserId() + " doesn't have " - + "admin access to create repository."); - throw restErrorUtil - .createRESTException( - "Sorry, you don't have permission to perform the operation", - MessageEnums.OPER_NOT_ALLOWED_FOR_ENTITY); - } + logger.debug("User id : " + (usb != null ? usb.getUserId() : "<UNKNOWN>") + " doesn't have " + + "admin access to create repository."); + + throw restErrorUtil + .createRESTException( + "Sorry, you don't have permission to perform the operation", + MessageEnums.OPER_NOT_ALLOWED_FOR_ENTITY); + + } } private void createDefaultPolicy(VXAsset vXAsset, String config) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87446272/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java index c4997ab..78c6c00 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java @@ -1038,8 +1038,7 @@ public class UserMgr { if (!session.isUserAdmin()) { throw restErrorUtil.create403RESTException("User " + "creation denied. LoggedInUser=" - + (session != null ? session.getXXPortalUser().getId() - : "Not Logged In") + + session.getXXPortalUser().getId() + " ,isn't permitted to perform the action."); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87446272/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java index 3c6ef3e..3ed6ff3 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java @@ -217,7 +217,7 @@ public class XUserMgr extends XUserMgrBase { String hiddenPasswordString = PropertiesUtil.getProperty( "xa.password.hidden", "*****"); String password = vXUser.getPassword(); - if (password != null && password.equals(hiddenPasswordString)) { + if (oldUserProfile != null && password != null && password.equals(hiddenPasswordString)) { vXPortalUser.setPassword(oldUserProfile.getPassword()); } vXPortalUser.setPassword(password); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87446272/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java b/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java index fce2801..2c93f8d 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java +++ b/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java @@ -108,7 +108,7 @@ public class SearchGroup { */ public void resolveValues(Query query, String prefix) { if ((values == null || values.size() == 0) - && (searchGroups == null || searchGroups.size() == 0)) { + || (searchGroups == null || searchGroups.size() == 0)) { return; } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87446272/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java index 1355e95..a669280 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java @@ -143,9 +143,9 @@ public class XAuditMapService extends @Override protected XXAuditMap mapViewToEntityBean(VXAuditMap vObj, XXAuditMap mObj, int OPERATION_CONTEXT) { - super.mapViewToEntityBean(vObj, mObj, OPERATION_CONTEXT); if(vObj!=null && mObj!=null){ - XXPortalUser xXPortalUser=null; + super.mapViewToEntityBean(vObj, mObj, OPERATION_CONTEXT); + XXPortalUser xXPortalUser=null; if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){ if(!stringUtil.isEmpty(vObj.getOwner())){ xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner()); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87446272/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java index 146a953..9b8247c 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java @@ -299,9 +299,9 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> { @Override protected VXPermMap mapEntityToViewBean(VXPermMap vObj, XXPermMap mObj) { - super.mapEntityToViewBean(vObj, mObj); if(mObj!=null && vObj!=null){ - XXPortalUser xXPortalUser=null; + super.mapEntityToViewBean(vObj, mObj); + XXPortalUser xXPortalUser=null; if(stringUtil.isEmpty(vObj.getOwner())){ xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId()); if(xXPortalUser!=null){ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87446272/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java index b85ae55..a7e2f12 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java @@ -275,7 +275,7 @@ public class XResourceService extends + "resource path.", MessageEnums.INVALID_INPUT_DATA); } } - if (!vObj.getName().equalsIgnoreCase(mObj.getName()) || + if (vObj != null && mObj != null && !vObj.getName().equalsIgnoreCase(mObj.getName()) || vObj.getIsRecursive()!=mObj.getIsRecursive() || vObj.getResourceType() != mObj.getResourceType()) { validateForCreate(vObj); @@ -340,8 +340,8 @@ public class XResourceService extends vXResource.getAssetId()); if (xxAsset != null) { vXResource.setAssetName(xxAsset.getName()); - } - vXResource.setAssetType(xxAsset.getAssetType()); + vXResource.setAssetType(xxAsset.getAssetType()); + } } private void populateAuditList(VXResource vXResource) { @@ -451,22 +451,22 @@ public class XResourceService extends @Override protected VXResource mapEntityToViewBean(VXResource vObj, XXResource mObj) { - super.mapEntityToViewBean(vObj, mObj); - vObj.setUdfs(mObj.getUdfs()); - populateAssetProperties(vObj); - if(mObj!=null && vObj!=null){ + if(mObj!=null && vObj!=null){ + super.mapEntityToViewBean(vObj, mObj); + vObj.setUdfs(mObj.getUdfs()); + populateAssetProperties(vObj); XXPortalUser xXPortalUser= null; if(stringUtil.isEmpty(vObj.getOwner())){ - xXPortalUser=rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId()); + xXPortalUser=rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId()); if(xXPortalUser!=null){ vObj.setOwner(xXPortalUser.getLoginId()); } } if(stringUtil.isEmpty(vObj.getUpdatedBy())){ - xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId()); + xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId()); if(xXPortalUser!=null){ vObj.setUpdatedBy(xXPortalUser.getLoginId()); - } + } } } return vObj; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87446272/security-admin/src/main/java/org/apache/ranger/service/XUserService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java index abac343..d847ca0 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java @@ -261,10 +261,8 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> { public List<XXTrxLog> getTransactionLog(VXUser vObj, VXPortalUser mObj, String action) { - if (vObj == null - && (action == null || !action.equalsIgnoreCase("update"))) { - return null; - } + if (vObj == null || action == null || (action.equalsIgnoreCase("update") && mObj == null)) + return null; List<XXTrxLog> trxLogList = new ArrayList<XXTrxLog>(); try { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/87446272/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java ---------------------------------------------------------------------- diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java index 88303e7..2b62c4f 100644 --- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java +++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormClient.java @@ -366,8 +366,7 @@ public class StormClient { } if (topologyName != null) { - String finalTopologyNameMatching = (topologyName == null) ? "" - : topologyName.trim(); + String finalTopologyNameMatching = topologyName.trim(); resultList = stormClient .getTopologyList(finalTopologyNameMatching,stormTopologyList); if (resultList != null) {
