accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [42/54] git commit: ACCUMULO-1479 added namespace permissions to the zookeeper upgrade part of Master
Date Fri, 01 Nov 2013 02:00:43 GMT
ACCUMULO-1479 added namespace permissions to the zookeeper upgrade part of Master


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5430feae
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5430feae
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5430feae

Branch: refs/heads/ACCUMULO-802
Commit: 5430feae9539b8e79118a22a4595d588f2223207
Parents: 828e6ad
Author: Sean Hickey <tallirishllama@gmail.com>
Authored: Wed Aug 7 13:59:50 2013 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Oct 31 21:37:31 2013 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/master/Master.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5430feae/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index e9b8994..1f2c864 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -78,6 +78,7 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Lo
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.Credentials;
 import org.apache.accumulo.core.security.SecurityUtil;
+import org.apache.accumulo.core.security.TableNamespacePermission;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.Daemon;
@@ -139,6 +140,7 @@ import org.apache.accumulo.server.master.state.ZooTabletStateStore;
 import org.apache.accumulo.server.security.AuditedSecurityOperation;
 import org.apache.accumulo.server.security.SecurityOperation;
 import org.apache.accumulo.server.security.SystemCredentials;
+import org.apache.accumulo.server.security.handler.ZKPermHandler;
 import org.apache.accumulo.server.tables.TableManager;
 import org.apache.accumulo.server.tables.TableObserver;
 import org.apache.accumulo.server.util.DefaultMap;
@@ -363,6 +365,17 @@ public class Master implements LiveTServerSet.Listener, TableObserver,
CurrentSt
                 NodeExistsPolicy.SKIP);
           }
         }
+
+        // add namespace permissions to existing users
+        ZKPermHandler perm = new ZKPermHandler();
+        perm.initialize(instance.getInstanceID(), true);
+        String users = ZooUtil.getRoot(instance) + "/users";
+        for (String user : zoo.getChildren(users)) {
+          zoo.putPersistentData(users + "/" + user + "/Namespaces", new byte[0], NodeExistsPolicy.SKIP);
+          perm.grantTableNamespacePermission(user, Constants.SYSTEM_TABLE_NAMESPACE_ID, TableNamespacePermission.READ);
+        }
+        perm.grantTableNamespacePermission("root", Constants.SYSTEM_TABLE_NAMESPACE_ID, TableNamespacePermission.ALTER_TABLE);
+
       } catch (Exception ex) {
         log.fatal("Error performing upgrade", ex);
         System.exit(1);


Mime
View raw message