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

VIVO-581 Restrict access, and don’t give out the DB password.

Browse source
This commit is contained in:
j2blake 2013-12-10 14:59:30 -05:00
parent 0c79185254
commit d4443fe601
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
webapp/rdf/auth/everytime/permission_config.n3
View file

@ -20,6 +20,7 @@ auth:ADMIN
auth:hasPermission simplePermission:ManageUserAccounts ; auth:hasPermission simplePermission:ManageUserAccounts ;
auth:hasPermission simplePermission:RebuildVClassGroupCache ; auth:hasPermission simplePermission:RebuildVClassGroupCache ;
auth:hasPermission simplePermission:RefreshVisualizationCache ; auth:hasPermission simplePermission:RefreshVisualizationCache ;
auth:hasPermission simplePermission:SeeConfiguration ;
auth:hasPermission simplePermission:SeeStartupStatus ; auth:hasPermission simplePermission:SeeStartupStatus ;
auth:hasPermission simplePermission:UseAdvancedDataToolsPages ; auth:hasPermission simplePermission:UseAdvancedDataToolsPages ;
auth:hasPermission simplePermission:UseMiscellaneousAdminPages ; auth:hasPermission simplePermission:UseMiscellaneousAdminPages ;

2
webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/SimplePermission.java
View file

@ -64,6 +64,8 @@ public class SimplePermission extends Permission {
NAMESPACE + "RebuildVClassGroupCache"); NAMESPACE + "RebuildVClassGroupCache");
public static final SimplePermission REFRESH_VISUALIZATION_CACHE = new SimplePermission( public static final SimplePermission REFRESH_VISUALIZATION_CACHE = new SimplePermission(
NAMESPACE + "RefreshVisualizationCache"); NAMESPACE + "RefreshVisualizationCache");
public static final SimplePermission SEE_CONFIGURATION = new SimplePermission(
NAMESPACE + "SeeConfiguration");
public static final SimplePermission SEE_INDVIDUAL_EDITING_PANEL = new SimplePermission( public static final SimplePermission SEE_INDVIDUAL_EDITING_PANEL = new SimplePermission(
NAMESPACE + "SeeIndividualEditingPanel"); NAMESPACE + "SeeIndividualEditingPanel");
public static final SimplePermission SEE_REVISION_INFO = new SimplePermission( public static final SimplePermission SEE_REVISION_INFO = new SimplePermission(

13
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowConfiguration.java
View file

@ -8,6 +8,7 @@ import java.util.Properties;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions; import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties; import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@ -21,7 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem
public class ShowConfiguration extends FreemarkerHttpServlet { public class ShowConfiguration extends FreemarkerHttpServlet {
@Override @Override
protected Actions requiredActions(VitroRequest vreq) { protected Actions requiredActions(VitroRequest vreq) {
return Actions.AUTHORIZED; return SimplePermission.SEE_CONFIGURATION.ACTIONS;
} }
@Override @Override
@ -34,8 +35,14 @@ public class ShowConfiguration extends FreemarkerHttpServlet {
private SortedMap<String, String> getConfigurationProperties( private SortedMap<String, String> getConfigurationProperties(
VitroRequest vreq) { VitroRequest vreq) {
return new TreeMap<>(ConfigurationProperties.getBean(vreq) ConfigurationProperties props = ConfigurationProperties.getBean(vreq);
.getPropertyMap()); TreeMap<String, String> map = new TreeMap<>(props.getPropertyMap());
for (String key : map.keySet()) {
if (key.toLowerCase().endsWith("password")) {
map.put(key, "********");
}
}
return map;
} }
private SortedMap<String, String> getSystemProperties() { private SortedMap<String, String> getSystemProperties() {