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/96e450a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/96e450a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/96e450a4 Branch: refs/heads/tag-policy Commit: 96e450a43dabbf924665190c561dd6f30ec00be5 Parents: ea3bcb3 d85beb4 Author: Madhan Neethiraj <[email protected]> Authored: Sat Jun 13 17:56:39 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Sat Jun 13 17:56:39 2015 -0700 ---------------------------------------------------------------------- .../validation/RangerServiceValidator.java | 2 +- .../validation/TestRangerServiceValidator.java | 2 +- .../authorizer/RangerHiveAccessRequest.java | 2 +- .../hive/authorizer/RangerHiveAuditHandler.java | 32 ---- .../hive/authorizer/RangerHiveAuthorizer.java | 181 +++++++------------ .../hadoop/crypto/key/RangerKeyStore.java | 13 +- .../crypto/key/RangerKeyStoreProvider.java | 57 ++++-- .../hadoop/crypto/key/kms/server/KMS.java | 16 +- .../apache/ranger/entity/XXRangerKeyStore.java | 2 + .../java/org/apache/ranger/kms/dao/BaseDao.java | 16 +- .../org/apache/ranger/kms/dao/RangerKMSDao.java | 7 + .../META-INF/kms_jpa_named_queries.xml | 5 + kms/src/main/resources/META-INF/persistence.xml | 7 +- .../org/apache/ranger/biz/ServiceDBStore.java | 69 +++---- 14 files changed, 201 insertions(+), 210 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/96e450a4/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java ---------------------------------------------------------------------- diff --cc agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java index 5518e9f,615e385..7c8c552 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java @@@ -146,17 -145,17 +146,17 @@@ public class RangerServiceValidator ext RangerService otherService = getService(name); if (otherService != null && action == Action.CREATE) { failures.add(new ValidationFailureDetailsBuilder() - .field("name") - .isSemanticallyIncorrect() - .becauseOf("service with the name[" + name + "] already exists") - .build()); + .field("name") + .isSemanticallyIncorrect() + .becauseOf("service with the name[" + name + "] already exists") + .build()); valid = false; - } else if (otherService != null && otherService.getId() != null && otherService.getId() != id) { + } else if (otherService != null && otherService.getId() !=null && !otherService.getId().equals(id)) { failures.add(new ValidationFailureDetailsBuilder() - .field("id/name") - .isSemanticallyIncorrect() - .becauseOf("id/name conflict: another service already exists with name[" + name + "], its id is [" + otherService.getId() + "]") - .build()); + .field("id/name") + .isSemanticallyIncorrect() + .becauseOf("id/name conflict: another service already exists with name[" + name + "], its id is [" + otherService.getId() + "]") + .build()); valid = false; } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/96e450a4/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java ---------------------------------------------------------------------- diff --cc security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java index 7cd1f77,ff04d3f..26b1752 --- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java @@@ -101,7 -100,10 +101,8 @@@ import org.apache.ranger.plugin.model.R import org.apache.ranger.plugin.model.RangerServiceDef.RangerPolicyConditionDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerServiceConfigDef; + import org.apache.ranger.plugin.model.validation.RangerServiceDefHelper; -import org.apache.ranger.plugin.store.EmbeddedServiceDefsUtil; -import org.apache.ranger.plugin.store.ServicePredicateUtil; -import org.apache.ranger.plugin.store.ServiceStore; +import org.apache.ranger.plugin.store.*; import org.apache.ranger.plugin.util.SearchFilter; import org.apache.ranger.plugin.util.ServicePolicies; import org.apache.ranger.service.RangerAuditFields; @@@ -1074,12 -1065,8 +1075,12 @@@ public class ServiceDBStore extends Abs RangerServiceService.OPERATION_CREATE_CONTEXT); bizUtil.createTrxLog(trxLogList); + if (createdService.getType().equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME)) { + createDefaultPolicy = false; + } + if (createDefaultPolicy) { - createDefaultPolicy(xCreatedService, vXUser); + createDefaultPolicies(xCreatedService, vXUser); } return createdService;
