You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/11/28 14:19:27 UTC

[1/4] brooklyn-server git commit: if AnyoneSecurityProvider is set explicitly then switch it out for the Nop provider

Repository: brooklyn-server
Updated Branches:
  refs/heads/master cea47b03b -> ca0335916


if AnyoneSecurityProvider is set explicitly then switch it out for the Nop provider

we get a 401 otherwise (not sure why Anyone doesn't work in this context but the code previously works this way, so just improving the logic really)


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/18b49c35
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/18b49c35
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/18b49c35

Branch: refs/heads/master
Commit: 18b49c355cc513b6ce937bc94f73db6bb8a4a54c
Parents: 870986b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Nov 24 17:27:06 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Nov 24 17:27:06 2016 +0000

----------------------------------------------------------------------
 .../java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/18b49c35/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
index fbaf4d6..602ac56 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
@@ -196,8 +196,10 @@ public class BrooklynRestApiLauncher {
 
         Maybe<Object> configSecurityProvider = mgmt.getConfig().getConfigLocalRaw(BrooklynWebConfig.SECURITY_PROVIDER_CLASSNAME);
         boolean hasConfigSecurityProvider = configSecurityProvider.isPresent();
-        boolean hasOverrideSecurityProvider = (securityProvider != null && securityProvider != AnyoneSecurityProvider.class);
-        if (hasOverrideSecurityProvider || hasConfigSecurityProvider) {
+        boolean hasOverrideSecurityProvider = securityProvider != null;
+        boolean hasAnyoneOverrideSecurityProvide = (securityProvider == AnyoneSecurityProvider.class) ||
+            (!hasOverrideSecurityProvider && hasConfigSecurityProvider && AnyoneSecurityProvider.class.getName().equals(configSecurityProvider.get()));
+        if (!hasAnyoneOverrideSecurityProvide && (hasOverrideSecurityProvider || hasConfigSecurityProvider)) {
             ((WebAppContext)context).addOverrideDescriptor(getClass().getResource("/web-security.xml").toExternalForm());
             if (hasOverrideSecurityProvider) {
                 ((BrooklynProperties) mgmt.getConfig()).put(


[3/4] brooklyn-server git commit: JS launcher test should ensure no security provider from brooklyn.properties

Posted by sv...@apache.org.
JS launcher test should ensure no security provider from brooklyn.properties


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c15820c6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c15820c6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c15820c6

Branch: refs/heads/master
Commit: c15820c6ebc539b6674c99c476dcd60c2302d822
Parents: d1a4977
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Nov 25 10:02:42 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Nov 25 10:02:42 2016 +0000

----------------------------------------------------------------------
 .../rest/jsgui/BrooklynJavascriptGuiLauncher.java   | 15 +++++++++------
 .../brooklyn/rest/BrooklynRestApiLauncher.java      | 16 ++++++++++------
 2 files changed, 19 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c15820c6/launcher/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java b/launcher/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java
index ec908db..0677561 100644
--- a/launcher/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java
+++ b/launcher/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java
@@ -20,16 +20,17 @@ package org.apache.brooklyn.rest.jsgui;
 
 import java.net.InetSocketAddress;
 
-import org.apache.brooklyn.rest.NopSecurityHandler;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.webapp.WebAppContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.brooklyn.rest.BrooklynRestApiLauncher;
+import org.apache.brooklyn.rest.NopSecurityHandler;
+import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider;
 import org.apache.brooklyn.util.core.ResourceUtils;
 import org.apache.brooklyn.util.net.Networking;
 import org.apache.brooklyn.util.os.Os;
 import org.eclipse.jetty.server.NetworkConnector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** launches Javascript GUI programmatically. and used for tests.
  * see {@link BrooklynRestApiLauncher} for more information.
@@ -65,7 +66,9 @@ public class BrooklynJavascriptGuiLauncher {
     
     /** due to the relative path search in {@link BrooklynRestApiLauncher} we can just call that method */ 
     public static Server startJavascriptAndRest() throws Exception {
-        return BrooklynRestApiLauncher.startRestResourcesViaServlet();
+        return BrooklynRestApiLauncher.launcherServlet()
+            .securityProvider(AnyoneSecurityProvider.class)
+            .start();
     }
 
     /** not much fun without a REST server. 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c15820c6/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
index 602ac56..722e3d9 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java
@@ -342,16 +342,20 @@ public class BrooklynRestApiLauncher {
         log.info("Press Ctrl-C to quit.");
     }
 
+    public static BrooklynRestApiLauncher launcherServlet() {
+        return new BrooklynRestApiLauncher().mode(StartMode.SERVLET);
+    }
+    
     public static Server startRestResourcesViaServlet() throws Exception {
-        return new BrooklynRestApiLauncher()
-                .mode(StartMode.SERVLET)
-                .start();
+        return launcherServlet().start();
     }
 
+    public static BrooklynRestApiLauncher launcherWebXml() {
+        return new BrooklynRestApiLauncher().mode(StartMode.WEB_XML);
+    }
+    
     public static Server startRestResourcesViaWebXml() throws Exception {
-        return new BrooklynRestApiLauncher()
-                .mode(StartMode.WEB_XML)
-                .start();
+        return launcherWebXml().start();
     }
 
     /** look for the JS GUI webapp in common source places, returning path to it if found, or null.


[4/4] brooklyn-server git commit: Closes #463

Posted by sv...@apache.org.
Closes #463

if AnyoneSecurityProvider is set explicitly then switch it out for Nop

improves logic of #434 -- https://github.com/apache/brooklyn-server/pull/434/commits/bfdf522c452df262b3b4bb55cd567ddf45b31fa7

that change caused some tests to fail if you had a security provider set in `brooklyn.properties` locally!  this ensures that an explicit `AnyoneSecurityProvider` is respected.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ca033591
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ca033591
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ca033591

Branch: refs/heads/master
Commit: ca0335916591fb8795f01d01ff3c10143ef15091
Parents: cea47b0 c15820c
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Nov 28 16:18:56 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Nov 28 16:18:56 2016 +0200

----------------------------------------------------------------------
 .../jsgui/BrooklynJavascriptGuiLauncher.java    | 15 +++++++------
 .../BrooklynPropertiesSecurityFilterTest.java   |  3 +--
 .../brooklyn/rest/BrooklynRestApiLauncher.java  | 22 +++++++++++++-------
 .../rest/BrooklynRestApiLauncherTest.java       |  9 ++++----
 .../BrooklynRestApiLauncherTestFixture.java     |  8 +++++--
 .../rest/CsrfTokenFilterLauncherTest.java       |  2 +-
 .../brooklyn/rest/HaMasterCheckFilterTest.java  |  4 ++--
 .../AbstractRestApiEntitlementsTest.java        |  2 +-
 .../ServerResourceIntegrationTest.java          |  4 ++--
 9 files changed, 40 insertions(+), 29 deletions(-)
----------------------------------------------------------------------



[2/4] brooklyn-server git commit: use AnyoneSecurityProvider in more tests

Posted by sv...@apache.org.
use AnyoneSecurityProvider in more tests


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d1a49779
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d1a49779
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d1a49779

Branch: refs/heads/master
Commit: d1a4977965aec613efebe958bc655015e6d6dbdc
Parents: 18b49c3
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Nov 24 22:54:34 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Nov 24 22:54:59 2016 +0000

----------------------------------------------------------------------
 .../brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java | 3 +--
 .../apache/brooklyn/rest/BrooklynRestApiLauncherTest.java   | 9 ++++-----
 .../brooklyn/rest/BrooklynRestApiLauncherTestFixture.java   | 8 ++++++--
 .../apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java   | 2 +-
 .../org/apache/brooklyn/rest/HaMasterCheckFilterTest.java   | 4 ++--
 .../rest/entitlement/AbstractRestApiEntitlementsTest.java   | 2 +-
 .../rest/resources/ServerResourceIntegrationTest.java       | 4 ++--
 7 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java
index f89acf0..c05d15b 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java
@@ -97,8 +97,7 @@ public class BrooklynPropertiesSecurityFilterTest extends BrooklynRestApiLaunche
     public void testInteractionOfSecurityFilterAndFormMapProvider() throws Exception {
         Stopwatch stopwatch = Stopwatch.createStarted();
         try {
-            Server server = useServerForTest(BrooklynRestApiLauncher.launcher()
-                    .securityProvider(AnyoneSecurityProvider.class)
+            Server server = useServerForTest(baseLauncher()
                     .forceUseOfDefaultCatalogWithJavaClassPath(true)
                     .withoutJsgui()
                     .start());

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java
index d64b9a6..26c8fb0 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java
@@ -24,7 +24,6 @@ import static org.apache.brooklyn.rest.BrooklynRestApiLauncher.StartMode.WEB_XML
 import java.util.concurrent.Callable;
 
 import org.apache.brooklyn.entity.brooklynnode.BrooklynNode;
-import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider;
 import org.apache.brooklyn.test.Asserts;
 import org.apache.brooklyn.util.http.HttpAsserts;
 import org.apache.brooklyn.util.http.HttpTool;
@@ -45,10 +44,10 @@ public class BrooklynRestApiLauncherTest extends BrooklynRestApiLauncherTestFixt
         checkRestCatalogEntities(useServerForTest(baseLauncher().mode(WEB_XML).start()));
     }
 
-    private BrooklynRestApiLauncher baseLauncher() {
-        return BrooklynRestApiLauncher.launcher()
-                .securityProvider(AnyoneSecurityProvider.class)
-                .forceUseOfDefaultCatalogWithJavaClassPath(true);
+    @Override
+    protected BrooklynRestApiLauncher baseLauncher() {
+        return super.baseLauncher()
+            .forceUseOfDefaultCatalogWithJavaClassPath(true);
     }
     
     private static void checkRestCatalogEntities(Server server) throws Exception {

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
index 1893d4a..53068c0 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
@@ -50,9 +50,8 @@ public abstract class BrooklynRestApiLauncherTestFixture {
     
     protected Server newServer() {
         try {
-            Server server = BrooklynRestApiLauncher.launcher()
+            Server server = baseLauncher()
                     .forceUseOfDefaultCatalogWithJavaClassPath(true)
-                    .securityProvider(AnyoneSecurityProvider.class)
                     .start();
             return server;
         } catch (Exception e) {
@@ -69,6 +68,11 @@ public abstract class BrooklynRestApiLauncherTestFixture {
         return server;
     }
     
+    protected BrooklynRestApiLauncher baseLauncher() {
+        return BrooklynRestApiLauncher.launcher()
+                .securityProvider(AnyoneSecurityProvider.class);
+    }
+    
     /** @deprecated since 0.9.0 use {@link #getBaseUriHostAndPost(Server)} or {@link #getBaseUriRest(Server)} */
     public static String getBaseUri(Server server) {
         return getBaseUriHostAndPost(server);

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java
index a9af873..31f9497 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java
@@ -45,7 +45,7 @@ public class CsrfTokenFilterLauncherTest extends BrooklynRestApiLauncherTestFixt
 
     @Test
     public void testRequestToken() {
-        useServerForTest(BrooklynRestApiLauncher.launcher()
+        useServerForTest(baseLauncher()
             .withoutJsgui()
             .start());
 

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java
index 83d00f5..9d345ce 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java
@@ -159,9 +159,9 @@ public class HaMasterCheckFilterTest extends BrooklynRestApiLauncherTestFixture
             readMgmt = createManagementContext(mementoDir, readMode);
         }
 
-        server = useServerForTest(BrooklynRestApiLauncher.launcher()
-                .managementContext(readMgmt)
+        server = useServerForTest(baseLauncher()
                 .securityProvider(AnyoneSecurityProvider.class)
+                .managementContext(readMgmt)
                 .forceUseOfDefaultCatalogWithJavaClassPath(true)
                 .withoutJsgui()
                 .disableHighAvailability(false)

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java
index a750d89..1181e94 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java
@@ -74,7 +74,7 @@ public abstract class AbstractRestApiEntitlementsTest extends BrooklynRestApiLau
                         .configure(TestEntity.CONF_NAME, "myname"));
         entity = (TestEntity) Iterables.getOnlyElement(app.getChildren());
         
-        useServerForTest(BrooklynRestApiLauncher.launcher()
+        useServerForTest(baseLauncher()
                 .managementContext(mgmt)
                 .forceUseOfDefaultCatalogWithJavaClassPath(true)
                 .start());

http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java
index 2436b91..5daa5fa 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java
@@ -63,7 +63,7 @@ public class ServerResourceIntegrationTest extends BrooklynRestApiLauncherTestFi
         ManagementContext mgmt = new LocalManagementContext(brooklynProperties);
         
         try {
-            Server server = useServerForTest(BrooklynRestApiLauncher.launcher()
+            Server server = useServerForTest(baseLauncher()
                     .managementContext(mgmt)
                     .withoutJsgui()
                     .securityProvider(TestSecurityProvider.class)
@@ -103,7 +103,7 @@ public class ServerResourceIntegrationTest extends BrooklynRestApiLauncherTestFi
 
     @Test(groups = "Integration")
     public void testGetUser() throws Exception {
-        Server server = useServerForTest(BrooklynRestApiLauncher.launcher()
+        Server server = useServerForTest(baseLauncher()
                 .securityProvider(TestSecurityProvider.class)
                 .withoutJsgui()
                 .start());