You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/04/02 23:14:39 UTC
[2/3] hbase git commit: HBASE-11386 Backport HBASE-12601 to all
active branches other than master
HBASE-11386 Backport HBASE-12601 to all active branches other than master
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/27ec6bc8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/27ec6bc8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/27ec6bc8
Branch: refs/heads/0.98
Commit: 27ec6bc888843343cd5924be301cd87607c1ced7
Parents: b881aed
Author: Ashish Singhi <as...@huawei.com>
Authored: Thu Apr 2 10:37:02 2015 +0530
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Apr 2 14:14:04 2015 -0700
----------------------------------------------------------------------
hbase-shell/src/main/ruby/shell/commands/grant.rb | 5 ++++-
hbase-shell/src/main/ruby/shell/commands/revoke.rb | 9 ++++++++-
hbase-shell/src/main/ruby/shell/commands/user_permission.rb | 4 ++++
3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/27ec6bc8/hbase-shell/src/main/ruby/shell/commands/grant.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/grant.rb b/hbase-shell/src/main/ruby/shell/commands/grant.rb
index 0e8a65c..4a995ff 100644
--- a/hbase-shell/src/main/ruby/shell/commands/grant.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/grant.rb
@@ -27,11 +27,14 @@ Syntax : grant <user> <permissions> [<@namespace> [<table> [<column family> [<co
permissions is either zero or more letters from the set "RWXCA".
READ('R'), WRITE('W'), EXEC('X'), CREATE('C'), ADMIN('A')
-Note: A namespace must always precede with '@' character.
+Note: Groups and users are granted access in the same way, but groups are prefixed with an '@'
+ character. In the same way, tables and namespaces are specified, but namespaces are
+ prefixed with an '@' character.
For example:
hbase> grant 'bobsmith', 'RWXCA'
+ hbase> grant '@admins', 'RWXCA'
hbase> grant 'bobsmith', 'RWXCA', '@ns1'
hbase> grant 'bobsmith', 'RW', 't1', 'f1', 'col1'
hbase> grant 'bobsmith', 'RW', 'ns1:t1', 'f1', 'col1'
http://git-wip-us.apache.org/repos/asf/hbase/blob/27ec6bc8/hbase-shell/src/main/ruby/shell/commands/revoke.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/revoke.rb b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
index 57a2530..768989b 100644
--- a/hbase-shell/src/main/ruby/shell/commands/revoke.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
@@ -22,10 +22,17 @@ module Shell
def help
return <<-EOF
Revoke a user's access rights.
-Syntax : revoke <user> [<table> [<column family> [<column qualifier>]]
+Syntax : revoke <user> [<@namespace> [<table> [<column family> [<column qualifier>]]]]
+
+Note: Groups and users access are revoked in the same way, but groups are prefixed with an '@'
+ character. In the same way, tables and namespaces are specified, but namespaces are
+ prefixed with an '@' character.
+
For example:
hbase> revoke 'bobsmith'
+ hbase> revoke '@admins'
+ hbase> revoke 'bobsmith', '@ns1'
hbase> revoke 'bobsmith', 't1', 'f1', 'col1'
hbase> revoke 'bobsmith', 'ns1:t1', 'f1', 'col1'
EOF
http://git-wip-us.apache.org/repos/asf/hbase/blob/27ec6bc8/hbase-shell/src/main/ruby/shell/commands/user_permission.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/user_permission.rb b/hbase-shell/src/main/ruby/shell/commands/user_permission.rb
index 5d8bf8a..e4673fc 100644
--- a/hbase-shell/src/main/ruby/shell/commands/user_permission.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/user_permission.rb
@@ -23,9 +23,13 @@ module Shell
return <<-EOF
Show all permissions for the particular user.
Syntax : user_permission <table>
+
+Note: A namespace must always precede with '@' character.
+
For example:
hbase> user_permission
+ hbase> user_permission '@ns1'
hbase> user_permission 'table1'
hbase> user_permission 'namespace1:table1'
hbase> user_permission '.*'