Repository: incubator-slider Updated Branches: refs/heads/develop 3111cbad5 -> cdf9e5807
Addendum for setting default ACLs Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/cdf9e580 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/cdf9e580 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/cdf9e580 Branch: refs/heads/develop Commit: cdf9e58071edbb9a19920c5c47dddb13640c5967 Parents: 3111cba Author: tedyu <[email protected]> Authored: Thu Oct 23 21:04:38 2014 -0700 Committer: tedyu <[email protected]> Committed: Thu Oct 23 21:04:38 2014 -0700 ---------------------------------------------------------------------- .../apache/slider/server/appmaster/SliderAppMaster.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/cdf9e580/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java index 029f901..7a1711f 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java @@ -657,6 +657,13 @@ public class SliderAppMaster extends AbstractSliderLaunchedService // set up secret manager secretManager = new ClientToAMTokenSecretManager(appAttemptID, null); + if (securityEnabled) { + // fix up the ACLs if they are not set + String acls = getConfig().get(SliderXmlConfKeys.KEY_PROTOCOL_ACL); + if (acls == null) { + getConfig().set(SliderXmlConfKeys.KEY_PROTOCOL_ACL, "*"); + } + } //bring up the Slider RPC service startSliderRPCServer(instanceDefinition); @@ -767,11 +774,6 @@ public class SliderAppMaster extends AbstractSliderLaunchedService amRegistrationData.getClientToAMTokenMasterKey().array()); applicationACLs = amRegistrationData.getApplicationACLs(); - // fix up the ACLs if they are not set - String acls = getConfig().get(SliderXmlConfKeys.KEY_PROTOCOL_ACL); - if (acls == null) { - getConfig().set(SliderXmlConfKeys.KEY_PROTOCOL_ACL, "*"); - } //tell the server what the ACLs are rpcService.getServer().refreshServiceAcl(serviceConf, new SliderAMPolicyProvider());
