You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by js...@apache.org on 2016/11/10 12:35:00 UTC
svn commit: r1769103 - in /sling/trunk:
bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/
bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/
contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org...
Author: jsedding
Date: Thu Nov 10 12:35:00 2016
New Revision: 1769103
URL: http://svn.apache.org/viewvc?rev=1769103&view=rev
Log:
SLING-5135 - Whitelist legit usages of loginAdministrative and administrative ResourceResolver
- rename configuration properties
Modified:
sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config
sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
sling/trunk/launchpad/testing/src/main/provisioning/model.txt
Modified: sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java?rev=1769103&r1=1769102&r2=1769103&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java (original)
+++ sling/trunk/bundles/jcr/base/src/main/java/org/apache/sling/jcr/base/internal/LoginAdminWhitelistImpl.java Thu Nov 10 12:35:00 2016
@@ -70,20 +70,20 @@ public class LoginAdminWhitelistImpl imp
description="Regular expression for bundle symbolic names for which loginAdministrative() is allowed. "
+ " NOT recommended for production use, but useful for testing with generated bundles.",
value = "")
- public static final String PROP_WHITELIST_REGEXP = "whitelist.regexp";
+ public static final String PROP_WHITELIST_REGEXP = "whitelist.bundles.regexp";
private Pattern whitelistRegexp;
@Property(
label="Default whitelisted BSNs",
description="Default list of bundle symbolic names for which loginAdministrative() is allowed",
value = {})
- public static final String PROP_DEFAULT_WHITELISTED_BSN = "default.whitelisted.bundle.symbolic.names";
+ public static final String PROP_DEFAULT_WHITELISTED_BSN = "whitelist.bundles.default";
@Property(
label="Additional whitelisted BSNs",
description="Additional list of bundle symbolic names for which loginAdministrative() is allowed",
value = {})
- public static final String PROP_ADDITIONAL_WHITELISTED_BSN = "additional.whitelisted.bundle.symbolic.names";
+ public static final String PROP_ADDITIONAL_WHITELISTED_BSN = "whitelist.bundles.additional";
private Set<String> whitelistedBsn;
Modified: sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1769103&r1=1769102&r2=1769103&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java (original)
+++ sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java Thu Nov 10 12:35:00 2016
@@ -203,7 +203,7 @@ public abstract class OakServerTestSuppo
protected Option getWhitelistRegexpOption() {
return newConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl")
- .put("whitelist.regexp", "PAXEXAM-PROBE-.*")
+ .put("whitelist.bundles.regexp", "PAXEXAM-PROBE-.*")
.asOption();
}
}
Modified: sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java?rev=1769103&r1=1769102&r2=1769103&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java (original)
+++ sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/test/java/org/apache/sling/scripting/thymeleaf/it/tests/ThymeleafTestSupport.java Thu Nov 10 12:35:00 2016
@@ -125,7 +125,7 @@ public abstract class ThymeleafTestSuppo
.put("user.mapping", "org.apache.sling.scripting.thymeleaf=sling-scripting")
.asOption(),
newConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl")
- .put("whitelist.regexp", "org.apache.sling.*")
+ .put("whitelist.bundles.regexp", "org.apache.sling.*")
.asOption()
);
}
Modified: sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config
URL: http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config?rev=1769103&r1=1769102&r2=1769103&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-configs/src/main/resources/org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl.config Thu Nov 10 12:35:00 2016
@@ -1,2 +1,2 @@
-whitelist.regexp="."
+whitelist.bundles.regexp="."
whitelist.bypass=B"true"
Modified: sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt?rev=1769103&r1=1769102&r2=1769103&view=diff
==============================================================================
--- sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing-war/src/main/provisioning/model.txt Thu Nov 10 12:35:00 2016
@@ -32,7 +32,7 @@
servletresolver.cacheSize=I"0"
org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl
- whitelist.regexp="org.apache.sling.(launchpad|junit).*"
+ whitelist.bundles.regexp="org.apache.sling.(launchpad|junit).*"
# Test repository initialization from provisioning model
# No need to test all repoinit statements, this is done
Modified: sling/trunk/launchpad/testing/src/main/provisioning/model.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/main/provisioning/model.txt?rev=1769103&r1=1769102&r2=1769103&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/src/main/provisioning/model.txt (original)
+++ sling/trunk/launchpad/testing/src/main/provisioning/model.txt Thu Nov 10 12:35:00 2016
@@ -33,7 +33,7 @@
servletresolver.cacheSize=I"0"
org.apache.sling.jcr.base.internal.LoginAdminWhitelistImpl
- whitelist.regexp="org.apache.sling.(launchpad|junit).*"
+ whitelist.bundles.regexp="org.apache.sling.(launchpad|junit).*"
[settings]
org.apache.sling.commons.log.julenabled=true