You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2022/04/07 03:42:49 UTC
[ranger] branch master updated (4107b274a -> a93571dae)
This is an automated email from the ASF dual-hosted git repository.
pradeep pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
from 4107b274a RANGER-3231: Ranger-Kafka-Plugin implementing Kafka Authorizer from KIP-504
new 49ac30ab5 RANGER-3611: fix NullPtrException in download API
new a93571dae RANGER-3692: Ranger cannot connect to the DB when the DB is outaged for a long time
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:
pom.xml | 2 +-
.../src/main/java/org/apache/ranger/biz/AssetMgr.java | 2 +-
.../src/main/java/org/apache/ranger/rest/RoleREST.java | 10 ++--------
.../src/main/java/org/apache/ranger/rest/ServiceREST.java | 13 ++++---------
.../src/main/java/org/apache/ranger/rest/XUserREST.java | 15 ++++-----------
5 files changed, 12 insertions(+), 30 deletions(-)
[ranger] 02/02: RANGER-3692: Ranger cannot connect to the DB when the DB is outaged for a long time
Posted by pr...@apache.org.
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 a93571daedaa45ffc98869410148cf1c55a90eaf
Author: Zilong Zhu <zh...@gmail.com>
AuthorDate: Wed Apr 6 22:54:21 2022 +0800
RANGER-3692: Ranger cannot connect to the DB when the DB is outaged for a long time
Signed-off-by: pradeep <pr...@apache.org>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 252463227..9889685c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
<atlas.jettison.version>1.3.7</atlas.jettison.version>
<atlas.commons.logging.version>1.1.3</atlas.commons.logging.version>
<bouncycastle.version>1.55</bouncycastle.version>
- <c3p0.version>0.9.5.3</c3p0.version>
+ <c3p0.version>0.9.5.5</c3p0.version>
<cglib.version>2.2.0-b23</cglib.version>
<checkstyle.plugin.version>3.1.0</checkstyle.plugin.version>
<checkstyle.version>8.29</checkstyle.version>
[ranger] 01/02: RANGER-3611: fix NullPtrException in download API
Posted by pr...@apache.org.
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 49ac30ab5bdc8465156a89783b30c960b7499682
Author: ZhouTianling <zh...@sensorsdata.cn>
AuthorDate: Tue Feb 8 19:09:45 2022 +0800
RANGER-3611: fix NullPtrException in download API
Signed-off-by: pradeep <pr...@apache.org>
---
.../src/main/java/org/apache/ranger/biz/AssetMgr.java | 2 +-
.../src/main/java/org/apache/ranger/rest/RoleREST.java | 10 ++--------
.../src/main/java/org/apache/ranger/rest/ServiceREST.java | 13 ++++---------
.../src/main/java/org/apache/ranger/rest/XUserREST.java | 15 ++++-----------
4 files changed, 11 insertions(+), 29 deletions(-)
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 90f9690de..84f5ab168 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
@@ -674,7 +674,7 @@ public class AssetMgr extends AssetMgrBase {
return ret;
}
- public void createPluginInfo(String serviceName, String pluginId, HttpServletRequest request, int entityType, Long downloadedVersion, long lastKnownVersion, long lastActivationTime, int httpCode, String clusterName, String pluginCapabilities) {
+ public void createPluginInfo(String serviceName, String pluginId, HttpServletRequest request, int entityType, Long downloadedVersion, Long lastKnownVersion, long lastActivationTime, int httpCode, String clusterName, String pluginCapabilities) {
RangerRESTUtils restUtils = new RangerRESTUtils();
final String ipAddress = getRemoteAddress(request);
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/RoleREST.java b/security-admin/src/main/java/org/apache/ranger/rest/RoleREST.java
index 11a2b3ec2..b026f6e95 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/RoleREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/RoleREST.java
@@ -723,7 +723,7 @@ public class RoleREST {
@Produces({ "application/json", "application/xml" })
public RangerRoles getRangerRolesIfUpdated(
@PathParam("serviceName") String serviceName,
- @QueryParam("lastKnownRoleVersion") Long lastKnownRoleVersion,
+ @DefaultValue("-1") @QueryParam("lastKnownRoleVersion") Long lastKnownRoleVersion,
@DefaultValue("0") @QueryParam("lastActivationTime") Long lastActivationTime,
@QueryParam("pluginId") String pluginId,
@DefaultValue("") @QueryParam("clusterName") String clusterName,
@@ -751,9 +751,6 @@ public class RoleREST {
logMsg = e.getMessage();
}
if (isValid) {
- if (lastKnownRoleVersion == null) {
- lastKnownRoleVersion = Long.valueOf(-1);
- }
try {
RangerRoles roles = roleStore.getRoles(serviceName, lastKnownRoleVersion);
if (roles == null) {
@@ -793,7 +790,7 @@ public class RoleREST {
@Produces({ "application/json", "application/xml" })
public RangerRoles getSecureRangerRolesIfUpdated(
@PathParam("serviceName") String serviceName,
- @QueryParam("lastKnownRoleVersion") Long lastKnownRoleVersion,
+ @DefaultValue("-1") @QueryParam("lastKnownRoleVersion") Long lastKnownRoleVersion,
@DefaultValue("0") @QueryParam("lastActivationTime") Long lastActivationTime,
@QueryParam("pluginId") String pluginId,
@DefaultValue("") @QueryParam("clusterName") String clusterName,
@@ -824,9 +821,6 @@ public class RoleREST {
logMsg = e.getMessage();
}
if (isValid) {
- if (lastKnownRoleVersion == null) {
- lastKnownRoleVersion = Long.valueOf(-1);
- }
try {
XXService xService = daoManager.getXXService().findByName(serviceName);
if (xService == null) {
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
index 098188e3b..d68def9b1 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
@@ -2990,7 +2990,7 @@ public class ServiceREST {
@Produces({ "application/json", "application/xml" })
public ServicePolicies getServicePoliciesIfUpdated(
@PathParam("serviceName") String serviceName,
- @QueryParam("lastKnownVersion") Long lastKnownVersion,
+ @DefaultValue("-1") @QueryParam("lastKnownVersion") Long lastKnownVersion,
@DefaultValue("0") @QueryParam("lastActivationTime") Long lastActivationTime,
@QueryParam("pluginId") String pluginId,
@DefaultValue("") @QueryParam("clusterName") String clusterName,
@@ -3023,11 +3023,8 @@ public class ServiceREST {
httpCode = HttpServletResponse.SC_BAD_REQUEST;
logMsg = e.getMessage();
}
- if (isValid) {
- if (lastKnownVersion == null) {
- lastKnownVersion = Long.valueOf(-1);
- }
+ if (isValid) {
try {
if(RangerPerfTracer.isPerfTraceEnabled(PERF_LOG)) {
perf = RangerPerfTracer.getPerfTracer(PERF_LOG, "ServiceREST.getServicePoliciesIfUpdated(serviceName=" + serviceName + ",lastKnownVersion=" + lastKnownVersion + ",lastActivationTime=" + lastActivationTime + ")");
@@ -3072,7 +3069,7 @@ public class ServiceREST {
@Produces({ "application/json", "application/xml" })
public ServicePolicies getSecureServicePoliciesIfUpdated(
@PathParam("serviceName") String serviceName,
- @QueryParam("lastKnownVersion") Long lastKnownVersion,
+ @DefaultValue("-1") @QueryParam("lastKnownVersion") Long lastKnownVersion,
@DefaultValue("0") @QueryParam("lastActivationTime") Long lastActivationTime,
@QueryParam("pluginId") String pluginId,
@DefaultValue("") @QueryParam("clusterName") String clusterName,
@@ -3105,10 +3102,8 @@ public class ServiceREST {
httpCode = HttpServletResponse.SC_BAD_REQUEST;
logMsg = e.getMessage();
}
+
if (isValid) {
- if (lastKnownVersion == null) {
- lastKnownVersion = Long.valueOf(-1);
- }
try {
if (RangerPerfTracer.isPerfTraceEnabled(PERF_LOG)) {
perf = RangerPerfTracer.getPerfTracer(PERF_LOG, "ServiceREST.getSecureServicePoliciesIfUpdated(serviceName=" + serviceName + ",lastKnownVersion=" + lastKnownVersion + ",lastActivationTime=" + lastActivationTime + ")");
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
index 451805321..4c9ebb7db 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java
@@ -1299,7 +1299,7 @@ public class XUserREST {
@Path("/download/{serviceName}")
@Produces({ "application/xml", "application/json" })
public RangerUserStore getRangerUserStoreIfUpdated(@PathParam("serviceName") String serviceName,
- @QueryParam("lastKnownUserStoreVersion") Long lastKnownUserStoreVersion,
+ @DefaultValue("-1") @QueryParam("lastKnownUserStoreVersion") Long lastKnownUserStoreVersion,
@DefaultValue("0") @QueryParam("lastActivationTime") Long lastActivationTime,
@QueryParam("pluginId") String pluginId,
@DefaultValue("") @QueryParam("clusterName") String clusterName,
@@ -1313,8 +1313,9 @@ public class XUserREST {
boolean isValid = false;
int httpCode = HttpServletResponse.SC_OK;
String logMsg = null;
+ Long downloadedVersion = null;
- try {
+ try {
bizUtil.failUnauthenticatedIfNotAllowed();
isValid = serviceUtil.isValidService(serviceName, request);
@@ -1326,16 +1327,11 @@ public class XUserREST {
logMsg = e.getMessage();
}
- Long downloadedVersion = null;
-
if (isValid) {
try {
XXService xService = rangerDaoManager.getXXService().findByName(serviceName);
if (xService != null) {
- if (lastKnownUserStoreVersion == null) {
- lastKnownUserStoreVersion = Long.valueOf(-1);
- }
RangerUserStore rangerUserStore = xUserMgr.getRangerUserStore(lastKnownUserStoreVersion);
@@ -1377,7 +1373,7 @@ public class XUserREST {
@Path("/secure/download/{serviceName}")
@Produces({ "application/xml", "application/json" })
public RangerUserStore getSecureRangerUserStoreIfUpdated(@PathParam("serviceName") String serviceName,
- @QueryParam("lastKnownUserStoreVersion") Long lastKnownUserStoreVersion,
+ @DefaultValue("-1") @QueryParam("lastKnownUserStoreVersion") Long lastKnownUserStoreVersion,
@DefaultValue("0") @QueryParam("lastActivationTime") Long lastActivationTime,
@QueryParam("pluginId") String pluginId,
@DefaultValue("") @QueryParam("clusterName") String clusterName,
@@ -1402,9 +1398,6 @@ public class XUserREST {
isValid = true;
}
if (isValid) {
- if (lastKnownUserStoreVersion == null) {
- lastKnownUserStoreVersion = Long.valueOf(-1);
- }
XXServiceDef xServiceDef = rangerDaoManager.getXXServiceDef().getById(xService.getType());
RangerService rangerService = svcStore.getServiceByName(serviceName);