You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/08/31 09:49:40 UTC
ranger git commit: RANGER-1728 - Upgrade PMD plugin and fix related
issues
Repository: ranger
Updated Branches:
refs/heads/master e474c4d7b -> c7d1e50b2
RANGER-1728 - Upgrade PMD plugin and fix related issues
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/c7d1e50b
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/c7d1e50b
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/c7d1e50b
Branch: refs/heads/master
Commit: c7d1e50b231e10efb543b5ebec578598396b9f68
Parents: e474c4d
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Aug 30 12:02:21 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Aug 31 10:41:56 2017 +0100
----------------------------------------------------------------------
.../ranger/plugin/util/RangerRESTUtils.java | 2 +-
.../atlas/authorizer/RangerAtlasAuthorizer.java | 2 +-
.../yarn/authorizer/RangerYarnAuthorizer.java | 2 +-
pom.xml | 2 +-
.../org/apache/ranger/biz/RangerBizUtil.java | 23 ++++++++++----------
5 files changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/c7d1e50b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
index 961b8bc..efb27aa 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTUtils.java
@@ -106,7 +106,7 @@ public class RangerRESTUtils {
}
public boolean isSsl(String _baseUrl) {
- return StringUtils.isEmpty(_baseUrl) ? false : _baseUrl.toLowerCase().startsWith("https");
+ return !StringUtils.isEmpty(_baseUrl) && _baseUrl.toLowerCase().startsWith("https");
}
public String getUrlForGrantAccess(String baseUrl, String serviceName) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/c7d1e50b/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
----------------------------------------------------------------------
diff --git a/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java b/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
index acd1111..542acf9 100644
--- a/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
+++ b/plugin-atlas/src/main/java/org/apache/ranger/authorization/atlas/authorizer/RangerAtlasAuthorizer.java
@@ -115,7 +115,7 @@ public class RangerAtlasAuthorizer implements AtlasAuthorizer {
if (plugin != null) {
RangerAccessResult rangerResult = plugin.isAccessAllowed(request);
- isAccessAllowed = (rangerResult == null) ? false : rangerResult.getIsAllowed();
+ isAccessAllowed = rangerResult != null && rangerResult.getIsAllowed();
} else {
isAccessAllowed = false;
LOG.warn("AtlasPlugin not initialized properly : " + plugin+"... Access blocked!!!");
http://git-wip-us.apache.org/repos/asf/ranger/blob/c7d1e50b/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
----------------------------------------------------------------------
diff --git a/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java b/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
index b448830..a4de016 100644
--- a/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
+++ b/plugin-yarn/src/main/java/org/apache/ranger/authorization/yarn/authorizer/RangerYarnAuthorizer.java
@@ -128,7 +128,7 @@ public class RangerYarnAuthorizer extends YarnAuthorizationProvider {
ret = isAllowedByYarnAcl(accessType, entity, ugi, auditHandler);
} else {
- ret = result == null ? false : result.getIsAllowed();
+ ret = result != null && result.getIsAllowed();
}
if(auditHandler != null) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/c7d1e50b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 01005b7..0ebadee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -518,7 +518,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.5</version>
+ <version>3.7</version>
<executions>
<execution>
<phase>verify</phase>
http://git-wip-us.apache.org/repos/asf/ranger/blob/c7d1e50b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
index a3e9746..224f1a0 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
@@ -693,8 +693,7 @@ public class RangerBizUtil {
String[] xTables = stringUtil.isEmpty(xResource.getTables()) ? null
: stringUtil.split(xResource.getTables(), ",");
- boolean matchFound = (xTables == null || xTables.length == 0) ? true
- : matchPath(tblName, xTables);
+ boolean matchFound = (xTables == null || xTables.length == 0) || matchPath(tblName, xTables);
if (matchFound) {
// 2. does the policy match the column?
@@ -702,8 +701,8 @@ public class RangerBizUtil {
.getColumnFamilies()) ? null : stringUtil.split(
xResource.getColumnFamilies(), ",");
- matchFound = (xColumnFamilies == null || xColumnFamilies.length == 0) ? true
- : matchPath(colFamName, xColumnFamilies);
+ matchFound = (xColumnFamilies == null || xColumnFamilies.length == 0)
+ || matchPath(colFamName, xColumnFamilies);
if (matchFound) {
// 3. does the policy match the columnFamily?
@@ -711,8 +710,8 @@ public class RangerBizUtil {
.getColumns()) ? null : stringUtil.split(
xResource.getColumns(), ",");
- matchFound = (xColumns == null || xColumns.length == 0) ? true
- : matchPath(colName, xColumns);
+ matchFound = (xColumns == null || xColumns.length == 0)
+ || matchPath(colName, xColumns);
}
}
@@ -783,8 +782,8 @@ public class RangerBizUtil {
String[] xDatabases = stringUtil.isEmpty(xResource.getDatabases()) ? null
: stringUtil.split(xResource.getDatabases(), ",");
- boolean matchFound = (xDatabases == null || xDatabases.length == 0) ? true
- : matchPath(dbName, xDatabases);
+ boolean matchFound = (xDatabases == null || xDatabases.length == 0)
+ || matchPath(dbName, xDatabases);
if (!matchFound) {
continue;
@@ -812,8 +811,8 @@ public class RangerBizUtil {
String[] xTables = stringUtil.isEmpty(xResource.getTables()) ? null
: stringUtil.split(xResource.getTables(), ",");
- matchFound = (xTables == null || xTables.length == 0) ? true
- : matchPath(tblName, xTables);
+ matchFound = (xTables == null || xTables.length == 0)
+ || matchPath(tblName, xTables);
if (xResource.getTableType() == AppConstants.POLICY_EXCLUSION) {
matchFound = !matchFound;
@@ -827,8 +826,8 @@ public class RangerBizUtil {
String[] xColumns = stringUtil.isEmpty(xResource.getColumns()) ? null
: stringUtil.split(xResource.getColumns(), ",");
- matchFound = (xColumns == null || xColumns.length == 0) ? true
- : matchPath(colName, xColumns);
+ matchFound = (xColumns == null || xColumns.length == 0)
+ || matchPath(colName, xColumns);
if (xResource.getColumnType() == AppConstants.POLICY_EXCLUSION) {
matchFound = !matchFound;