Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

make [roles] optional in shiro.ini

Browse source
This commit is contained in:
Prabhjyot Singh 2016-06-11 10:35:52 +05:30
parent 966a96cb27
commit 310a81d39a
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
zeppelin-server/src/main/java/org/apache/zeppelin/utils/SecurityUtils.java
View file

@ -85,7 +85,7 @@ public class SecurityUtils {
public static HashSet<String> getRoles() {
Subject subject = org.apache.shiro.SecurityUtils.getSubject();
HashSet<String> roles = new HashSet<>();
Map allRoles = new HashMap();
Map allRoles = null;
if (subject.isAuthenticated()) {
Collection realmsList = SecurityUtils.getRealmsList();
@ -93,20 +93,20 @@ public class SecurityUtils {
Realm realm = iterator.next();
String name = realm.getName();
if (name.equals("iniRealm")) {
IniRealm r = (IniRealm) realm;
allRoles = r.getIni().get("roles");
allRoles = ((IniRealm) realm).getIni().get("roles");
break;
}
}
Iterator it = allRoles.entrySet().iterator();
while (it.hasNext()) {
Map.Entry pair = (Map.Entry) it.next();
if (subject.hasRole((String) pair.getKey())) {
roles.add((String) pair.getKey());
if (allRoles != null) {
Iterator it = allRoles.entrySet().iterator();
while (it.hasNext()) {
Map.Entry pair = (Map.Entry) it.next();
if (subject.hasRole((String) pair.getKey())) {
roles.add((String) pair.getKey());
}
}
}
}
return roles;
}