ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject [13/13] incubator-ranger git commit: Merge branch 'master' into tag-policy
Date Wed, 16 Sep 2015 20:29:24 GMT
Merge branch 'master' into tag-policy


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/9da461d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/9da461d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/9da461d2

Branch: refs/heads/tag-policy
Commit: 9da461d272ad7627479def92e9b9c048ff8f97e2
Parents: f6b6da5 be6bc40
Author: Madhan Neethiraj <madhan@apache.org>
Authored: Wed Sep 16 08:58:50 2015 -0700
Committer: Madhan Neethiraj <madhan@apache.org>
Committed: Wed Sep 16 08:58:50 2015 -0700

----------------------------------------------------------------------
 README.txt                                      |  25 +-
 .../audit/destination/SolrAuditDestination.java |  44 +-
 .../audit/provider/AsyncAuditProvider.java      |  48 +-
 .../audit/provider/AuditProviderFactory.java    |   9 +-
 .../ranger/audit/provider/DbAuditProvider.java  |  15 +-
 .../audit/provider/MultiDestAuditProvider.java  |  10 +-
 .../plugin/errors/ValidationErrorCode.java      |  36 +-
 .../model/validation/RangerPolicyValidator.java |  39 +-
 .../validation/ValidationFailureDetails.java    |   2 +-
 .../service-defs/ranger-servicedef-solr.json    |   4 +-
 kms/scripts/ranger-kms                          |   4 +
 kms/scripts/setup.sh                            |   6 +-
 .../client/RangerAdminJersey2RESTClient.java    |  66 +--
 security-admin/src/bin/ranger_install.py        |   8 +
 .../java/org/apache/ranger/biz/UserMgr.java     |  73 +--
 .../java/org/apache/ranger/biz/XAuditMgr.java   |  73 ++-
 .../java/org/apache/ranger/biz/XUserMgr.java    | 278 +++++-----
 .../org/apache/ranger/db/XXGroupUserDao.java    |  21 +
 .../org/apache/ranger/db/XXModuleDefDao.java    |  38 ++
 .../java/org/apache/ranger/rest/AssetREST.java  |  15 +-
 .../org/apache/ranger/rest/PublicAPIsv2.java    |   2 +-
 .../org/apache/ranger/rest/ServiceREST.java     |  30 +-
 .../java/org/apache/ranger/rest/UserREST.java   |  13 +-
 .../java/org/apache/ranger/rest/XAuditREST.java |  10 +-
 .../java/org/apache/ranger/rest/XKeyREST.java   |  10 +-
 .../java/org/apache/ranger/rest/XUserREST.java  | 114 +++-
 .../ranger/security/context/RangerAPIList.java  | 201 +++++++
 .../security/context/RangerAPIMapping.java      | 535 +++++++++++++++++++
 .../context/RangerPreAuthSecurityHandler.java   |  93 ++++
 .../apache/ranger/service/XAuditMapService.java |  60 +++
 .../apache/ranger/service/XPermMapService.java  |  60 ++-
 .../apache/ranger/service/XResourceService.java |  31 +-
 .../resources/META-INF/jpa_named_queries.xml    |  19 +
 .../conf.dist/security-applicationContext.xml   |   2 +
 .../org/apache/ranger/audit/TestAuditQueue.java |   3 +-
 .../java/org/apache/ranger/biz/TestUserMgr.java |  14 +-
 .../org/apache/ranger/biz/TestXUserMgr.java     |   9 +-
 .../org/apache/ranger/rest/TestServiceREST.java |   2 +-
 src/main/assembly/knox-agent.xml                |   1 +
 39 files changed, 1651 insertions(+), 372 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9da461d2/agents-audit/src/main/java/org/apache/ranger/audit/destination/SolrAuditDestination.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9da461d2/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9da461d2/knox-agent/src/main/java/org/apache/ranger/admin/client/RangerAdminJersey2RESTClient.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9da461d2/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9da461d2/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
----------------------------------------------------------------------
diff --cc security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
index bad3366,f523d67..f77be65
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
@@@ -1572,11 -1502,9 +1584,12 @@@ public class ServiceREST 
  
  	@GET
  	@Path("/policy/{policyId}/versionList")
+ 	@PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.GET_POLICY_VERSION_LIST
+ "\")")
  	public VXString getPolicyVersionList(@PathParam("policyId") Long policyId) {
 -		return svcStore.getPolicyVersionList(policyId);
 +
 +		VXString policyVersionListStr = svcStore.getPolicyVersionList(policyId);
 +
 +		return policyVersionListStr;
  	}
  
  	@GET

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9da461d2/security-admin/src/main/resources/META-INF/jpa_named_queries.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9da461d2/security-admin/src/main/resources/conf.dist/security-applicationContext.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9da461d2/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
----------------------------------------------------------------------


Mime
View raw message