Skip to content
Snippets Groups Projects
Commit 065db8c6 authored by srosse's avatar srosse
Browse files

OO-1508: check all parameters of the user session against null

parent 19ede23a
No related branches found
No related tags found
No related merge requests found
...@@ -77,7 +77,9 @@ public class Rule { ...@@ -77,7 +77,9 @@ public class Rule {
} }
public boolean match(UserSession userSession) { public boolean match(UserSession userSession) {
if(userSession == null || userSession.getRoles() == null) return false; if(userSession == null || userSession.getRoles() == null || userSession.getIdentity() == null) {
return false;
}
boolean match = true; boolean match = true;
...@@ -88,7 +90,7 @@ public class Rule { ...@@ -88,7 +90,7 @@ public class Rule {
case AUTHOR: match &= roles.isAuthor(); break; case AUTHOR: match &= roles.isAuthor(); break;
case USER_MGR: match &= roles.isUserManager(); break; case USER_MGR: match &= roles.isUserManager(); break;
case GROUP_MGR: match &= roles.isGroupManager(); break; case GROUP_MGR: match &= roles.isGroupManager(); break;
case RSRC_MGR: match &= roles.isInstitutionalResourceManager(); break; case RSRC_MGR: match &= roles.isInstitutionalResourceManager(); break;
case POOL_MGR: match &= roles.isPoolAdmin(); break; case POOL_MGR: match &= roles.isPoolAdmin(); break;
case ADMIN: match &= roles.isOLATAdmin(); break; case ADMIN: match &= roles.isOLATAdmin(); break;
default: { default: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment