litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2254 Remove compiler warnings

Browse source
This commit is contained in:
j2blake 2011-04-06 19:26:07 +00:00
parent b0db5dd122
commit 625f654ae4
2 changed files with 97 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/JenaNetidPolicy.java
View file

@ -177,7 +177,8 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
} }
/* *********************** Methods ************************************ */ /* *********************** Methods ************************************ */
public PolicyDecision isAuthorized(IdentifierBundle whoToAuth, @Override
public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
RequestedAction whatToAuth) { RequestedAction whatToAuth) {
BasicPolicyDecision pd = new BasicPolicyDecision(Authorization.INCONCLUSIVE,"not yet set"); BasicPolicyDecision pd = new BasicPolicyDecision(Authorization.INCONCLUSIVE,"not yet set");
if( whoToAuth == null ) if( whoToAuth == null )
@ -194,7 +195,8 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
} }
/* ************************* visit methods ************************** */ /* ************************* visit methods ************************** */
public PolicyDecision visit(IdentifierBundle ids, AddResource action) { @Override
public PolicyDecision visit(IdentifierBundle ids, AddResource action) {
log.debug("doing AddResource"); log.debug("doing AddResource");
List<String> queryStrs = actionToQueryStr.get(action.getClass().getName()); List<String> queryStrs = actionToQueryStr.get(action.getClass().getName());
@ -209,9 +211,9 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
return doQueries(queryStrs,parameters,action); return doQueries(queryStrs,parameters,action);
} }
public PolicyDecision visit(IdentifierBundle ids, DropResource action) { @Override
public PolicyDecision visit(IdentifierBundle ids, DropResource action) {
log.debug("doing DropResource"); log.debug("doing DropResource");
BasicPolicyDecision pd = new BasicPolicyDecision(Authorization.INCONCLUSIVE, "");
List<String> queryStrs = actionToQueryStr.get(action.getClass().getName()); List<String> queryStrs = actionToQueryStr.get(action.getClass().getName());
if( queryStrs == null || queryStrs.size() ==0 ) if( queryStrs == null || queryStrs.size() ==0 )
@ -225,7 +227,8 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
return doQueries(queryStrs,parameters,action); return doQueries(queryStrs,parameters,action);
} }
public PolicyDecision visit(IdentifierBundle ids, AddObjectPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, AddObjectPropStmt action) {
log.debug("doing AddObjectPropStmt in visit()"); log.debug("doing AddObjectPropStmt in visit()");
List<String> queryStrs = actionToQueryStr.get(action.getClass().getName()); List<String> queryStrs = actionToQueryStr.get(action.getClass().getName());
@ -242,7 +245,8 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
return doQueries(queryStrs,parameters,action); return doQueries(queryStrs,parameters,action);
} }
public PolicyDecision visit(IdentifierBundle ids, DropObjectPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, DropObjectPropStmt action) {
log.debug("doing DropObjectPropStmt"); log.debug("doing DropObjectPropStmt");
List<String> queryStrs = actionToQueryStr.get(action.getClass().getName()); List<String> queryStrs = actionToQueryStr.get(action.getClass().getName());
@ -259,7 +263,8 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
return doQueries(queryStrs,parameters,action); return doQueries(queryStrs,parameters,action);
} }
public PolicyDecision visit(IdentifierBundle ids, AddDataPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, AddDataPropStmt action) {
log.debug("doing AddDataPropStmt"); log.debug("doing AddDataPropStmt");
List<String> queryStrs = actionToQueryStr.get(action.getClass().getName()); List<String> queryStrs = actionToQueryStr.get(action.getClass().getName());
@ -275,7 +280,8 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
return doQueries(queryStrs,parameters,action); return doQueries(queryStrs,parameters,action);
} }
public PolicyDecision visit(IdentifierBundle ids, DropDataPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, DropDataPropStmt action) {
log.debug("doing DropDataPropStmt"); log.debug("doing DropDataPropStmt");
List<String> queryStrs = actionToQueryStr.get(action.getClass().getName()); List<String> queryStrs = actionToQueryStr.get(action.getClass().getName());
@ -330,18 +336,6 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
return q; return q;
} }
private QuerySolutionMap idsToSolutionMap(IdentifierBundle id){
// right now we can only turn netids into QSMs
String netid = getNetid(id);
if( netid == null || netid.length() == 0)
return null;
QuerySolutionMap qsm = new QuerySolutionMap();
Model m = ModelFactory.createDefaultModel();
qsm.add("netid",m.createLiteral(netid));
return qsm;
}
private String getNetid(IdentifierBundle whoToAuth) { private String getNetid(IdentifierBundle whoToAuth) {
String netidStr = null; String netidStr = null;
for(Identifier id : whoToAuth){ for(Identifier id : whoToAuth){
@ -364,7 +358,7 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
* @author bdc34 * @author bdc34
* *
*/ */
public class ContextSetup implements ServletContextListener { public static class ContextSetup implements ServletContextListener {
@Override @Override
public void contextInitialized(ServletContextEvent sce) { public void contextInitialized(ServletContextEvent sce) {
try{ try{
@ -433,64 +427,81 @@ public class JenaNetidPolicy extends DefaultInconclusivePolicy implements Visiti
"PREFIX vivo: <http://vivo.library.cornell.edu/ns/0.1#>\n"+ "PREFIX vivo: <http://vivo.library.cornell.edu/ns/0.1#>\n"+
"PREFIX vitro: <"+ VitroVocabulary.vitroURI+">\n"; "PREFIX vitro: <"+ VitroVocabulary.vitroURI+">\n";
public PolicyDecision visit(IdentifierBundle ids, CreateOwlClass action) { @Override
public PolicyDecision visit(IdentifierBundle ids, CreateOwlClass action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, RemoveOwlClass action) { @Override
public PolicyDecision visit(IdentifierBundle ids, RemoveOwlClass action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, DefineDataProperty action) { @Override
public PolicyDecision visit(IdentifierBundle ids, DefineDataProperty action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, DefineObjectProperty action){ @Override
public PolicyDecision visit(IdentifierBundle ids, DefineObjectProperty action){
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, AddNewUser action) { @Override
public PolicyDecision visit(IdentifierBundle ids, AddNewUser action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, RemoveUser action) { @Override
public PolicyDecision visit(IdentifierBundle ids, RemoveUser action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, LoadOntology action) { @Override
public PolicyDecision visit(IdentifierBundle ids, LoadOntology action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, RebuildTextIndex action) { @Override
public PolicyDecision visit(IdentifierBundle ids, RebuildTextIndex action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, UpdateTextIndex action) { @Override
public PolicyDecision visit(IdentifierBundle ids, UpdateTextIndex action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, UploadFile action) { @Override
public PolicyDecision visit(IdentifierBundle ids, UploadFile action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, ServerStatus action) { @Override
public PolicyDecision visit(IdentifierBundle ids, ServerStatus action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, EditDataPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, EditDataPropStmt action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, EditObjPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, EditObjPropStmt action) {
return UNAUTH; return UNAUTH;
} }
private final PolicyDecision UNAUTH = new PolicyDecision(){ private final PolicyDecision UNAUTH = new PolicyDecision(){
public Authorization getAuthorized() {return Authorization.UNAUTHORIZED; } @Override
public String getMessage() { public Authorization getAuthorized() {return Authorization.UNAUTHORIZED; }
@Override
public String getMessage() {
return "JenaNetidPolicy doesn't authorize admin or onto editing actions"; return "JenaNetidPolicy doesn't authorize admin or onto editing actions";
} }
public String getDebuggingInfo() { return ""; } @Override
public String getStackTrace() { return ""; } public String getDebuggingInfo() { return ""; }
@Override
public String getStackTrace() { return ""; }
}; };
} }

72
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/SparqlPolicy.java
View file

@ -105,7 +105,8 @@ public class SparqlPolicy extends DefaultInconclusivePolicy implements VisitingP
} }
/* *********************** Methods ************************************ */ /* *********************** Methods ************************************ */
public PolicyDecision isAuthorized(IdentifierBundle whoToAuth, @Override
public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
RequestedAction whatToAuth) { RequestedAction whatToAuth) {
if( whoToAuth == null ) if( whoToAuth == null )
return new BasicPolicyDecision(Authorization.INCONCLUSIVE,"whoToAuth was null"); return new BasicPolicyDecision(Authorization.INCONCLUSIVE,"whoToAuth was null");
@ -161,85 +162,108 @@ public class SparqlPolicy extends DefaultInconclusivePolicy implements VisitingP
/* ***************** Visit methods ********************** */ /* ***************** Visit methods ********************** */
private final String pkg = "edu.cornell.mannlib.vitro.webapp.auth.requestedAction."; private final String pkg = "edu.cornell.mannlib.vitro.webapp.auth.requestedAction.";
public PolicyDecision visit(IdentifierBundle ids, AddObjectPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, AddObjectPropStmt action) {
return doQueries(actionToQueryStr.get(pkg +"AddObjectPropStmt"),ids,action); return doQueries(actionToQueryStr.get(pkg +"AddObjectPropStmt"),ids,action);
} }
public PolicyDecision visit(IdentifierBundle ids, DropResource action) { @Override
public PolicyDecision visit(IdentifierBundle ids, DropResource action) {
return doQueries(actionToQueryStr.get(pkg +"DropResource"),ids,action); return doQueries(actionToQueryStr.get(pkg +"DropResource"),ids,action);
} }
public PolicyDecision visit(IdentifierBundle ids, DropDataPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, DropDataPropStmt action) {
return doQueries(actionToQueryStr.get(pkg +"DropDataPropStmt"),ids,action); return doQueries(actionToQueryStr.get(pkg +"DropDataPropStmt"),ids,action);
} }
public PolicyDecision visit(IdentifierBundle ids, DropObjectPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, DropObjectPropStmt action) {
return doQueries(actionToQueryStr.get(pkg +"DropObjectPropStmt"),ids,action); return doQueries(actionToQueryStr.get(pkg +"DropObjectPropStmt"),ids,action);
} }
public PolicyDecision visit(IdentifierBundle ids, AddResource action) { @Override
public PolicyDecision visit(IdentifierBundle ids, AddResource action) {
return doQueries(actionToQueryStr.get(pkg +"AddResource"),ids,action); return doQueries(actionToQueryStr.get(pkg +"AddResource"),ids,action);
} }
public PolicyDecision visit(IdentifierBundle ids, AddDataPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, AddDataPropStmt action) {
return doQueries(actionToQueryStr.get(pkg +"AddDataPropStmt"),ids,action); return doQueries(actionToQueryStr.get(pkg +"AddDataPropStmt"),ids,action);
} }
public PolicyDecision visit(IdentifierBundle ids, UploadFile action) { @Override
public PolicyDecision visit(IdentifierBundle ids, UploadFile action) {
return doQueries(actionToQueryStr.get(pkg +"UploadFile"),ids,action); return doQueries(actionToQueryStr.get(pkg +"UploadFile"),ids,action);
} }
public PolicyDecision visit(IdentifierBundle ids, EditDataPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, EditDataPropStmt action) {
return doQueries(actionToQueryStr.get(pkg +"EditDataPropStmt"),ids,action); return doQueries(actionToQueryStr.get(pkg +"EditDataPropStmt"),ids,action);
} }
public PolicyDecision visit(IdentifierBundle ids, EditObjPropStmt action) { @Override
public PolicyDecision visit(IdentifierBundle ids, EditObjPropStmt action) {
return doQueries(actionToQueryStr.get(pkg +"EditObjPropStmt"),ids,action); return doQueries(actionToQueryStr.get(pkg +"EditObjPropStmt"),ids,action);
} }
/* **** Currently the following actions are unauthorized by this policy **** */ /* **** Currently the following actions are unauthorized by this policy **** */
public PolicyDecision visit(IdentifierBundle ids, CreateOwlClass action) { @Override
public PolicyDecision visit(IdentifierBundle ids, CreateOwlClass action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, RemoveOwlClass action) { @Override
public PolicyDecision visit(IdentifierBundle ids, RemoveOwlClass action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, DefineDataProperty action) { @Override
public PolicyDecision visit(IdentifierBundle ids, DefineDataProperty action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, @Override
public PolicyDecision visit(IdentifierBundle ids,
DefineObjectProperty action) { DefineObjectProperty action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, ServerStatus action) { @Override
public PolicyDecision visit(IdentifierBundle ids, ServerStatus action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, AddNewUser action) { @Override
public PolicyDecision visit(IdentifierBundle ids, AddNewUser action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, RemoveUser action) { @Override
public PolicyDecision visit(IdentifierBundle ids, RemoveUser action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, LoadOntology action) { @Override
public PolicyDecision visit(IdentifierBundle ids, LoadOntology action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, RebuildTextIndex action) { @Override
public PolicyDecision visit(IdentifierBundle ids, RebuildTextIndex action) {
return UNAUTH; return UNAUTH;
} }
public PolicyDecision visit(IdentifierBundle ids, UpdateTextIndex action) { @Override
public PolicyDecision visit(IdentifierBundle ids, UpdateTextIndex action) {
return UNAUTH; return UNAUTH;
} }
private static final Log log = LogFactory.getLog(SparqlPolicy.class.getName()); private static final Log log = LogFactory.getLog(SparqlPolicy.class.getName());
private final PolicyDecision UNAUTH = new PolicyDecision(){ private final PolicyDecision UNAUTH = new PolicyDecision(){
public Authorization getAuthorized() {return Authorization.UNAUTHORIZED; } @Override
public String getMessage() { public Authorization getAuthorized() {return Authorization.UNAUTHORIZED; }
@Override
public String getMessage() {
return name + " SparqlPolicy doesn't authorize admin or onto editing actions"; return name + " SparqlPolicy doesn't authorize admin or onto editing actions";
} }
public String getDebuggingInfo() { return ""; } @Override
public String getStackTrace() { return ""; } public String getDebuggingInfo() { return ""; }
@Override
public String getStackTrace() { return ""; }
}; };
/* /*