natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SimpleAuthorizer example; 

patch by Aleksey Yeschenko, reviewed by Jonathan Ellis for
CASSANDRA-5072
This commit is contained in:
Aleksey Yeschenko 2012-12-17 18:35:31 +03:00
parent 9b217e4676
commit 706612e300
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -5,6 +5,7 @@ Merged from 1.1:
* fix temporarily missing schema after upgrade from pre-1.1.5 (CASSANDRA-5061)
* Fix ALTER TABLE overriding compression options with defaults
(CASSANDRA-4996, CASSANDRA-5066)
* Fix SimpleAuthorizer example (CASSANDRA-5072)
1.2-rc1

10
examples/simple_authentication/src/org/apache/cassandra/auth/SimpleAuthorizer.java
View File

@ -41,10 +41,10 @@ public class SimpleAuthorizer extends LegacyAuthorizer
public EnumSet<Permission> authorize(AuthenticatedUser user, List<Object> resource)
{
if (resource.size() < 2 || !Resources.ROOT.equals(resource.get(0)) || !Resources.KEYSPACES.equals(resource.get(1)))
return EnumSet.copyOf(Permission.NONE);
return EnumSet.noneOf(Permission.class);
String keyspace, columnFamily = null;
EnumSet<Permission> authorized = EnumSet.copyOf(Permission.NONE);
EnumSet<Permission> authorized = EnumSet.noneOf(Permission.class);
// /cassandra/keyspaces
if (resource.size() == 2)
@ -82,7 +82,7 @@ public class SimpleAuthorizer extends LegacyAuthorizer
{
String kspAdmins = accessProperties.getProperty(KEYSPACES_WRITE_PROPERTY);
for (String admin : kspAdmins.split(","))
if (admin.equals(user.username))
if (admin.equals(user.getName()))
return EnumSet.copyOf(Permission.ALL);
}
@ -104,7 +104,7 @@ public class SimpleAuthorizer extends LegacyAuthorizer
{
for (String reader : readers.split(","))
{
if (reader.equals(user.username))
if (reader.equals(user.getName()))
{
canRead = true;
break;
@ -116,7 +116,7 @@ public class SimpleAuthorizer extends LegacyAuthorizer
{
for (String writer : writers.split(","))
{
if (writer.equals(user.username))
if (writer.equals(user.getName()))
{
canWrite = true;
break;