Subversion Repositories XServices

Compare Revisions

Ignore whitespace Rev 198 → Rev 202

/xservices/trunk/src/main/java/net/brutex/xservices/security/DirectoryPermission.java
17,8 → 17,7
package net.brutex.xservices.security;
 
 
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.util.AntPathMatcher;
 
26,14 → 25,13
* @author Brian Rosenberger, bru(at)brutex.de
*
*/
@Slf4j
public class DirectoryPermission implements Permission {
 
private final Logger logger = LogManager.getLogger();
 
private final String path;
 
public DirectoryPermission(String antlikepath) {
logger.debug(String.format("Creating permission for path '%s'", antlikepath));
log.debug(String.format("Creating permission for path '{}'", antlikepath));
path = antlikepath;
}
43,13 → 41,13
/* is of same type */
if(! (p instanceof DirectoryPermission)) {
logger.debug(String.format("Testing if permission of type '%s' implies permission of type '%s'. Result was '%s'" , this.getClass(), p.getClass(), result));
log.debug(String.format("Testing if permission of type '{}' implies permission of type '{}'. Result was '{}'" , this.getClass(), p.getClass(), result));
return result;
}
/* comparing to non null directory */
if( ((DirectoryPermission)p).getPath() == null) {
logger.debug(String.format("Testing if DirectoryPermission '%s' implies permission to 'null'. Result was '%s'" , this.getPath(), result));
log.debug(String.format("Testing if DirectoryPermission '{}' implies permission to 'null'. Result was '{}'" , this.getPath(), result));
return result;
}
57,7 → 55,7
if( (new AntPathMatcher()).matches(path, ((DirectoryPermission)p).getPath()) ) {
result = true;
}
logger.debug(String.format("Testing if DirectoryPermission '%s' implies permission to '%s'. Result was '%s'" , this.getPath(), ((DirectoryPermission) p).getPath(), result));
log.debug(String.format("Testing if DirectoryPermission '{}' implies permission to '{}'. Result was '{}'" , this.getPath(), ((DirectoryPermission) p).getPath(), result));
return result;
}
/xservices/trunk/src/main/java/net/brutex/xservices/security/PermissionResolver.java
16,11 → 16,11
 
package net.brutex.xservices.security;
 
import lombok.extern.slf4j.Slf4j;
import net.brutex.xservices.ws.XmlService;
import net.brutex.xservices.ws.rs.FileInfo;
 
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
 
import org.apache.shiro.authz.Permission;
import org.apache.shiro.authz.permission.InvalidPermissionStringException;
 
28,17 → 28,17
* @author Brian Rosenberger, bru(at)brutex.de
*
*/
@Slf4j
public class PermissionResolver implements org.apache.shiro.authz.permission.PermissionResolver {
private final Logger logger = LogManager.getLogger();
 
private final String DELIMITER = "||";
 
@Override
public Permission resolvePermission(String permissionString) {
logger.debug(String.format("Trying to examine new Permission '%s'", permissionString));
log.debug(String.format("Trying to examine new Permission '{}'", permissionString));
if(! permissionString.contains(DELIMITER)) {
logger.error(String.format("Permission '%s' is missing permission class.", permissionString));
throw new InvalidPermissionStringException(String.format("Permission '%s' is missing permission class.", permissionString), permissionString);
log.error(String.format("Permission '{}' is missing permission class.", permissionString));
throw new InvalidPermissionStringException(String.format("Permission '{}' is missing permission class.", permissionString), permissionString);
}
int delimiterIndex = permissionString.indexOf(DELIMITER);
String value = permissionString.substring(0, delimiterIndex);
45,16 → 45,16
delimiterIndex = delimiterIndex + DELIMITER.length();
switch (value) {
case XmlService.SERVICE_NAME:
logger.debug(String.format("Found '%s' as permission class.", value));
log.debug(String.format("Found '{}' as permission class.", value));
return new XmlServicePermission(permissionString.substring( delimiterIndex ));
case FileInfo.SERVICE_NAME:
logger.debug(String.format("Found '%s' as permission class.", value));
log.debug(String.format("Found '{}' as permission class.", value));
return new DirectoryPermission(permissionString.substring( delimiterIndex ));
 
 
default:
logger.warn(String.format("Permission class '%s' is not defined.", value));
log.warn(String.format("Permission class '{}' is not defined.", value));
throw new InvalidPermissionStringException(String.format("Permission class '%s' is not defined.", value), permissionString);
}
}
/xservices/trunk/src/main/java/net/brutex/xservices/security/XServicesRealm.java
17,8 → 17,8
 
package net.brutex.xservices.security;
 
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
 
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.config.Ini;
import org.apache.shiro.realm.text.IniRealm;
import org.apache.shiro.util.Nameable;
38,10 → 38,9
/**
* The Class XServicesRealm.
*/
@Slf4j
public class XServicesRealm extends IniRealm implements Nameable {
 
/** The logger. */
private final Logger logger = LogManager.getLogger();
/** The name. */
private String name;
71,7 → 70,7
dir = dir.substring(0, dir.lastIndexOf("WEB-INF"));
this.setIni(Ini.fromResourcePath(dir+"/WEB-INF/shiro.ini"));
} catch (URISyntaxException e) {
logger.error(e.getMessage(), e);
log.error(e.getMessage(), e);
e.printStackTrace();
}
/xservices/trunk/src/main/java/net/brutex/xservices/security/XmlServicePermission.java
16,8 → 16,7
 
package net.brutex.xservices.security;
 
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.Permission;
 
/**
24,13 → 23,13
* @author Brian Rosenberger, bru(at)brutex.de
*
*/
@Slf4j
public class XmlServicePermission implements Permission {
 
private final Logger logger = LogManager.getLogger();
private final String permissionString;
 
public XmlServicePermission(String permissionString) {
logger.debug(String.format("Creating permission for '%s'", permissionString));
log.debug(String.format("Creating permission for '{}'", permissionString));
this.permissionString = permissionString;
}
40,13 → 39,13
/* is of same type */
if(! (p instanceof XmlServicePermission)) {
logger.debug(String.format("Testing if permission of type '%s' implies permission of type '%s'. Result was '%s'" , this.getClass(), p.getClass(), result));
log.debug(String.format("Testing if permission of type '{}' implies permission of type '{}'. Result was '{}'" , this.getClass(), p.getClass(), result));
return result;
}
/* comparing to non null directory */
if( ((XmlServicePermission)p).getPermissionString() == null) {
logger.debug(String.format("Testing if DirectoryPermission '%s' implies permission to 'null'. Result was '%s'" , permissionString, result));
log.debug(String.format("Testing if DirectoryPermission '{}' implies permission to 'null'. Result was '{}'" , permissionString, result));
return result;
}