You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2014/12/02 01:15:55 UTC
[1/2] accumulo git commit: ACCUMULO-1722: Reworked the user
permissions Sorted the properties to make it easier to diff Added support for
namespaces
Repository: accumulo
Updated Branches:
refs/heads/master 191bee180 -> 692312b57
ACCUMULO-1722: Reworked the user permissions
Sorted the properties to make it easier to diff
Added support for namespaces
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eed1656f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eed1656f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eed1656f
Branch: refs/heads/master
Commit: eed1656f88f974628566e3e0192ca477c17a9848
Parents: 7f20e6a
Author: Dave Marion <dl...@hotmail.com>
Authored: Mon Dec 1 19:04:04 2014 -0500
Committer: Dave Marion <dl...@hotmail.com>
Committed: Mon Dec 1 19:04:04 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/server/util/Admin.java | 155 +++++++++++++------
.../accumulo/server/util/AdminCommandsTest.java | 3 +-
.../org/apache/accumulo/test/DumpConfigIT.java | 9 +-
3 files changed, 115 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/eed1656f/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index bab42b5..6c1128e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -28,12 +28,14 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedSet;
+import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.NamespaceNotFoundException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.admin.InstanceOperations;
import org.apache.accumulo.core.client.impl.ClientExec;
@@ -44,7 +46,9 @@ import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.master.thrift.MasterClientService;
import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
+import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.util.AddressUtil;
@@ -112,16 +116,18 @@ public class Admin {
@Parameters(commandDescription = "print out non-default configuration settings")
static class DumpConfigCommand {
- @Parameter(names = {"-t", "--tables"}, description = "print per-table configuration")
- List<String> tables = new ArrayList<String>();
@Parameter(names = {"-a", "--all"}, description = "print the system and all table configurations")
boolean allConfiguration = false;
- @Parameter(names = {"-s", "--system"}, description = "print the system configuration")
- boolean systemConfiguration = false;
- @Parameter(names = {"-p", "--permissions"}, description = "print user permissions (must be used in combination with -a, -s, or -t)")
- boolean userPermissions = false;
@Parameter(names = {"-d", "--directory"}, description = "directory to place config files")
String directory = null;
+ @Parameter(names = {"-s", "--system"}, description = "print the system configuration")
+ boolean systemConfiguration = false;
+ @Parameter(names = {"-n", "--namespaces"}, description = "print the namespace configuration")
+ boolean namespaceConfiguration = false;
+ @Parameter(names = {"-t", "--tables"}, description = "print per-table configuration")
+ List<String> tables = new ArrayList<String>();
+ @Parameter(names = {"-u", "--users"}, description = "print users and their authorizations and permissions")
+ boolean users = false;
}
@Parameters(commandDescription = "redistribute tablet directories across the current volume list")
@@ -340,10 +346,17 @@ public class Admin {
}
private static final String ACCUMULO_SITE_BACKUP_FILE = "accumulo-site.xml.bak";
- private static final String PERMISSION_FILE_SUFFIX = "_perm.cfg";
+ private static final String NS_FILE_SUFFIX = "_ns.cfg";
+ private static final String USER_FILE_SUFFIX = "_user.cfg";
private static final MessageFormat configFormat = new MessageFormat("config -t {0} -s {1}\n");
+ private static final MessageFormat createNsFormat = new MessageFormat("createnamespace {0}\n");
+ private static final MessageFormat createTableFormat = new MessageFormat("createtable {0}\n");
+ private static final MessageFormat createUserFormat = new MessageFormat("createuser {0}\n");
+ private static final MessageFormat nsConfigFormat = new MessageFormat("config -ns {0} -s {1}\n");
private static final MessageFormat sysPermFormat = new MessageFormat("grant System.{0} -s -u {1}\n");
+ private static final MessageFormat nsPermFormat = new MessageFormat("grant Namespace.{0} -ns {1} -u {2}\n");
private static final MessageFormat tablePermFormat = new MessageFormat("grant Table.{0} -t {1} -u {2}\n");
+ private static final MessageFormat userAuthsFormat = new MessageFormat("setauths -u {0} -s {1}\n");
private static DefaultConfiguration defaultConfig;
private static Map<String,String> siteConfig, systemConfig;
@@ -365,24 +378,45 @@ public class Admin {
defaultConfig = AccumuloConfiguration.getDefaultConfiguration();
siteConfig = connector.instanceOperations().getSiteConfiguration();
systemConfig = connector.instanceOperations().getSystemConfiguration();
- if (opts.userPermissions) {
+ if (opts.allConfiguration || opts.users) {
localUsers = Lists.newArrayList(connector.securityOperations().listLocalUsers());
Collections.sort(localUsers);
}
+
if (opts.allConfiguration) {
- printSystemConfiguration(connector, outputDirectory, opts.userPermissions);
+ //print accumulo site
+ printSystemConfiguration(connector, outputDirectory);
+ //print namespaces
+ for (String namespace : connector.namespaceOperations().list()) {
+ printNameSpaceConfiguration(connector, namespace, outputDirectory);
+ }
+ //print tables
SortedSet<String> tableNames = connector.tableOperations().list();
for (String tableName : tableNames) {
- printTableConfiguration(connector, tableName, outputDirectory, opts.userPermissions);
+ printTableConfiguration(connector, tableName, outputDirectory);
}
-
+ //print users
+ for (String user : localUsers) {
+ printUserConfiguration(connector, user, outputDirectory);
+ }
} else {
if (opts.systemConfiguration) {
- printSystemConfiguration(connector, outputDirectory, opts.userPermissions);
+ printSystemConfiguration(connector, outputDirectory);
}
-
- for (String tableName : opts.tables) {
- printTableConfiguration(connector, tableName, outputDirectory, opts.userPermissions);
+ if (opts.namespaceConfiguration) {
+ for (String namespace : connector.namespaceOperations().list()) {
+ printNameSpaceConfiguration(connector, namespace, outputDirectory);
+ }
+ }
+ if (opts.tables.size() > 0) {
+ for (String tableName : opts.tables) {
+ printTableConfiguration(connector, tableName, outputDirectory);
+ }
+ }
+ if (opts.users) {
+ for (String user : localUsers) {
+ printUserConfiguration(connector, user, outputDirectory);
+ }
}
}
}
@@ -401,16 +435,66 @@ public class Admin {
return defaultValue;
}
- private static void printSystemConfiguration(Connector connector, File outputDirectory, boolean userPermissions) throws IOException, AccumuloException,
+ private static void printNameSpaceConfiguration(Connector connector, String namespace, File outputDirectory) throws IOException, AccumuloException, AccumuloSecurityException, NamespaceNotFoundException {
+ File namespaceScript = new File(outputDirectory, namespace + NS_FILE_SUFFIX);
+ FileWriter nsWriter = new FileWriter(namespaceScript);
+ nsWriter.write(createNsFormat.format(new String[] {namespace}));
+ TreeMap<String,String> props = new TreeMap<String,String>();
+ for (Entry<String,String> p : connector.namespaceOperations().getProperties(namespace)) {
+ props.put(p.getKey(), p.getValue());
+ }
+ for (Entry<String,String> entry : props.entrySet()) {
+ String defaultValue = getDefaultConfigValue(entry.getKey());
+ if (defaultValue == null || !defaultValue.equals(entry.getValue())) {
+ if (!entry.getValue().equals(siteConfig.get(entry.getKey())) && !entry.getValue().equals(systemConfig.get(entry.getKey()))) {
+ nsWriter.write(nsConfigFormat.format(new String[] {namespace, entry.getKey()+"="+entry.getValue()}));
+ }
+ }
+ }
+ nsWriter.close();
+ }
+
+ private static void printUserConfiguration(Connector connector, String user, File outputDirectory) throws IOException, AccumuloException, AccumuloSecurityException {
+ File userScript = new File(outputDirectory, user + USER_FILE_SUFFIX);
+ FileWriter userWriter = new FileWriter(userScript);
+ userWriter.write(createUserFormat.format(new String[] {user}));
+ Authorizations auths = connector.securityOperations().getUserAuthorizations(user);
+ userWriter.write(userAuthsFormat.format(new String[] {user, auths.toString()}));
+ for (SystemPermission sp : SystemPermission.values()) {
+ if (connector.securityOperations().hasSystemPermission(user, sp)) {
+ userWriter.write(sysPermFormat.format(new String[] {sp.name(), user}));
+ }
+ }
+ for (String namespace : connector.namespaceOperations().list()) {
+ for (NamespacePermission np : NamespacePermission.values()) {
+ if (connector.securityOperations().hasNamespacePermission(user, namespace, np)) {
+ userWriter.write(nsPermFormat.format(new String[] {np.name(), namespace, user}));
+ }
+ }
+ }
+ for (String tableName : connector.tableOperations().list()) {
+ for (TablePermission perm : TablePermission.values()) {
+ if (connector.securityOperations().hasTablePermission(user, tableName, perm)) {
+ userWriter.write(tablePermFormat.format(new String[] {perm.name(), tableName, user}));
+ }
+ }
+ }
+
+ userWriter.close();
+ }
+
+ private static void printSystemConfiguration(Connector connector, File outputDirectory) throws IOException, AccumuloException,
AccumuloSecurityException {
Configuration conf = new Configuration(false);
- for (Entry<String,String> prop : siteConfig.entrySet()) {
+ TreeMap<String,String> site = new TreeMap<String,String>(siteConfig);
+ for (Entry<String,String> prop : site.entrySet()) {
String defaultValue = getDefaultConfigValue(prop.getKey());
if (!prop.getValue().equals(defaultValue) && !systemConfig.containsKey(prop.getKey())) {
conf.set(prop.getKey(), prop.getValue());
}
}
- for (Entry<String,String> prop : systemConfig.entrySet()) {
+ TreeMap<String,String> system = new TreeMap<String,String>(systemConfig);
+ for (Entry<String,String> prop : system.entrySet()) {
String defaultValue = getDefaultConfigValue(prop.getKey());
if (!prop.getValue().equals(defaultValue)) {
conf.set(prop.getKey(), prop.getValue());
@@ -423,26 +507,18 @@ public class Admin {
} finally {
fos.close();
}
- if (userPermissions) {
- File permScript = new File(outputDirectory, "system" + PERMISSION_FILE_SUFFIX);
- FileWriter writer = new FileWriter(permScript);
- for (String principal : localUsers) {
- for (SystemPermission perm : SystemPermission.values()) {
- if (connector.securityOperations().hasSystemPermission(principal, perm)) {
- writer.write(sysPermFormat.format(new String[] {perm.name(), principal}));
- }
- }
- }
- writer.close();
- }
}
- private static void printTableConfiguration(Connector connector, String tableName, File outputDirectory, boolean userPermissions) throws AccumuloException,
+ private static void printTableConfiguration(Connector connector, String tableName, File outputDirectory) throws AccumuloException,
TableNotFoundException, IOException, AccumuloSecurityException {
- Iterable<Entry<String,String>> tableConfig = connector.tableOperations().getProperties(tableName);
File tableBackup = new File(outputDirectory, tableName + ".cfg");
FileWriter writer = new FileWriter(tableBackup);
- for (Entry<String,String> prop : tableConfig) {
+ writer.write(createTableFormat.format(new String[] {tableName}));
+ TreeMap<String,String> props = new TreeMap<String,String>();
+ for (Entry<String,String> p : connector.tableOperations().getProperties(tableName)) {
+ props.put(p.getKey(), p.getValue());
+ }
+ for (Entry<String,String> prop : props.entrySet()) {
if (prop.getKey().startsWith(Property.TABLE_PREFIX.getKey())) {
String defaultValue = getDefaultConfigValue(prop.getKey());
if (defaultValue == null || !defaultValue.equals(prop.getValue())) {
@@ -453,18 +529,5 @@ public class Admin {
}
}
writer.close();
-
- if (userPermissions) {
- File permScript = new File(outputDirectory, tableName + PERMISSION_FILE_SUFFIX);
- FileWriter permWriter = new FileWriter(permScript);
- for (String principal : localUsers) {
- for (TablePermission perm : TablePermission.values()) {
- if (connector.securityOperations().hasTablePermission(principal, tableName, perm)) {
- permWriter.write(tablePermFormat.format(new String[] {perm.name(), tableName, principal}));
- }
- }
- }
- permWriter.close();
- }
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/eed1656f/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
index 3802983..f95c0f1 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/AdminCommandsTest.java
@@ -68,7 +68,8 @@ public class AdminCommandsTest {
assertEquals(0, cmd.tables.size());
assertFalse(cmd.allConfiguration);
assertFalse(cmd.systemConfiguration);
- assertFalse(cmd.userPermissions);
+ assertFalse(cmd.namespaceConfiguration);
+ assertFalse(cmd.users);
assertNull(cmd.directory);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/eed1656f/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java b/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java
index f3cee1d..5252e68 100644
--- a/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java
@@ -54,17 +54,16 @@ public class DumpConfigIT extends ConfigurableMacIT {
public void test() throws Exception {
File siteFileBackup = new File(folder.getRoot(), "accumulo-site.xml.bak");
assertFalse(siteFileBackup.exists());
- assertEquals(0, exec(Admin.class, new String[] {"dumpConfig", "-a", "-p", "-d", folder.getRoot().getPath()}).waitFor());
+ assertEquals(0, exec(Admin.class, new String[] {"dumpConfig", "-a", "-d", folder.getRoot().getPath()}).waitFor());
assertTrue(siteFileBackup.exists());
String site = FunctionalTestUtils.readAll(new FileInputStream(siteFileBackup));
assertTrue(site.contains(Property.TABLE_FILE_BLOCK_SIZE.getKey()));
assertTrue(site.contains("1234567"));
String meta = FunctionalTestUtils.readAll(new FileInputStream(new File(folder.getRoot(), MetadataTable.NAME + ".cfg")));
assertTrue(meta.contains(Property.TABLE_FILE_REPLICATION.getKey()));
- String systemPerm = FunctionalTestUtils.readAll(new FileInputStream(new File(folder.getRoot(), "system_perm.cfg")));
+ String systemPerm = FunctionalTestUtils.readAll(new FileInputStream(new File(folder.getRoot(), "root_user.cfg")));
assertTrue(systemPerm.contains("grant System.ALTER_USER -s -u root"));
- String metaPerm = FunctionalTestUtils.readAll(new FileInputStream(new File(folder.getRoot(), MetadataTable.NAME + "_perm.cfg")));
- assertTrue(metaPerm.contains("grant Table.READ -t " + MetadataTable.NAME + " -u root"));
- assertFalse(metaPerm.contains("grant Table.DROP -t " + MetadataTable.NAME + " -u root"));
+ assertTrue(systemPerm.contains("grant Table.READ -t " + MetadataTable.NAME + " -u root"));
+ assertFalse(systemPerm.contains("grant Table.DROP -t " + MetadataTable.NAME + " -u root"));
}
}
[2/2] accumulo git commit: Merge branch '1.6' for ACCUMULO-1722
Posted by dl...@apache.org.
Merge branch '1.6' for ACCUMULO-1722
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/692312b5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/692312b5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/692312b5
Branch: refs/heads/master
Commit: 692312b57b6334021235d72d48f71da905489390
Parents: 191bee1 eed1656
Author: Dave Marion <dl...@hotmail.com>
Authored: Mon Dec 1 19:05:40 2014 -0500
Committer: Dave Marion <dl...@hotmail.com>
Committed: Mon Dec 1 19:05:40 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/server/util/Admin.java | 155 +++++++++++++------
.../accumulo/server/util/AdminCommandsTest.java | 3 +-
.../org/apache/accumulo/test/DumpConfigIT.java | 9 +-
3 files changed, 115 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/692312b5/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index 651d31d,6c1128e..ae36f1f
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@@ -34,24 -35,27 +35,27 @@@ import org.apache.accumulo.core.client.
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+ import org.apache.accumulo.core.client.NamespaceNotFoundException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.admin.InstanceOperations;
+import org.apache.accumulo.core.client.impl.ClientContext;
import org.apache.accumulo.core.client.impl.ClientExec;
import org.apache.accumulo.core.client.impl.MasterClient;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.DefaultConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.master.thrift.MasterClientService;
import org.apache.accumulo.core.metadata.MetadataTable;
+ import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.Credentials;
+ import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.AddressUtil;
+import org.apache.accumulo.server.AccumuloServerContext;
import org.apache.accumulo.server.cli.ClientOpts;
-import org.apache.accumulo.server.conf.ServerConfiguration;
-import org.apache.accumulo.server.security.SystemCredentials;
-import org.apache.accumulo.trace.instrument.Tracer;
+import org.apache.accumulo.server.conf.ServerConfigurationFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.log4j.Logger;