nishan
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored permission authorizer module

Browse Source
revert-70aa11f8
milanperera 9 years ago
parent 68befaae01
commit ed937467cd
8 changed files with 99 additions and 129 deletions
Show Stats Download Patch File Download Diff File

3
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/Permission.java
Unescape View File

@ -21,6 +21,9 @@ package org.wso2.carbon.device.mgt.core.config.permission;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
/**
* This class represents the information related to permission.
*/
@XmlRootElement (name = "Permission")
public class Permission {

3
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/PermissionConfiguration.java
Unescape View File

@ -22,6 +22,9 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.List;
/**
* This class represents the information related to permission configuration.
*/
@XmlRootElement (name = "PermissionConfiguration")
public class PermissionConfiguration {

51
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/PermissionManager.java
Unescape View File

@ -33,16 +33,17 @@ import java.util.StringTokenizer;
public class PermissionManager {
private static PermissionManager permissionManager;
private static PermissionHolder rootNode;
private static PermissionTree permissionTree; // holds the permissions at runtime.
private PermissionManager(){};
private PermissionManager() {
}
public static PermissionManager getInstance() {
if (permissionManager == null) {
synchronized (PermissionManager.class) {
if (permissionManager == null) {
permissionManager = new PermissionManager();
rootNode = new PermissionHolder("/"); // initializing the root node.
permissionTree = new PermissionTree();
}
}
}
@ -50,14 +51,7 @@ public class PermissionManager {
}
public boolean addPermission(Permission permission) throws DeviceManagementException {
StringTokenizer st = new StringTokenizer(permission.getUrl(), "/");
PermissionHolder tempRoot = rootNode;
PermissionHolder tempChild;
while(st.hasMoreTokens()) {
tempChild = new PermissionHolder(st.nextToken());
tempRoot = addPermissionNode(tempRoot, tempChild);
}
tempRoot.addPermission(permission.getMethod(), permission); //setting permission to the vertex
permissionTree.addPermission(permission); // adding a permission to the tree
try {
return PermissionUtils.putPermission(permission);
} catch (DeviceManagementException e) {
@ -81,7 +75,7 @@ public class PermissionManager {
Unmarshaller unmarshaller = cdmContext.createUnmarshaller();
PermissionConfiguration permissionConfiguration = (PermissionConfiguration)
unmarshaller.unmarshal(permissionStream);
if((permissionConfiguration != null) && (permissionConfiguration.getPermissions() != null)){
if (permissionConfiguration != null && permissionConfiguration.getPermissions() != null) {
this.addPermissions(permissionConfiguration.getPermissions());
}
}
@ -90,38 +84,7 @@ public class PermissionManager {
}
}
private PermissionHolder addPermissionNode(PermissionHolder parent, PermissionHolder child) {
PermissionHolder existChild = parent.getChild(child.getPathName());
if (existChild == null) {
parent.addChild(child);
return child;
}
return existChild;
}
public Permission getPermission(String url, String httpMethod) {
StringTokenizer st = new StringTokenizer(url, "/");
PermissionHolder tempRoot = rootNode;
PermissionHolder previousRoot;
while (st.hasMoreTokens()) {
String currentToken = st.nextToken();
previousRoot = tempRoot;
tempRoot = tempRoot.getChild(currentToken);
if (tempRoot == null) {
tempRoot = previousRoot;
int leftTokens = st.countTokens();
for (int i = 0; i <= leftTokens; i++) {
if (tempRoot == null) {
return null;
}
tempRoot = tempRoot.getChild("*");
}
break;
}
}
if (tempRoot == null) {
return null;
}
return tempRoot.getPermission(httpMethod);
return permissionTree.getPermission(url, httpMethod);
}
}

22
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/PermissionHolder.java → components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/PermissionNode.java
Unescape View File

@ -25,15 +25,15 @@ import java.util.List;
import java.util.Map;
/**
* This class represents the node of a permission graph.
* This class represents the node of a permission tree.
*/
public class PermissionHolder {
public class PermissionNode {
String pathName;
Map<String, Permission> permissions = new HashMap<String, Permission>();
List<PermissionHolder> children = new ArrayList<PermissionHolder>();
private String pathName;
private Map<String, Permission> permissions = new HashMap<String, Permission>();
private List<PermissionNode> children = new ArrayList<PermissionNode>();
public PermissionHolder(String pathName) {
public PermissionNode(String pathName) {
this.pathName = pathName;
}
@ -45,13 +45,13 @@ public class PermissionHolder {
this.pathName = pathName;
}
public List<PermissionHolder> getChildren() {
public List<PermissionNode> getChildren() {
return children;
}
public PermissionHolder getChild(String pathName) {
PermissionHolder child = null;
for (PermissionHolder node : children) {
public PermissionNode getChild(String pathName) {
PermissionNode child = null;
for (PermissionNode node : children) {
if (node.getPathName().equals(pathName)) {
return node;
}
@ -59,7 +59,7 @@ public class PermissionHolder {
return child;
}
public void addChild(PermissionHolder node) {
public void addChild(PermissionNode node) {
children.add(node);
}

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/permission/PermissionUtils.java
Unescape View File

@ -84,7 +84,7 @@ public class PermissionUtils {
return status;
}
public static boolean checkPermissionExistance(Permission permission)
public static boolean checkPermissionExistence(Permission permission)
throws DeviceManagementException,
org.wso2.carbon.registry.core.exceptions.RegistryException {
return PermissionUtils.getGovernanceRegistry().resourceExists(permission.getPath());

6
components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authorizer/PermissionAuthorizerValve.java → components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authorizer/PermissionAuthorizationValve.java
Unescape View File

@ -29,9 +29,9 @@ import org.wso2.carbon.webapp.authenticator.framework.authenticator.WebappAuthen
import javax.servlet.http.HttpServletResponse;
public class PermissionAuthorizerValve extends CarbonTomcatValve {
public class PermissionAuthorizationValve extends CarbonTomcatValve {
private static final Log log = LogFactory.getLog(PermissionAuthorizerValve.class);
private static final Log log = LogFactory.getLog(PermissionAuthorizationValve.class);
private static final String AUTHORIZATION_ENABLED = "authorization-enabled";
@ -44,7 +44,7 @@ public class PermissionAuthorizerValve extends CarbonTomcatValve {
this.processResponse(request, response, compositeValve, WebappAuthenticator.Status.CONTINUE);
return;
}
// check whether the permission checking function is enabled
// check whether the permission checking function is enabled in web.xml
boolean isEnabled = new Boolean(permissionStatus);
if (!isEnabled) {
this.processResponse(request, response, compositeValve, WebappAuthenticator.Status.CONTINUE);

4
components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authorizer/PermissionAuthorizer.java
Unescape View File

@ -39,7 +39,6 @@ public class PermissionAuthorizer {
public WebappAuthenticator.Status authorize(Request request, Response response) {
// contextOperation is used to get defined operation type from the web.xml
String requestUri = request.getRequestURI();
String requestMethod = request.getMethod();
@ -61,7 +60,10 @@ public class PermissionAuthorizer {
String permissionString = requestPermission.getPath();
// This is added temporarily until authentication works.
// TODO remove below line.
String username = "admin";
// TODO uncomment this once the authentication works.
//String username = CarbonContext.getThreadLocalCarbonContext().getUsername();
boolean isUserAuthorized;
try {

5
components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/internal/WebappAuthenticatorFrameworkServiceComponent.java
Unescape View File

@ -23,7 +23,6 @@ import org.apache.commons.logging.LogFactory;
import org.osgi.service.component.ComponentContext;
import org.wso2.carbon.certificate.mgt.core.service.CertificateManagementService;
import org.wso2.carbon.device.mgt.core.scep.SCEPManager;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
import org.wso2.carbon.tomcat.ext.valves.CarbonTomcatValve;
import org.wso2.carbon.tomcat.ext.valves.TomcatValveContainer;
import org.wso2.carbon.user.core.service.RealmService;
@ -31,7 +30,7 @@ import org.wso2.carbon.webapp.authenticator.framework.DataHolder;
import org.wso2.carbon.webapp.authenticator.framework.WebappAuthenticationHandler;
import org.wso2.carbon.webapp.authenticator.framework.authenticator.WebappAuthenticator;
import org.wso2.carbon.webapp.authenticator.framework.WebappAuthenticatorRepository;
import org.wso2.carbon.webapp.authenticator.framework.authorizer.PermissionAuthorizerValve;
import org.wso2.carbon.webapp.authenticator.framework.authorizer.PermissionAuthorizationValve;
import org.wso2.carbon.webapp.authenticator.framework.config.AuthenticatorConfig;
import org.wso2.carbon.webapp.authenticator.framework.config.WebappAuthenticatorConfig;
@ -87,7 +86,7 @@ public class WebappAuthenticatorFrameworkServiceComponent {
List<CarbonTomcatValve> valves = new ArrayList<CarbonTomcatValve>();
valves.add(new WebappAuthenticationHandler());
valves.add(new PermissionAuthorizerValve());
valves.add(new PermissionAuthorizationValve());
TomcatValveContainer.addValves(valves);
if (log.isDebugEnabled()) {

Write Preview
Loading…
Cancel
Save