You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/03/25 15:38:00 UTC

git commit: implemented MARMOTTA-173: security profiles - a security profile can depend on/build upon another profile by including/importing the rules from there. Just add security.profile.base = ...

Updated Branches:
  refs/heads/master 5a6eb0380 -> 3eb746d19


implemented MARMOTTA-173: security profiles
  - a security profile can depend on/build upon another profile by
    including/importing the rules from there.
    Just add security.profile.base = ...


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/3eb746d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/3eb746d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/3eb746d1

Branch: refs/heads/master
Commit: 3eb746d1949d46ebb63447e4a3d7eec857f5347d
Parents: 5a6eb03
Author: Jakob Frank <ja...@apache.org>
Authored: Mon Mar 25 15:32:02 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Mon Mar 25 15:37:21 2013 +0100

----------------------------------------------------------------------
 .../security/services/SecurityServiceImpl.java     |   71 ++++++++++-----
 1 files changed, 49 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3eb746d1/platform/marmotta-security/src/main/java/org/apache/marmotta/platform/security/services/SecurityServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/src/main/java/org/apache/marmotta/platform/security/services/SecurityServiceImpl.java b/platform/marmotta-security/src/main/java/org/apache/marmotta/platform/security/services/SecurityServiceImpl.java
index 4bc40c8..e893995 100644
--- a/platform/marmotta-security/src/main/java/org/apache/marmotta/platform/security/services/SecurityServiceImpl.java
+++ b/platform/marmotta-security/src/main/java/org/apache/marmotta/platform/security/services/SecurityServiceImpl.java
@@ -44,6 +44,7 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -281,38 +282,64 @@ public class SecurityServiceImpl implements SecurityService {
     public void loadSecurityProfile(String profile) {
         profileLoading = true;
 
-        URL securityConfigUrl = this.getClass().getClassLoader().getResource("security-profile."+profile+".properties");
+        LinkedHashSet<String> profiles = new LinkedHashSet<String>(); 
+        Configuration securityConfig = loadProfile(profile, profiles);
+        if (securityConfig != null) {
+        	// remove all configuration keys that define permissions or restrictions
+        	for(String type : Lists.newArrayList("permission","restriction")) {
+        		// determine the names of constraints that are configured
+        		for(String key : configurationService.listConfigurationKeys("security."+type)) {
+        			configurationService.removeConfiguration(key);
+        		}
+        	}
 
-        if(securityConfigUrl != null) {
-            Configuration securityConfig = null;
-            try {
-                securityConfig = new PropertiesConfiguration(securityConfigUrl);
+        	for(Iterator<String> keys = securityConfig.getKeys() ; keys.hasNext(); ) {
+        		String key = keys.next();
 
-                // remove all configuration keys that define permissions or restrictions
-                for(String type : Lists.newArrayList("permission","restriction")) {
-                    // determine the names of constraints that are configured
-                    for(String key : configurationService.listConfigurationKeys("security."+type)) {
-                        configurationService.removeConfiguration(key);
-                    }
-                }
+        		configurationService.setConfigurationWithoutEvent(key, securityConfig.getProperty(key));
+        	}
 
-                for(Iterator<String> keys = securityConfig.getKeys() ; keys.hasNext(); ) {
-                    String key = keys.next();
+        	configurationService.setConfigurationWithoutEvent("security.configured", true);
+        }
 
-                    configurationService.setConfigurationWithoutEvent(key, securityConfig.getProperty(key));
-                }
+        profileLoading = false;
 
-                configurationService.setConfigurationWithoutEvent("security.configured", true);
+        initSecurityConstraints();
+    }
+
+	private Configuration loadProfile(String profile, LinkedHashSet<String> profiles) {
+		URL securityConfigUrl = this.getClass().getClassLoader().getResource("security-profile."+profile+".properties");
+        if(securityConfigUrl != null) {
+            try {
+            	Configuration securityConfig = null;
+				securityConfig = new PropertiesConfiguration(securityConfigUrl);
+
+				if (securityConfig.containsKey("security.profile.base")) {
+					final String baseP = securityConfig.getString("security.profile.base");
+					if (profiles.contains(baseP)) {
+						log.warn("Cycle in security configuration detected: {} -> {}", profiles, baseP);
+						return securityConfig;
+					} else {
+						profiles.add(baseP);
+						final Configuration baseProfile = loadProfile(baseP, profiles);
+						
+						for(Iterator<String> keys = securityConfig.getKeys() ; keys.hasNext(); ) {
+							String key = keys.next();
+							
+							baseProfile.setProperty(key, securityConfig.getProperty(key));
+						}
+						return baseProfile;
+					}
+				} else {
+					return securityConfig;
+				}
             } catch (ConfigurationException e) {
                 log.error("error parsing security-profile.{}.properties file at {}: {}",new Object[] {profile,securityConfigUrl,e.getMessage()});
             }
 
         }
-
-        profileLoading = false;
-
-        initSecurityConstraints();
-    }
+		return null;
+	}
 
     @Override
     public List<SecurityConstraint> listSecurityConstraints() {