From 8d99c88af55041ff06e6b9372b6b1f66220bed38 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 10 Apr 2017 16:08:58 +0000
Subject: [PATCH] #3529 feature - Added applications to user profile and upgrade to angular4
---
securis/src/main/java/net/curisit/securis/security/BasicSecurityContext.java | 140 ++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 61 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/security/BasicSecurityContext.java b/securis/src/main/java/net/curisit/securis/security/BasicSecurityContext.java
index 3f20ddc..dc0f40b 100644
--- a/securis/src/main/java/net/curisit/securis/security/BasicSecurityContext.java
+++ b/securis/src/main/java/net/curisit/securis/security/BasicSecurityContext.java
@@ -11,83 +11,101 @@
public class BasicSecurityContext implements SecurityContext {
- final public static String ROL_ADVANCE = "advance";
- final public static String ROL_ADMIN = "admin";
+ final public static String ROL_ADVANCE = "advance";
+ final public static String ROL_ADMIN = "admin";
+ final public static String ROL_BASIC = "basic";
- final static Map<String, Integer> ROLES = Utils.<String, Integer> createMap(ROL_ADVANCE, User.Rol.ADVANCE, ROL_ADMIN, User.Rol.ADMIN);
+ final static Map<String, Integer> ROLES = Utils.<String, Integer> createMap(ROL_BASIC, User.Rol.BASIC, ROL_ADVANCE, User.Rol.ADVANCE, ROL_ADMIN, User.Rol.ADMIN);
- Principal user = null;
- int roles = 0;
- boolean secure = false;
- Set<Integer> organizationsIds = null;
- double ran = 0;
+ Principal user = null;
+ int roles = 0;
+ boolean secure = false;
+ Set<Integer> organizationsIds = null;
+ Set<Integer> applicationsIds = null;
+ double ran = 0;
- public BasicSecurityContext(String username, int roles, boolean secure) {
- user = new UserPrincipal(username);
- this.roles = roles;
- this.secure = secure;
- ran = Math.random();
- }
+ public BasicSecurityContext(String username, int roles, boolean secure) {
+ user = new UserPrincipal(username);
+ this.roles = roles;
+ this.secure = secure;
+ ran = Math.random();
+ }
- @Override
- public Principal getUserPrincipal() {
- return user;
- }
+ @Override
+ public Principal getUserPrincipal() {
+ return user;
+ }
- @Override
- public boolean isUserInRole(String role) {
- Integer introle = ROLES.get(role);
- return introle != null && (introle & roles) != 0;
- }
+ @Override
+ public boolean isUserInRole(String role) {
+ Integer introle = ROLES.get(role);
+ return introle != null && (introle & roles) != 0;
+ }
- @Override
- public boolean isSecure() {
- return secure;
- }
+ @Override
+ public boolean isSecure() {
+ return secure;
+ }
- @Override
- public String getAuthenticationScheme() {
- return null;
- }
+ @Override
+ public String getAuthenticationScheme() {
+ return null;
+ }
- @Override
- public String toString() {
+ @Override
+ public String toString() {
- return String.format("SecurityContextWrapper(%f) %s", ran, user);
- }
+ return String.format("SecurityContextWrapper(%f) %s", ran, user);
+ }
- public void setOrganizationsIds(Set<Integer> orgs) {
- this.organizationsIds = orgs;
- }
+ public void setOrganizationsIds(Set<Integer> orgs) {
+ this.organizationsIds = orgs;
+ }
- public Set<Integer> getOrganizationsIds() {
- return this.organizationsIds;
- }
+ public Set<Integer> getOrganizationsIds() {
+ return this.organizationsIds;
+ }
- private class UserPrincipal implements Principal {
+ public Set<Integer> getApplicationsIds() {
+ return applicationsIds;
+ }
- final String name;
+ public void setApplicationsIds(Set<Integer> applicationsIds) {
+ this.applicationsIds = applicationsIds;
+ }
- public UserPrincipal(String name) {
- this.name = name;
- }
+ private class UserPrincipal implements Principal {
- @Override
- public String getName() {
- return this.name;
- }
+ final String name;
- @Override
- public String toString() {
- return String.format("[%s]", name);
- }
+ public UserPrincipal(String name) {
+ this.name = name;
+ }
- }
+ @Override
+ public String getName() {
+ return this.name;
+ }
- public boolean isOrgAccesible(Integer orgid) {
- if (organizationsIds == null || orgid == null) {
- return false;
- }
- return organizationsIds.contains(orgid);
- }
+ @Override
+ public String toString() {
+ return String.format("[%s]", name);
+ }
+
+ }
+
+ public boolean isOrgAccesible(Integer orgid) {
+ if (organizationsIds == null || orgid == null) {
+ return false;
+ }
+ return organizationsIds.contains(orgid);
+ }
+
+ public boolean isAppAccesible(Integer appid) {
+ if (applicationsIds == null || appid == null) {
+ return false;
+ }
+ return applicationsIds.contains(appid);
+ }
+
}
--
Gitblit v1.3.2