You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/02/06 13:48:13 UTC
[01/11] incubator-brooklyn git commit: obfuscate passwords and
credentials in the gui (literal "shadow passwords!")
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master ddf0a44c8 -> 92e9d0bcc
obfuscate passwords and credentials in the gui (literal "shadow passwords!")
applies text shadowing to blur keys that say obvious things like "password" and "credential",
to config table and sensors table. clears up when you click it.
this prevents people looking over your shoulder from seeing things they shouldn't,
but it doesn't block REST access, and if you click on it you can still see it.
(this is a common trick done at AWS & SL, btw.)
a separate feature is to enforce visibility of sensors; this can be done with entitlements on a per-sensor basis
but it might be nice to have an easy entitlements mode where "sensitive" info is not available,
and options on config keys (similar to how i just did it with ConfigInheritance,
in https://github.com/apache/incubator-brooklyn/pull/483) to allow ConfigSensitivity.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/851f91ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/851f91ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/851f91ac
Branch: refs/heads/master
Commit: 851f91ac3df97fe82ab5ece2aca7ce70456b8ccc
Parents: ecc62b0
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jan 28 15:54:26 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jan 28 16:04:04 2015 +0000
----------------------------------------------------------------------
docs/_extra/deploying-yaml.md | 2 ++
usage/jsgui/src/main/webapp/assets/css/base.css | 17 +++++++++++++++++
.../main/webapp/assets/js/util/brooklyn-utils.js | 11 +++++++++++
.../main/webapp/assets/js/view/entity-config.js | 17 ++++++++++++++++-
.../main/webapp/assets/js/view/entity-sensors.js | 14 +++++++++++++-
5 files changed, 59 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/851f91ac/docs/_extra/deploying-yaml.md
----------------------------------------------------------------------
diff --git a/docs/_extra/deploying-yaml.md b/docs/_extra/deploying-yaml.md
index 265f496..73010dd 100644
--- a/docs/_extra/deploying-yaml.md
+++ b/docs/_extra/deploying-yaml.md
@@ -27,6 +27,8 @@ you can:
$ curl -T ./blueprint.yaml -X POST http://localhost:8081/v1/applications
{% endhighlight %}
+You may also need a `-H "Content-Type: application/yaml"` depending on type configuration.
+(Not usually for this, but often for other calls.)
- In the web-console, select the "YAML" tab in the "Add Application" wizard:
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/851f91ac/usage/jsgui/src/main/webapp/assets/css/base.css
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/css/base.css b/usage/jsgui/src/main/webapp/assets/css/base.css
index 756f999..5d4fda2 100644
--- a/usage/jsgui/src/main/webapp/assets/css/base.css
+++ b/usage/jsgui/src/main/webapp/assets/css/base.css
@@ -1453,3 +1453,20 @@ textarea.param-value {
#catalog-details-accordion {
margin-top: 12px;
}
+
+/* For secret things */
+tr.secret-info span.value {
+ display: none;
+}
+tr.secret-info.secret-revealed span.value {
+ display: inherit;
+}
+tr.secret-info.secret-revealed span.secret-indicator {
+ display: none;
+}
+
+.secret-indicator {
+ /* blur */
+ color: transparent;
+ text-shadow: 0 0 5px rgba(0,0,0,0.5);
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/851f91ac/usage/jsgui/src/main/webapp/assets/js/util/brooklyn-utils.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/util/brooklyn-utils.js b/usage/jsgui/src/main/webapp/assets/js/util/brooklyn-utils.js
index 6ec5472..94a1299 100644
--- a/usage/jsgui/src/main/webapp/assets/js/util/brooklyn-utils.js
+++ b/usage/jsgui/src/main/webapp/assets/js/util/brooklyn-utils.js
@@ -162,6 +162,17 @@ define([
return alternateMessage;
}
};
+
+ secretWords = [ "password", "passwd", "credential", "secret", "private", "access.cert", "access.key" ];
+
+ Util.isSecret = function (key) {
+ if (!key) return false;
+ key = key.toString().toLowerCase();
+ for (secretWord in secretWords)
+ if (key.indexOf(secretWords[secretWord]) >= 0)
+ return true;
+ return false;
+ };
return Util;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/851f91ac/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js b/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
index 6c3a964..b53b40a 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
@@ -45,6 +45,7 @@ define([
'click .refresh':'updateConfigNow',
'click .filterEmpty':'toggleFilterEmpty',
'click .toggleAutoRefresh':'toggleAutoRefresh',
+ 'click #config-table tr.secret-info td.config-value':'toggleSecrecyVisibility',
'mouseup .valueOpen':'valueOpen',
'mouseover #config-table tbody tr':'noteFloatMenuActive',
@@ -76,7 +77,10 @@ define([
"aoColumnDefs": [
{ // name (with tooltip)
"mRender": function ( data, type, row ) {
+ // name (column 1) should have tooltip title
var actions = that.getConfigActions(data.name);
+ // if data.description or .type is absent we get an error in html rendering (js)
+ // unless we set it explicitly (there is probably a nicer way to do this however?)
var context = _.extend(data, {
description: data['description'], type: data['type']});
return configNameHtml(context);
@@ -93,17 +97,24 @@ define([
configName = row[0],
actions = that.getConfigActions(configName);
+ var $row = $('tr[id="'+configName+'"]');
+
// datatables doesn't seem to expose any way to modify the html in place for a cell,
// so we rebuild
var result = "<span class='value'>"+(hasEscapedValue ? escapedValue : '')+"</span>";
+
+ if (Util.isSecret(configName)) {
+ $row.addClass("secret-info");
+ result += "<span class='secret-indicator'>(hidden)</span>";
+ }
+
if (actions.open)
result = "<a href='"+actions.open+"'>" + result + "</a>";
if (escapedValue==null || escapedValue.length < 3)
// include whitespace so we can click on it, if it's really small
result += " ";
- var $row = $('tr[id="'+configName+'"]');
var existing = $row.find('.dynamic-contents');
// for the json url, use the full url (relative to window.location.href)
var jsonUrl = actions.json ? new URI(actions.json).resolve(new URI(window.location.href)).toString() : null;
@@ -425,6 +436,10 @@ define([
return this;
},
+ toggleSecrecyVisibility: function(event) {
+ $(event.target).closest('tr.secret-info').toggleClass('secret-revealed');
+ },
+
/**
* Loads current values for all config on an entity and updates config table.
*/
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/851f91ac/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js b/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
index c7a0070..f4369b0 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
@@ -48,6 +48,7 @@ define([
'click .refresh': 'updateSensorsNow',
'click .filterEmpty':'toggleFilterEmpty',
'click .toggleAutoRefresh':'toggleAutoRefresh',
+ 'click #sensors-table tr.secret-info td.sensor-value':'toggleSecrecyVisibility',
'mouseup .valueOpen':'valueOpen',
'mouseover #sensors-table tbody tr':'noteFloatMenuActive',
@@ -104,17 +105,24 @@ define([
sensorName = row[0],
actions = that.getSensorActions(sensorName);
+ var $row = $('tr[id="'+sensorName+'"]');
+
// datatables doesn't seem to expose any way to modify the html in place for a cell,
// so we rebuild
var result = "<span class='value'>"+(hasEscapedValue ? escapedValue : '')+"</span>";
+
+ if (Util.isSecret(sensorName)) {
+ $row.addClass("secret-info");
+ result += "<span class='secret-indicator'>(hidden)</span>";
+ }
+
if (actions.open)
result = "<a href='"+actions.open+"'>" + result + "</a>";
if (escapedValue==null || escapedValue.length < 3)
// include whitespace so we can click on it, if it's really small
result += " ";
- var $row = $('tr[id="'+sensorName+'"]');
var existing = $row.find('.dynamic-contents');
// for the json url, use the full url (relative to window.location.href)
var jsonUrl = actions.json ? new URI(actions.json).resolve(new URI(window.location.href)).toString() : null;
@@ -447,6 +455,10 @@ define([
return this;
},
+ toggleSecrecyVisibility: function(event) {
+ $(event.target).closest('tr.secret-info').toggleClass('secret-revealed');
+ },
+
/**
* Loads current values for all sensors on an entity and updates sensors table.
*/
[10/11] incubator-brooklyn git commit: This closes #484
Posted by he...@apache.org.
This closes #484
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/404c6850
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/404c6850
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/404c6850
Branch: refs/heads/master
Commit: 404c6850131bdc9be0d9c7c3a39dd53767f6eff0
Parents: e7ac5aa afd6e84
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Feb 6 12:42:17 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Feb 6 12:42:17 2015 +0000
----------------------------------------------------------------------
docs/_extra/deploying-yaml.md | 2 ++
usage/jsgui/src/main/webapp/assets/css/base.css | 17 +++++++++++++++
.../webapp/assets/js/util/brooklyn-utils.js | 11 ++++++++++
.../main/webapp/assets/js/view/entity-config.js | 22 ++++++++++++++++++--
.../webapp/assets/js/view/entity-sensors.js | 19 +++++++++++++++--
5 files changed, 67 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[09/11] incubator-brooklyn git commit: This closes #416
Posted by he...@apache.org.
This closes #416
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e7ac5aa2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e7ac5aa2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e7ac5aa2
Branch: refs/heads/master
Commit: e7ac5aa2f0a80343747971e8db208b8877406456
Parents: ddf0a44 8a30e18
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Feb 6 12:41:58 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Feb 6 12:41:58 2015 +0000
----------------------------------------------------------------------
.../brooklyn/catalog/CatalogPredicates.java | 15 ++-
.../OsgiBrooklynClassLoadingContext.java | 4 +
.../entitlement/EntitlementManagerAdapter.java | 99 +++++++++++++++-----
.../management/entitlement/Entitlements.java | 89 ++++++++++++------
.../management/internal/EffectorUtils.java | 4 +-
.../internal/EntityChangeListener.java | 4 +-
.../internal/EntityManagementSupport.java | 5 +-
.../entitlement/AcmeEntitlementManagerTest.java | 3 +-
.../AcmeEntitlementManagerTestFixture.java | 7 +-
.../entitlement/EntitlementsTest.java | 8 +-
.../entitlement/EntityEntitlementTest.java | 9 +-
.../rest/resources/ApplicationResource.java | 7 +-
.../rest/resources/CatalogResource.java | 63 ++++++++++++-
.../rest/resources/EffectorResource.java | 5 +-
.../rest/util/BrooklynRestResourceUtils.java | 4 +-
15 files changed, 246 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
[08/11] incubator-brooklyn git commit: enforce catalog entitlement at
OSGi-loading level
Posted by he...@apache.org.
enforce catalog entitlement at OSGi-loading level
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8a30e185
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8a30e185
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8a30e185
Branch: refs/heads/master
Commit: 8a30e185426845ce35689b8097f8f49055179289
Parents: 88e9910
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Dec 22 18:21:48 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Feb 5 12:02:54 2015 +0000
----------------------------------------------------------------------
.../management/classloading/OsgiBrooklynClassLoadingContext.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8a30e185/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java b/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java
index 3283fb3..12c1a54 100644
--- a/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java
+++ b/core/src/main/java/brooklyn/management/classloading/OsgiBrooklynClassLoadingContext.java
@@ -25,6 +25,7 @@ import brooklyn.catalog.CatalogItem;
import brooklyn.catalog.CatalogItem.CatalogBundle;
import brooklyn.catalog.internal.CatalogUtils;
import brooklyn.management.ManagementContext;
+import brooklyn.management.entitlement.Entitlements;
import brooklyn.management.ha.OsgiManager;
import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.guava.Maybe;
@@ -61,6 +62,9 @@ public class OsgiBrooklynClassLoadingContext extends AbstractBrooklynClassLoadin
if (mgmt!=null) {
osgi = ((ManagementContextInternal)mgmt).getOsgiManager();
if (osgi.isPresent() && getBundles()!=null && !getBundles().isEmpty()) {
+ if (!Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.SEE_CATALOG_ITEM, catalogItemId))
+ return Maybe.absent("Not entitled to use this catalog entry");
+
clazz = osgi.get().tryResolveClass(className, getBundles());
if (clazz.isPresent())
return (Maybe)clazz;
[06/11] incubator-brooklyn git commit: enforce catalog entitlements
at REST level
Posted by he...@apache.org.
enforce catalog entitlements at REST level
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/88e99105
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/88e99105
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/88e99105
Branch: refs/heads/master
Commit: 88e99105acd7c363ad60187bcabf2e5cfab945c4
Parents: f782060
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Dec 22 18:18:25 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Feb 5 12:02:53 2015 +0000
----------------------------------------------------------------------
.../brooklyn/catalog/CatalogPredicates.java | 15 ++++-
.../entitlement/EntitlementManagerAdapter.java | 2 +
.../rest/resources/CatalogResource.java | 63 ++++++++++++++++++--
3 files changed, 74 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88e99105/core/src/main/java/brooklyn/catalog/CatalogPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/CatalogPredicates.java b/core/src/main/java/brooklyn/catalog/CatalogPredicates.java
index ce8386f..c2872fe 100644
--- a/core/src/main/java/brooklyn/catalog/CatalogPredicates.java
+++ b/core/src/main/java/brooklyn/catalog/CatalogPredicates.java
@@ -24,6 +24,8 @@ import brooklyn.catalog.CatalogItem.CatalogItemType;
import brooklyn.entity.Application;
import brooklyn.entity.Entity;
import brooklyn.entity.proxying.EntitySpec;
+import brooklyn.management.ManagementContext;
+import brooklyn.management.entitlement.Entitlements;
import brooklyn.policy.Policy;
import brooklyn.policy.PolicySpec;
@@ -101,4 +103,15 @@ public class CatalogPredicates {
}
};
}
-}
+
+ public static <T,SpecT> Predicate<CatalogItem<T,SpecT>> entitledToSee(final ManagementContext mgmt) {
+ return new Predicate<CatalogItem<T,SpecT>>() {
+ @Override
+ public boolean apply(@Nullable CatalogItem<T,SpecT> item) {
+ return (item != null) &&
+ Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.SEE_CATALOG_ITEM, item.getCatalogItemId());
+ }
+ };
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88e99105/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java b/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
index 7044be8..cd6dae3 100644
--- a/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
+++ b/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
@@ -114,7 +114,9 @@ public abstract class EntitlementManagerAdapter implements EntitlementManager {
}
protected abstract boolean isEntitledToSeeCatalogItem(EntitlementContext context, String catalogItemId);
+ /** passes item to be added, either yaml, or possibly null if any addition allowed (eg when resetting) */
protected abstract boolean isEntitledToAddCatalogItem(EntitlementContext context, Object catalogItemBeingAdded);
+ /** passes item being modified, as ID and description of modification, both possibly null if any modification is allowed (eg when resetting) */
protected abstract boolean isEntitledToModifyCatalogItem(EntitlementContext context, String catalogItemId, Object catalogItemModification);
protected abstract boolean isEntitledToSeeSensor(EntitlementContext context, Entity entity, String sensorName);
protected abstract boolean isEntitledToSeeEntity(EntitlementContext context, Entity entity);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/88e99105/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
index 07e9a65..535d923 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/CatalogResource.java
@@ -42,6 +42,8 @@ import brooklyn.catalog.internal.CatalogItemComparator;
import brooklyn.catalog.internal.CatalogUtils;
import brooklyn.entity.Entity;
import brooklyn.entity.proxying.EntitySpec;
+import brooklyn.management.entitlement.Entitlements;
+import brooklyn.management.entitlement.Entitlements.StringAndArgument;
import brooklyn.policy.Policy;
import brooklyn.policy.PolicySpec;
import brooklyn.rest.api.CatalogApi;
@@ -89,6 +91,11 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
@SuppressWarnings("unchecked")
@Override
public Response create(String yaml) {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.ADD_CATALOG_ITEM, yaml)) {
+ throw WebResourceUtils.unauthorized("User '%s' is not authorized to add catalog item",
+ Entitlements.getEntitlementContext().user());
+ }
+
CatalogItem<?,?> item;
try {
item = brooklyn().getCatalog().addItem(yaml);
@@ -122,6 +129,12 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
@Override
public Response resetXml(String xml) {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.MODIFY_CATALOG_ITEM, null) ||
+ !Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.ADD_CATALOG_ITEM, null)) {
+ throw WebResourceUtils.unauthorized("User '%s' is not authorized to modify catalog",
+ Entitlements.getEntitlementContext().user());
+ }
+
((BasicBrooklynCatalog)mgmt().getCatalog()).reset(CatalogDto.newDtoFromXmlContents(xml, "REST reset"));
return Response.ok().build();
}
@@ -129,6 +142,10 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
@Override
@Deprecated
public void deleteEntity(String entityId) throws Exception {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.MODIFY_CATALOG_ITEM, StringAndArgument.of(entityId, "delete"))) {
+ throw WebResourceUtils.unauthorized("User '%s' is not authorized to modify catalog",
+ Entitlements.getEntitlementContext().user());
+ }
try {
CatalogItem<?, ?> item = CatalogUtils.getCatalogItemOptionalVersion(mgmt(), entityId);
if (item==null)
@@ -141,11 +158,15 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
@Override
public void deleteEntity(String entityId, String version) throws Exception {
- try {
- brooklyn().getCatalog().deleteCatalogItem(entityId, version);
- } catch (NoSuchElementException e) {
- throw WebResourceUtils.notFound("Entity with id '%s:%s' not found", entityId, version);
- }
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.MODIFY_CATALOG_ITEM, StringAndArgument.of(entityId+(Strings.isBlank(version) ? "" : ":"+version), "delete"))) {
+ throw WebResourceUtils.unauthorized("User '%s' is not authorized to modify catalog",
+ Entitlements.getEntitlementContext().user());
+ }
+ try {
+ brooklyn().getCatalog().deleteCatalogItem(entityId, version);
+ } catch (NoSuchElementException e) {
+ throw WebResourceUtils.notFound("Entity with id '%s:%s' not found", entityId, version);
+ }
}
@Override
@@ -162,6 +183,11 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
@Override
@Deprecated
public CatalogEntitySummary getEntity(String entityId) {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_CATALOG_ITEM, entityId)) {
+ throw WebResourceUtils.unauthorized("User '%s' is not authorized to see catalog entry",
+ Entitlements.getEntitlementContext().user());
+ }
+
CatalogItem<? extends Entity,EntitySpec<?>> result =
CatalogUtils.getCatalogItemOptionalVersion(mgmt(), Entity.class, entityId);
@@ -174,6 +200,11 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
@Override
public CatalogEntitySummary getEntity(String entityId, String version) {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_CATALOG_ITEM, entityId+(Strings.isBlank(version)?"":":"+version))) {
+ throw WebResourceUtils.unauthorized("User '%s' is not authorized to see catalog entry",
+ Entitlements.getEntitlementContext().user());
+ }
+
//TODO These casts are not pretty, we could just provide separate get methods for the different types?
//Or we could provide asEntity/asPolicy cast methods on the CataloItem doing a safety check internally
@SuppressWarnings("unchecked")
@@ -206,6 +237,11 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
@Override
@Deprecated
public CatalogItemSummary getPolicy(String policyId) {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_CATALOG_ITEM, policyId)) {
+ throw WebResourceUtils.unauthorized("User '%s' is not authorized to see catalog entry",
+ Entitlements.getEntitlementContext().user());
+ }
+
CatalogItem<? extends Policy, PolicySpec<?>> result =
CatalogUtils.getCatalogItemOptionalVersion(mgmt(), Policy.class, policyId);
@@ -218,6 +254,11 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
@Override
public CatalogItemSummary getPolicy(String policyId, String version) throws Exception {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_CATALOG_ITEM, policyId+(Strings.isBlank(version)?"":":"+version))) {
+ throw WebResourceUtils.unauthorized("User '%s' is not authorized to see catalog entry",
+ Entitlements.getEntitlementContext().user());
+ }
+
@SuppressWarnings("unchecked")
CatalogItem<? extends Policy, PolicySpec<?>> result =
(CatalogItem<? extends Policy, PolicySpec<?>>)brooklyn().getCatalog().getCatalogItem(policyId, version);
@@ -237,6 +278,8 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
filters.add(CatalogPredicates.xml(StringPredicates.containsRegex(regex)));
if (Strings.isNonEmpty(fragment))
filters.add(CatalogPredicates.xml(StringPredicates.containsLiteralIgnoreCase(fragment)));
+
+ filters.add(CatalogPredicates.entitledToSee(mgmt()));
ImmutableList<CatalogItem<Object, Object>> sortedItems =
FluentIterable.from(brooklyn().getCatalog().getCatalogItems())
@@ -248,12 +291,22 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat
@Override
@Deprecated
public Response getIcon(String itemId) {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_CATALOG_ITEM, itemId)) {
+ throw WebResourceUtils.unauthorized("User '%s' is not authorized to see catalog entry",
+ Entitlements.getEntitlementContext().user());
+ }
+
CatalogItem<?,?> result = CatalogUtils.getCatalogItemOptionalVersion(mgmt(), itemId);
return getCatalogItemIcon(result);
}
@Override
public Response getIcon(String itemId, String version) {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.SEE_CATALOG_ITEM, itemId+(Strings.isBlank(version)?"":":"+version))) {
+ throw WebResourceUtils.unauthorized("User '%s' is not authorized to see catalog entry",
+ Entitlements.getEntitlementContext().user());
+ }
+
CatalogItem<?,?> result = brooklyn().getCatalog().getCatalogItem(itemId, version);
return getCatalogItemIcon(result);
}
[04/11] incubator-brooklyn git commit: fix JS bug where $row might
not exist when applying CSS style
Posted by he...@apache.org.
fix JS bug where $row might not exist when applying CSS style
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/afd6e847
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/afd6e847
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/afd6e847
Branch: refs/heads/master
Commit: afd6e8479d9564daf10aa251a662eff689c247d3
Parents: 851f91a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Feb 2 12:37:26 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Feb 2 14:44:02 2015 +0000
----------------------------------------------------------------------
usage/jsgui/src/main/webapp/assets/css/base.css | 6 +++---
.../src/main/webapp/assets/js/view/entity-config.js | 13 ++++++++-----
.../src/main/webapp/assets/js/view/entity-sensors.js | 13 ++++++++-----
3 files changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/afd6e847/usage/jsgui/src/main/webapp/assets/css/base.css
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/css/base.css b/usage/jsgui/src/main/webapp/assets/css/base.css
index 5d4fda2..20938b5 100644
--- a/usage/jsgui/src/main/webapp/assets/css/base.css
+++ b/usage/jsgui/src/main/webapp/assets/css/base.css
@@ -1455,13 +1455,13 @@ textarea.param-value {
}
/* For secret things */
-tr.secret-info span.value {
+.secret-info span.value {
display: none;
}
-tr.secret-info.secret-revealed span.value {
+.secret-info.secret-revealed span.value {
display: inherit;
}
-tr.secret-info.secret-revealed span.secret-indicator {
+.secret-info.secret-revealed span.secret-indicator {
display: none;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/afd6e847/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js b/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
index b53b40a..924339d 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/entity-config.js
@@ -45,7 +45,7 @@ define([
'click .refresh':'updateConfigNow',
'click .filterEmpty':'toggleFilterEmpty',
'click .toggleAutoRefresh':'toggleAutoRefresh',
- 'click #config-table tr.secret-info td.config-value':'toggleSecrecyVisibility',
+ 'click #config-table div.secret-info':'toggleSecrecyVisibility',
'mouseup .valueOpen':'valueOpen',
'mouseover #config-table tbody tr':'noteFloatMenuActive',
@@ -97,6 +97,7 @@ define([
configName = row[0],
actions = that.getConfigActions(configName);
+ // NB: the row might not yet exist
var $row = $('tr[id="'+configName+'"]');
// datatables doesn't seem to expose any way to modify the html in place for a cell,
@@ -104,8 +105,8 @@ define([
var result = "<span class='value'>"+(hasEscapedValue ? escapedValue : '')+"</span>";
- if (Util.isSecret(configName)) {
- $row.addClass("secret-info");
+ var isSecret = Util.isSecret(configName);
+ if (isSecret) {
result += "<span class='secret-indicator'>(hidden)</span>";
}
@@ -159,7 +160,9 @@ define([
"<div class='floatLeft'><span class='icon-chevron-down hasFloatDown'></span>" +
downMenu +
"</div>";
- result = "<div class='floatGroup'>" + result + "</div>";
+ result = "<div class='floatGroup"+
+ (isSecret ? " secret-info" : "")+
+ "'>" + result + "</div>";
// also see updateFloatMenus which wires up the JS for these classes
return result;
@@ -437,7 +440,7 @@ define([
},
toggleSecrecyVisibility: function(event) {
- $(event.target).closest('tr.secret-info').toggleClass('secret-revealed');
+ $(event.target).closest('.secret-info').toggleClass('secret-revealed');
},
/**
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/afd6e847/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js b/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
index f4369b0..cf84508 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/entity-sensors.js
@@ -48,7 +48,7 @@ define([
'click .refresh': 'updateSensorsNow',
'click .filterEmpty':'toggleFilterEmpty',
'click .toggleAutoRefresh':'toggleAutoRefresh',
- 'click #sensors-table tr.secret-info td.sensor-value':'toggleSecrecyVisibility',
+ 'click #sensors-table div.secret-info':'toggleSecrecyVisibility',
'mouseup .valueOpen':'valueOpen',
'mouseover #sensors-table tbody tr':'noteFloatMenuActive',
@@ -105,6 +105,7 @@ define([
sensorName = row[0],
actions = that.getSensorActions(sensorName);
+ // NB: the row might not yet exist
var $row = $('tr[id="'+sensorName+'"]');
// datatables doesn't seem to expose any way to modify the html in place for a cell,
@@ -112,8 +113,8 @@ define([
var result = "<span class='value'>"+(hasEscapedValue ? escapedValue : '')+"</span>";
- if (Util.isSecret(sensorName)) {
- $row.addClass("secret-info");
+ var isSecret = Util.isSecret(sensorName);
+ if (isSecret) {
result += "<span class='secret-indicator'>(hidden)</span>";
}
@@ -167,7 +168,9 @@ define([
"<div class='floatLeft'><span class='icon-chevron-down hasFloatDown'></span>" +
downMenu +
"</div>";
- result = "<div class='floatGroup'>" + result + "</div>";
+ result = "<div class='floatGroup"+
+ (isSecret ? " secret-info" : "")+
+ "'>" + result + "</div>";
// also see updateFloatMenus which wires up the JS for these classes
return result;
@@ -456,7 +459,7 @@ define([
},
toggleSecrecyVisibility: function(event) {
- $(event.target).closest('tr.secret-info').toggleClass('secret-revealed');
+ $(event.target).closest('.secret-info').toggleClass('secret-revealed');
},
/**
[03/11] incubator-brooklyn git commit: Don't recurse into same
symbolicName catalog items when resolving CAMP dependencies.
Posted by he...@apache.org.
Don't recurse into same symbolicName catalog items when resolving CAMP dependencies.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fecec16d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fecec16d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fecec16d
Branch: refs/heads/master
Commit: fecec16df9dafad6479ee0c47f41779477ae0afc
Parents: beeb4d8
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Dec 10 15:50:39 2014 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Jan 29 16:41:25 2015 +0200
----------------------------------------------------------------------
.../api/AssemblyTemplateSpecInstantiator.java | 5 ++
.../catalog/internal/BasicBrooklynCatalog.java | 13 ++---
.../camp/lite/TestAppAssemblyInstantiator.java | 6 +++
.../BrooklynAssemblyTemplateInstantiator.java | 23 ++++++---
.../brooklyn/catalog/CatalogYamlEntityTest.java | 52 ++++++++++++++++++++
5 files changed, 87 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fecec16d/core/src/main/java/brooklyn/camp/brooklyn/api/AssemblyTemplateSpecInstantiator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/camp/brooklyn/api/AssemblyTemplateSpecInstantiator.java b/core/src/main/java/brooklyn/camp/brooklyn/api/AssemblyTemplateSpecInstantiator.java
index 25f3cbd..60b7921 100644
--- a/core/src/main/java/brooklyn/camp/brooklyn/api/AssemblyTemplateSpecInstantiator.java
+++ b/core/src/main/java/brooklyn/camp/brooklyn/api/AssemblyTemplateSpecInstantiator.java
@@ -21,11 +21,16 @@ package brooklyn.camp.brooklyn.api;
import io.brooklyn.camp.CampPlatform;
import io.brooklyn.camp.spi.AssemblyTemplate;
import io.brooklyn.camp.spi.instantiate.AssemblyTemplateInstantiator;
+
+import java.util.Set;
+
import brooklyn.entity.proxying.EntitySpec;
import brooklyn.management.classloading.BrooklynClassLoadingContext;
public interface AssemblyTemplateSpecInstantiator extends AssemblyTemplateInstantiator {
EntitySpec<?> createSpec(AssemblyTemplate template, CampPlatform platform, BrooklynClassLoadingContext loader, boolean autoUnwrapIfAppropriate);
+ EntitySpec<?> createNestedSpec(AssemblyTemplate template, CampPlatform platform, BrooklynClassLoadingContext itemLoader, Set<String> encounteredCatalogTypes);
+
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fecec16d/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
index 2153ada..6b61b44 100644
--- a/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
+++ b/core/src/main/java/brooklyn/catalog/internal/BasicBrooklynCatalog.java
@@ -51,6 +51,7 @@ import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.policy.Policy;
import brooklyn.policy.PolicySpec;
import brooklyn.util.collections.MutableMap;
+import brooklyn.util.collections.MutableSet;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.guava.Maybe;
import brooklyn.util.javalang.AggregateClassLoader;
@@ -305,7 +306,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
switch (item.getCatalogItemType()) {
case TEMPLATE:
case ENTITY:
- spec = createEntitySpec(plan, loader);
+ spec = createEntitySpec(loadedItem.getSymbolicName(), plan, loader);
break;
case POLICY:
spec = createPolicySpec(plan, loader);
@@ -335,7 +336,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
}
@SuppressWarnings("unchecked")
- private <T, SpecT> SpecT createEntitySpec(DeploymentPlan plan, BrooklynClassLoadingContext loader) {
+ private <T, SpecT> SpecT createEntitySpec(String symbolicName, DeploymentPlan plan, BrooklynClassLoadingContext loader) {
CampPlatform camp = BrooklynServerConfig.getCampPlatform(mgmt).get();
// TODO should not register new AT each time we instantiate from the same plan; use some kind of cache
@@ -350,7 +351,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
try {
AssemblyTemplateInstantiator instantiator = at.getInstantiator().newInstance();
if (instantiator instanceof AssemblyTemplateSpecInstantiator) {
- return (SpecT) ((AssemblyTemplateSpecInstantiator)instantiator).createSpec(at, camp, loader, true);
+ return (SpecT) ((AssemblyTemplateSpecInstantiator)instantiator).createNestedSpec(at, camp, loader, MutableSet.of(symbolicName));
}
throw new IllegalStateException("Unable to instantiate YAML; incompatible instantiator "+instantiator+" for "+at);
} catch (Exception e) {
@@ -529,7 +530,7 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
String versionedId = CatalogUtils.getVersionedId(catalogSymbolicName, catalogVersion);
BrooklynClassLoadingContext loader = CatalogUtils.newClassLoadingContext(mgmt, versionedId, libraries);
- AbstractBrooklynObjectSpec<?, ?> spec = createSpec(plan, loader);
+ AbstractBrooklynObjectSpec<?, ?> spec = createSpec(catalogSymbolicName, plan, loader);
CatalogItemDtoAbstract<?, ?> dto = createItemBuilder(spec, catalogSymbolicName, catalogVersion)
.libraries(libraries)
@@ -543,11 +544,11 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
return dto;
}
- private AbstractBrooklynObjectSpec<?,?> createSpec(DeploymentPlan plan, BrooklynClassLoadingContext loader) {
+ private AbstractBrooklynObjectSpec<?,?> createSpec(String symbolicName, DeploymentPlan plan, BrooklynClassLoadingContext loader) {
if (isPolicyPlan(plan)) {
return createPolicySpec(plan, loader);
} else {
- return createEntitySpec(plan, loader);
+ return createEntitySpec(symbolicName, plan, loader);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fecec16d/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java
index e63bd1f..23d85f2 100644
--- a/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java
+++ b/core/src/test/java/brooklyn/camp/lite/TestAppAssemblyInstantiator.java
@@ -27,6 +27,7 @@ import io.brooklyn.camp.spi.collection.ResolvableLink;
import io.brooklyn.camp.spi.instantiate.BasicAssemblyTemplateInstantiator;
import java.util.Map;
+import java.util.Set;
import brooklyn.camp.brooklyn.api.AssemblyTemplateSpecInstantiator;
import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext;
@@ -82,4 +83,9 @@ public class TestAppAssemblyInstantiator extends BasicAssemblyTemplateInstantiat
app.configure(ConfigBag.newInstance().putAll((Map)bc).getAllConfigAsConfigKeyMap());
}
+ @Override
+ public EntitySpec<?> createNestedSpec(AssemblyTemplate template, CampPlatform platform, BrooklynClassLoadingContext itemLoader, Set<String> encounteredCatalogTypes) {
+ return createSpec(template, platform, itemLoader, true);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fecec16d/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
index d03502e..17949d8 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynAssemblyTemplateInstantiator.java
@@ -171,7 +171,10 @@ public class BrooklynAssemblyTemplateInstantiator implements AssemblyTemplateSpe
String brooklynType = entityResolver.getBrooklynType();
CatalogItem<Entity, EntitySpec<?>> item = entityResolver.getCatalogItem();
- boolean firstOccurrence = encounteredCatalogTypes.add(brooklynType);
+ //Take the symoblicName part of the catalog item only for recursion detection to prevent
+ //cross referencing of different versions. Not interested in non-catalog item types.
+ //Prevent catalog items self-referencing even if explicitly different version.
+ boolean firstOccurrence = (item == null || encounteredCatalogTypes.add(item.getSymbolicName()));
boolean recursiveButTryJava = !firstOccurrence;
if (log.isTraceEnabled()) log.trace("Building CAMP template services: type="+brooklynType+"; item="+item+"; loader="+entityResolver.loader+"; encounteredCatalogTypes="+encounteredCatalogTypes);
@@ -223,7 +226,7 @@ public class BrooklynAssemblyTemplateInstantiator implements AssemblyTemplateSpe
return null;
}
try {
- return resolveYamlSpec(mgmt, encounteredCatalogTypes, yaml, itemLoader);
+ return createNestedSpec(mgmt, encounteredCatalogTypes, yaml, itemLoader);
} finally {
try {
yaml.close();
@@ -242,10 +245,10 @@ public class BrooklynAssemblyTemplateInstantiator implements AssemblyTemplateSpe
Reader input = new StringReader(yaml);
BrooklynClassLoadingContext itemLoader = CatalogUtils.newClassLoadingContext(mgmt, item);
- return resolveYamlSpec(mgmt, encounteredCatalogTypes, input, itemLoader);
+ return createNestedSpec(mgmt, encounteredCatalogTypes, input, itemLoader);
}
- private EntitySpec<?> resolveYamlSpec(ManagementContext mgmt,
+ private EntitySpec<?> createNestedSpec(ManagementContext mgmt,
Set<String> encounteredCatalogTypes, Reader input,
BrooklynClassLoadingContext itemLoader) {
CampPlatform platform = BrooklynServerConfig.getCampPlatform(mgmt).get();
@@ -257,13 +260,21 @@ public class BrooklynAssemblyTemplateInstantiator implements AssemblyTemplateSpe
} finally {
BrooklynLoaderTracker.unsetLoader(itemLoader);
}
+ return createNestedSpec(at, platform, itemLoader, encounteredCatalogTypes);
+ }
+ @Override
+ public EntitySpec<?> createNestedSpec(
+ AssemblyTemplate template,
+ CampPlatform platform,
+ BrooklynClassLoadingContext itemLoader,
+ Set<String> encounteredCatalogTypes) {
// In case we want to allow multiple top-level entities in a catalog we need to think
// about what it would mean to subsequently call buildChildrenEntitySpecs on the list of top-level entities!
try {
- AssemblyTemplateInstantiator ati = at.getInstantiator().newInstance();
+ AssemblyTemplateInstantiator ati = template.getInstantiator().newInstance();
if (ati instanceof BrooklynAssemblyTemplateInstantiator) {
- List<EntitySpec<?>> specs = ((BrooklynAssemblyTemplateInstantiator)ati).buildTemplateServicesAsSpecsImpl(itemLoader, at, platform, encounteredCatalogTypes);
+ List<EntitySpec<?>> specs = ((BrooklynAssemblyTemplateInstantiator)ati).buildTemplateServicesAsSpecsImpl(itemLoader, template, platform, encounteredCatalogTypes);
if (specs.size() > 1) {
throw new UnsupportedOperationException("Only supporting single service in catalog item currently: got "+specs);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fecec16d/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
index 94c3316..5724351 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
@@ -34,6 +34,7 @@ import org.testng.annotations.Test;
import brooklyn.catalog.BrooklynCatalog;
import brooklyn.catalog.CatalogItem;
+import brooklyn.catalog.internal.CatalogUtils;
import brooklyn.entity.Entity;
import brooklyn.entity.basic.BasicEntity;
import brooklyn.management.osgi.OsgiStandaloneTest;
@@ -368,6 +369,57 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
assertTrue(icon != null);
icon.close();
}
+
+ @Test
+ public void testMissingTypeDoesNotRecurse() {
+ String symbolicName = "my.catalog.app.id.basic";
+ addCatalogItem(
+ "brooklyn.catalog:",
+ " id: " + symbolicName,
+ " version: " + TEST_VERSION,
+ "",
+ "services:",
+ "- type: brooklyn.entity.basic.BasicEntity");
+
+ try {
+ addCatalogItem(
+ "brooklyn.catalog:",
+ " id: " + symbolicName,
+ " version: " + TEST_VERSION + "-update",
+ "",
+ "services:",
+ "- type: " + symbolicName);
+ fail("Catalog addition expected to fail due to non-existent java type " + symbolicName);
+ } catch (IllegalStateException e) {
+ assertEquals(e.getMessage(), "Recursive reference to " + symbolicName + " (and cannot be resolved as a Java type)");
+ }
+ }
+
+ @Test
+ public void testVersionedTypeDoesNotRecurse() {
+ String symbolicName = "my.catalog.app.id.basic";
+ addCatalogItem(
+ "brooklyn.catalog:",
+ " id: " + symbolicName,
+ " version: " + TEST_VERSION,
+ "",
+ "services:",
+ "- type: brooklyn.entity.basic.BasicEntity");
+
+ String versionedId = CatalogUtils.getVersionedId(symbolicName, TEST_VERSION);
+ try {
+ addCatalogItem(
+ "brooklyn.catalog:",
+ " id: " + symbolicName,
+ " version: " + TEST_VERSION + "-update",
+ "",
+ "services:",
+ "- type: " + versionedId);
+ fail("Catalog addition expected to fail due to non-existent java type " + versionedId);
+ } catch (IllegalStateException e) {
+ assertEquals(e.getMessage(), "Recursive reference to " + versionedId + " (and cannot be resolved as a Java type)");
+ }
+ }
private void registerAndLaunchAndAssertSimpleEntity(String symbolicName, String serviceType) throws Exception {
addCatalogOSGiEntity(symbolicName, serviceType);
[07/11] incubator-brooklyn git commit: add catalog entitlements and
refactor entitlement enum dispatching
Posted by he...@apache.org.
add catalog entitlements and refactor entitlement enum dispatching
now adds an interface to highlight when new methods have been added
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f782060e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f782060e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f782060e
Branch: refs/heads/master
Commit: f782060edb28d27e0e77f11475c0a5b45c798979
Parents: 3ff0e79
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Dec 22 18:03:20 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Feb 5 12:02:53 2015 +0000
----------------------------------------------------------------------
.../entitlement/EntitlementManagerAdapter.java | 96 +++++++++++++++-----
.../management/entitlement/Entitlements.java | 55 ++++++++---
2 files changed, 113 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f782060e/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java b/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
index e1c6be8..7044be8 100644
--- a/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
+++ b/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
@@ -24,6 +24,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.annotations.Beta;
import brooklyn.entity.Entity;
+import brooklyn.management.entitlement.Entitlements.EntitlementClassesHandler;
import brooklyn.management.entitlement.Entitlements.EntityAndItem;
import brooklyn.management.entitlement.Entitlements.StringAndArgument;
@@ -40,7 +41,65 @@ public abstract class EntitlementManagerAdapter implements EntitlementManager {
private static final Logger log = LoggerFactory.getLogger(EntitlementManagerAdapter.class);
- @SuppressWarnings("unchecked")
+ protected class Handler implements EntitlementClassesHandler<Boolean> {
+ final EntitlementContext context;
+ protected Handler(EntitlementContext context) {
+ this.context = context;
+ }
+
+ @Override
+ public Boolean handleSeeCatalogItem(String catalogItemId) {
+ return isEntitledToSeeCatalogItem(context, catalogItemId);
+ }
+ @Override
+ public Boolean handleAddCatalogItem(Object catalogItemBeingAdded) {
+ return isEntitledToAddCatalogItem(context, catalogItemBeingAdded);
+ }
+ @Override
+ public Boolean handleModifyCatalogItem(StringAndArgument catalogItemIdAndModification) {
+ return isEntitledToModifyCatalogItem(context, catalogItemIdAndModification==null ? null : catalogItemIdAndModification.getString(),
+ catalogItemIdAndModification==null ? null : catalogItemIdAndModification.getArgument());
+ }
+
+ @Override
+ public Boolean handleSeeEntity(Entity entity) {
+ return isEntitledToSeeEntity(context, entity);
+ }
+ @Override
+ public Boolean handleSeeSensor(EntityAndItem<String> sensorInfo) {
+ return isEntitledToSeeSensor(context, sensorInfo.getEntity(), sensorInfo.getItem());
+ }
+ @Override
+ public Boolean handleInvokeEffector(EntityAndItem<StringAndArgument> effectorInfo) {
+ StringAndArgument item = effectorInfo.getItem();
+ return isEntitledToInvokeEffector(context, effectorInfo.getEntity(), item==null ? null : item.getString(), item==null ? null : item.getArgument());
+ }
+ @Override
+ public Boolean handleModifyEntity(Entity entity) {
+ return isEntitledToModifyEntity(context, entity);
+ }
+
+ @Override
+ public Boolean handleDeployApplication(Object app) {
+ return isEntitledToDeployApplication(context, app);
+ }
+
+ @Override
+ public Boolean handleSeeAllServerInfo() {
+ return isEntitledToSeeAllServerInfo(context);
+ }
+
+ @Override
+ public Boolean handleSeeServerStatus() {
+ return isEntitledToSeeServerStatus(context);
+ }
+
+ @Override
+ public Boolean handleRoot() {
+ return isEntitledToRoot(context);
+ }
+ }
+
@Override
public <T> boolean isEntitled(EntitlementContext context, EntitlementClass<T> entitlementClass, T entitlementClassArgument) {
if (log.isTraceEnabled()) {
@@ -49,33 +108,22 @@ public abstract class EntitlementManagerAdapter implements EntitlementManager {
if (isEntitledToRoot( context )) return true;
- switch (Entitlements.EntitlementClassesEnum.of(entitlementClass)) {
- case ENTITLEMENT_SEE_ENTITY:
- return isEntitledToSeeEntity( context, (Entity)entitlementClassArgument );
-
- case ENTITLEMENT_SEE_SENSOR:
- return isEntitledToSeeSensor( context, (EntityAndItem<String>)entitlementClassArgument );
-
- case ENTITLEMENT_INVOKE_EFFECTOR:
- return isEntitledToInvokeEffector( context, (EntityAndItem<StringAndArgument>)entitlementClassArgument );
-
- case ENTITLEMENT_DEPLOY_APPLICATION:
- return isEntitledToDeploy( context, entitlementClassArgument );
-
- case ENTITLEMENT_SEE_ALL_SERVER_INFO:
- return isEntitledToSeeAllServerInfo( context );
-
- default:
- log.warn("Unsupported permission type: "+entitlementClass+" / "+entitlementClassArgument);
- return false;
- }
+ Handler handler = new Handler(context);
+ return Entitlements.EntitlementClassesEnum.of(entitlementClass).handle(
+ handler, entitlementClassArgument);
}
- protected abstract boolean isEntitledToSeeSensor(EntitlementContext context, EntityAndItem<String> sensorInfo);
+ protected abstract boolean isEntitledToSeeCatalogItem(EntitlementContext context, String catalogItemId);
+ protected abstract boolean isEntitledToAddCatalogItem(EntitlementContext context, Object catalogItemBeingAdded);
+ protected abstract boolean isEntitledToModifyCatalogItem(EntitlementContext context, String catalogItemId, Object catalogItemModification);
+ protected abstract boolean isEntitledToSeeSensor(EntitlementContext context, Entity entity, String sensorName);
protected abstract boolean isEntitledToSeeEntity(EntitlementContext context, Entity entity);
- protected abstract boolean isEntitledToInvokeEffector(EntitlementContext context, EntityAndItem<StringAndArgument> effectorInfo);
- protected abstract boolean isEntitledToDeploy(EntitlementContext context, Object app);
+ /** arguments might be null, a map, or a list, depending how/where invoked */
+ protected abstract boolean isEntitledToInvokeEffector(EntitlementContext context, Entity entity, String effectorName, Object arguments);
+ protected abstract boolean isEntitledToModifyEntity(EntitlementContext context, Entity entity);
+ protected abstract boolean isEntitledToDeployApplication(EntitlementContext context, Object app);
protected abstract boolean isEntitledToSeeAllServerInfo(EntitlementContext context);
+ protected abstract boolean isEntitledToSeeServerStatus(EntitlementContext context);
protected abstract boolean isEntitledToRoot(EntitlementContext context);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f782060e/core/src/main/java/brooklyn/management/entitlement/Entitlements.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/entitlement/Entitlements.java b/core/src/main/java/brooklyn/management/entitlement/Entitlements.java
index 67fb3c7..76cf060 100644
--- a/core/src/main/java/brooklyn/management/entitlement/Entitlements.java
+++ b/core/src/main/java/brooklyn/management/entitlement/Entitlements.java
@@ -52,6 +52,10 @@ public class Entitlements {
// ------------------- individual permissions
+ public static EntitlementClass<String> SEE_CATALOG_ITEM = new BasicEntitlementClassDefinition<String>("catalog.see", String.class);
+ public static EntitlementClass<Object> ADD_CATALOG_ITEM = new BasicEntitlementClassDefinition<Object>("catalog.add", Object.class);
+ public static EntitlementClass<StringAndArgument> MODIFY_CATALOG_ITEM = new BasicEntitlementClassDefinition<StringAndArgument>("catalog.modify", StringAndArgument.class);
+
public static EntitlementClass<Entity> SEE_ENTITY = new BasicEntitlementClassDefinition<Entity>("entity.see", Entity.class);
public static EntitlementClass<EntityAndItem<String>> SEE_SENSOR = new BasicEntitlementClassDefinition<EntityAndItem<String>>("sensor.see", EntityAndItem. typeToken(String.class));
// string is effector name; argument may be a map or a list, depending how the args were supplied
@@ -61,27 +65,34 @@ public class Entitlements {
/** the permission to deploy an application, where parameter is some representation of the app to be deployed (spec instance or yaml plan) */
public static EntitlementClass<Object> DEPLOY_APPLICATION = new BasicEntitlementClassDefinition<Object>("app.deploy", Object.class);
- /** catch-all for catalog, locations, scripting, usage, etc;
- * NB1: all users can see HA status;
- * NB2: this may be refactored and deprecated in future */
+ /** catch-all for catalog, locations, scripting, usage, etc - exporting persistence, shutting down, etc;
+ * this is significantly more powerful than {@link #SERVER_STATUS}.
+ * NB: this may be refactored and deprecated in future */
public static EntitlementClass<Void> SEE_ALL_SERVER_INFO = new BasicEntitlementClassDefinition<Void>("server.info.all.see", Void.class);
+
+ /** permission to see general server status info: basically HA status; not nearly as much as {@link #SEE_ALL_SERVER_INFO} */
+ public static EntitlementClass<Void> SERVER_STATUS = new BasicEntitlementClassDefinition<Void>("server.status", Void.class);
/** permission to run untrusted code or embedded scripts at the server;
* secondary check required for any operation which could potentially grant root-level access */
public static EntitlementClass<Void> ROOT = new BasicEntitlementClassDefinition<Void>("root", Void.class);
- /** permission to see the server status API */
- public static EntitlementClass<Void> SERVER_STATUS = new BasicEntitlementClassDefinition<Void>("server.status", Void.class);
-
+ @SuppressWarnings("unchecked")
public static enum EntitlementClassesEnum {
- ENTITLEMENT_SEE_ENTITY(SEE_ENTITY),
- ENTITLEMENT_SEE_SENSOR(SEE_SENSOR),
- ENTITLEMENT_INVOKE_EFFECTOR(INVOKE_EFFECTOR),
- ENTITLEMENT_MODIFY_ENTITY(MODIFY_ENTITY),
- ENTITLEMENT_DEPLOY_APPLICATION(DEPLOY_APPLICATION),
- ENTITLEMENT_SEE_ALL_SERVER_INFO(SEE_ALL_SERVER_INFO),
- ENTITLEMENT_ROOT(ROOT),
- ENTITLEMENT_SERVER_STATUS(SERVER_STATUS),
+ ENTITLEMENT_SEE_CATALOG_ITEM(SEE_CATALOG_ITEM) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleSeeCatalogItem((String)argument); } },
+ ENTITLEMENT_ADD_CATALOG_ITEM(ADD_CATALOG_ITEM) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleAddCatalogItem(argument); } },
+ ENTITLEMENT_MODIFY_CATALOG_ITEM(MODIFY_CATALOG_ITEM) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleModifyCatalogItem((StringAndArgument)argument); } },
+
+ ENTITLEMENT_SEE_ENTITY(SEE_ENTITY) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleSeeEntity((Entity)argument); } },
+ ENTITLEMENT_SEE_SENSOR(SEE_SENSOR) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleSeeSensor((EntityAndItem<String>)argument); } },
+ ENTITLEMENT_INVOKE_EFFECTOR(INVOKE_EFFECTOR) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleInvokeEffector((EntityAndItem<StringAndArgument>)argument); } },
+ ENTITLEMENT_MODIFY_ENTITY(MODIFY_ENTITY) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleModifyEntity((Entity)argument); } },
+
+ ENTITLEMENT_DEPLOY_APPLICATION(DEPLOY_APPLICATION) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleDeployApplication(argument); } },
+
+ ENTITLEMENT_SEE_ALL_SERVER_INFO(SEE_ALL_SERVER_INFO) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleSeeAllServerInfo(); } },
+ ENTITLEMENT_SERVER_STATUS(SERVER_STATUS) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleSeeServerStatus(); } },
+ ENTITLEMENT_ROOT(ROOT) { public <T> T handle(EntitlementClassesHandler<T> handler, Object argument) { return handler.handleRoot(); } },
;
private EntitlementClass<?> entitlementClass;
@@ -92,6 +103,8 @@ public class Entitlements {
public EntitlementClass<?> getEntitlementClass() {
return entitlementClass;
}
+
+ public abstract <T> T handle(EntitlementClassesHandler<T> handler, Object argument);
public static EntitlementClassesEnum of(EntitlementClass<?> entitlementClass) {
for (EntitlementClassesEnum x: values()) {
@@ -101,6 +114,20 @@ public class Entitlements {
}
}
+ public interface EntitlementClassesHandler<T> {
+ public T handleSeeCatalogItem(String catalogItemId);
+ public T handleSeeServerStatus();
+ public T handleAddCatalogItem(Object catalogItemBeingAdded);
+ public T handleModifyCatalogItem(StringAndArgument catalogItemIdAndModification);
+ public T handleSeeEntity(Entity entity);
+ public T handleSeeSensor(EntityAndItem<String> sensorInfo);
+ public T handleInvokeEffector(EntityAndItem<StringAndArgument> effectorInfo);
+ public T handleModifyEntity(Entity entity);
+ public T handleDeployApplication(Object app);
+ public T handleSeeAllServerInfo();
+ public T handleRoot();
+ }
+
protected static class Pair<T1,T2> {
protected final T1 p1;
protected final T2 p2;
[02/11] incubator-brooklyn git commit: Stop OSGi catalog items
leaking libraries to parent.
Posted by he...@apache.org.
Stop OSGi catalog items leaking libraries to parent.
The loader of the catalog item matching the type was used to load the type itself, while only the loader passed from caller should be used. If the catalog items' symbolicName was matching the java type they expose, they would be leaking their OSGi bundles.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3b8e5eb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3b8e5eb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3b8e5eb7
Branch: refs/heads/master
Commit: 3b8e5eb7060541b61d914476c4ab040ae3d870b6
Parents: fecec16
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Wed Dec 10 16:56:17 2014 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Jan 29 16:41:25 2015 +0200
----------------------------------------------------------------------
.../BrooklynComponentTemplateResolver.java | 14 +-------------
.../brooklyn/catalog/CatalogYamlEntityTest.java | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3b8e5eb7/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index c1a8e4f..403a40e 100644
--- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
+++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
@@ -217,19 +217,7 @@ public class BrooklynComponentTemplateResolver {
/** tries to load the Java entity class */
public Maybe<Class<? extends Entity>> tryLoadEntityClass() {
- CatalogItem<Entity, EntitySpec<?>> item = getCatalogItem();
- String typeName = getBrooklynType();
-
- if (item!=null) {
- // add additional bundles
- loader = new BrooklynClassLoadingContextSequential(mgmt, CatalogUtils.newClassLoadingContext(mgmt, item), loader);
-
- if (item.getJavaType() != null) {
- typeName = item.getJavaType();
- }
- }
-
- return loader.tryLoadClass(typeName, Entity.class);
+ return loader.tryLoadClass(getBrooklynType(), Entity.class);
}
/** resolves the spec, updating the loader if a catalog item is loaded */
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3b8e5eb7/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
index 5724351..048a75f 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
@@ -421,6 +421,23 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
}
}
+ @Test
+ public void testOsgiNotLeakingToParent() {
+ addCatalogOSGiEntity(SIMPLE_ENTITY_TYPE);
+ try {
+ addCatalogItem(
+ "brooklyn.catalog:",
+ " id: " + SIMPLE_ENTITY_TYPE,
+ " version: " + TEST_VERSION + "-update",
+ "",
+ "services:",
+ "- type: " + SIMPLE_ENTITY_TYPE);
+ fail("Catalog addition expected to fail due to non-existent java type " + SIMPLE_ENTITY_TYPE);
+ } catch (IllegalStateException e) {
+ assertEquals(e.getMessage(), "Recursive reference to " + SIMPLE_ENTITY_TYPE + " (and cannot be resolved as a Java type)");
+ }
+ }
+
private void registerAndLaunchAndAssertSimpleEntity(String symbolicName, String serviceType) throws Exception {
addCatalogOSGiEntity(symbolicName, serviceType);
String yaml = "name: simple-app-yaml\n" +
[05/11] incubator-brooklyn git commit: make effector arguments
available to entitlements checks
Posted by he...@apache.org.
make effector arguments available to entitlements checks
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3ff0e799
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3ff0e799
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3ff0e799
Branch: refs/heads/master
Commit: 3ff0e799313f086e31346104f8600a6d0ed048b7
Parents: ddf0a44
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Dec 22 17:08:37 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Feb 5 11:56:08 2015 +0000
----------------------------------------------------------------------
.../entitlement/EntitlementManagerAdapter.java | 5 +--
.../management/entitlement/Entitlements.java | 34 ++++++++++++--------
.../management/internal/EffectorUtils.java | 4 +--
.../internal/EntityChangeListener.java | 4 +--
.../internal/EntityManagementSupport.java | 5 +--
.../entitlement/AcmeEntitlementManagerTest.java | 3 +-
.../AcmeEntitlementManagerTestFixture.java | 7 ++--
.../entitlement/EntitlementsTest.java | 8 +++--
.../entitlement/EntityEntitlementTest.java | 9 +++---
.../rest/resources/ApplicationResource.java | 7 ++--
.../rest/resources/EffectorResource.java | 5 +--
.../rest/util/BrooklynRestResourceUtils.java | 4 ++-
12 files changed, 57 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java b/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
index 6a62e36..e1c6be8 100644
--- a/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
+++ b/core/src/main/java/brooklyn/management/entitlement/EntitlementManagerAdapter.java
@@ -25,6 +25,7 @@ import com.google.common.annotations.Beta;
import brooklyn.entity.Entity;
import brooklyn.management.entitlement.Entitlements.EntityAndItem;
+import brooklyn.management.entitlement.Entitlements.StringAndArgument;
/**
* provides an easy entry point to supplying entitlements, by providing the dispatch and defining the additional methods
@@ -56,7 +57,7 @@ public abstract class EntitlementManagerAdapter implements EntitlementManager {
return isEntitledToSeeSensor( context, (EntityAndItem<String>)entitlementClassArgument );
case ENTITLEMENT_INVOKE_EFFECTOR:
- return isEntitledToInvokeEffector( context, (EntityAndItem<String>)entitlementClassArgument );
+ return isEntitledToInvokeEffector( context, (EntityAndItem<StringAndArgument>)entitlementClassArgument );
case ENTITLEMENT_DEPLOY_APPLICATION:
return isEntitledToDeploy( context, entitlementClassArgument );
@@ -72,7 +73,7 @@ public abstract class EntitlementManagerAdapter implements EntitlementManager {
protected abstract boolean isEntitledToSeeSensor(EntitlementContext context, EntityAndItem<String> sensorInfo);
protected abstract boolean isEntitledToSeeEntity(EntitlementContext context, Entity entity);
- protected abstract boolean isEntitledToInvokeEffector(EntitlementContext context, EntityAndItem<String> effectorInfo);
+ protected abstract boolean isEntitledToInvokeEffector(EntitlementContext context, EntityAndItem<StringAndArgument> effectorInfo);
protected abstract boolean isEntitledToDeploy(EntitlementContext context, Object app);
protected abstract boolean isEntitledToSeeAllServerInfo(EntitlementContext context);
protected abstract boolean isEntitledToRoot(EntitlementContext context);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/core/src/main/java/brooklyn/management/entitlement/Entitlements.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/entitlement/Entitlements.java b/core/src/main/java/brooklyn/management/entitlement/Entitlements.java
index 5d61e4f..67fb3c7 100644
--- a/core/src/main/java/brooklyn/management/entitlement/Entitlements.java
+++ b/core/src/main/java/brooklyn/management/entitlement/Entitlements.java
@@ -54,7 +54,8 @@ public class Entitlements {
public static EntitlementClass<Entity> SEE_ENTITY = new BasicEntitlementClassDefinition<Entity>("entity.see", Entity.class);
public static EntitlementClass<EntityAndItem<String>> SEE_SENSOR = new BasicEntitlementClassDefinition<EntityAndItem<String>>("sensor.see", EntityAndItem. typeToken(String.class));
- public static EntitlementClass<EntityAndItem<String>> INVOKE_EFFECTOR = new BasicEntitlementClassDefinition<EntityAndItem<String>>("effector.invoke", EntityAndItem.typeToken(String.class));
+ // string is effector name; argument may be a map or a list, depending how the args were supplied
+ public static EntitlementClass<EntityAndItem<StringAndArgument>> INVOKE_EFFECTOR = new BasicEntitlementClassDefinition<EntityAndItem<StringAndArgument>>("effector.invoke", EntityAndItem.typeToken(StringAndArgument.class));
public static EntitlementClass<Entity> MODIFY_ENTITY = new BasicEntitlementClassDefinition<Entity>("entity.modify", Entity.class);
/** the permission to deploy an application, where parameter is some representation of the app to be deployed (spec instance or yaml plan) */
@@ -100,28 +101,33 @@ public class Entitlements {
}
}
- public static class EntityAndItem<T> {
- final Entity entity;
- final T item;
+ protected static class Pair<T1,T2> {
+ protected final T1 p1;
+ protected final T2 p2;
+ protected Pair(T1 p1, T2 p2) { this.p1 = p1; this.p2 = p2; }
+ }
+ public static class EntityAndItem<T> extends Pair<Entity,T> {
public static <TT> TypeToken<EntityAndItem<TT>> typeToken(Class<TT> type) {
return new TypeToken<Entitlements.EntityAndItem<TT>>() {
private static final long serialVersionUID = -738154831809025407L;
};
}
- public EntityAndItem(Entity entity, T item) {
- this.entity = entity;
- this.item = item;
- }
- public Entity getEntity() {
- return entity;
- }
- public T getItem() {
- return item;
- }
+ public EntityAndItem(Entity entity, T item) { super (entity, item); }
+ public Entity getEntity() { return p1; }
+ public T getItem() { return p2; }
public static <T> EntityAndItem<T> of(Entity entity, T item) {
return new EntityAndItem<T>(entity, item);
}
}
+
+ public static class StringAndArgument extends Pair<String,Object> {
+ public StringAndArgument(String string, Object argument) { super(string, argument); }
+ public String getString() { return p1; }
+ public Object getArgument() { return p2; }
+ public static StringAndArgument of(String string, Object argument) {
+ return new StringAndArgument(string, argument);
+ }
+ }
/**
* These lifecycle operations are currently treated as effectors. This may change in the future.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/core/src/main/java/brooklyn/management/internal/EffectorUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/EffectorUtils.java b/core/src/main/java/brooklyn/management/internal/EffectorUtils.java
index d55f3a8..c14b98c 100644
--- a/core/src/main/java/brooklyn/management/internal/EffectorUtils.java
+++ b/core/src/main/java/brooklyn/management/internal/EffectorUtils.java
@@ -245,7 +245,7 @@ public class EffectorUtils {
}
ManagementContextInternal mgmtContext = (ManagementContextInternal) ((EntityInternal) entity).getManagementContext();
- mgmtSupport.getEntityChangeListener().onEffectorStarting(eff);
+ mgmtSupport.getEntityChangeListener().onEffectorStarting(eff, args);
try {
return mgmtContext.invokeEffectorMethodSync(entity, eff, args);
} finally {
@@ -276,7 +276,7 @@ public class EffectorUtils {
// FIXME seems brittle to have the listeners in the Utils method; better to move into the context.invokeEff
// (or whatever the last mile before invoking the effector is - though currently there is not such a canonical place!)
- mgmtSupport.getEntityChangeListener().onEffectorStarting(eff);
+ mgmtSupport.getEntityChangeListener().onEffectorStarting(eff, parameters);
try {
return mgmtContext.invokeEffector(entity, eff, parameters);
} finally {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java b/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java
index 811092a..9828844 100644
--- a/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java
+++ b/core/src/main/java/brooklyn/management/internal/EntityChangeListener.java
@@ -42,7 +42,7 @@ public interface EntityChangeListener {
@Override public void onEnricherRemoved(Enricher enricher) {}
@Override public void onFeedAdded(Feed feed) {}
@Override public void onFeedRemoved(Feed feed) {}
- @Override public void onEffectorStarting(Effector<?> effector) {}
+ @Override public void onEffectorStarting(Effector<?> effector, Object parameters) {}
@Override public void onEffectorCompleted(Effector<?> effector) {}
};
@@ -72,7 +72,7 @@ public interface EntityChangeListener {
void onFeedRemoved(Feed feed);
- void onEffectorStarting(Effector<?> effector);
+ void onEffectorStarting(Effector<?> effector, Object parameters);
void onEffectorCompleted(Effector<?> effector);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java b/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java
index 026cf49..fa5de94 100644
--- a/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java
+++ b/core/src/main/java/brooklyn/management/internal/EntityManagementSupport.java
@@ -41,6 +41,7 @@ import brooklyn.management.SubscriptionContext;
import brooklyn.management.entitlement.EntitlementManager;
import brooklyn.management.entitlement.Entitlements;
import brooklyn.management.entitlement.Entitlements.EntityAndItem;
+import brooklyn.management.entitlement.Entitlements.StringAndArgument;
import brooklyn.management.internal.NonDeploymentManagementContext.NonDeploymentManagementContextMode;
import brooklyn.policy.Enricher;
import brooklyn.policy.Policy;
@@ -456,8 +457,8 @@ public class EntityManagementSupport {
getManagementContext().getRebindManager().getChangeListener().onChanged(entity);
}
@Override
- public void onEffectorStarting(Effector<?> effector) {
- Entitlements.checkEntitled(getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(entity, effector.getName()));
+ public void onEffectorStarting(Effector<?> effector, Object parameters) {
+ Entitlements.checkEntitled(getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(entity, StringAndArgument.of(effector.getName(), parameters)));
}
@Override
public void onEffectorCompleted(Effector<?> effector) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTest.java b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTest.java
index 1927f4d..e43fe4a 100644
--- a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTest.java
+++ b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTest.java
@@ -24,6 +24,7 @@ import org.testng.Assert;
import org.testng.annotations.Test;
import brooklyn.management.entitlement.Entitlements.EntityAndItem;
+import brooklyn.management.entitlement.Entitlements.StringAndArgument;
public class AcmeEntitlementManagerTest extends AcmeEntitlementManagerTestFixture {
@@ -48,7 +49,7 @@ public class AcmeEntitlementManagerTest extends AcmeEntitlementManagerTestFixtur
Entitlements.setEntitlementContext(entitlementContext);
Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.ROOT, null));
Assert.assertTrue(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.SEE_ENTITY, app));
- Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, "any-eff")));
+ Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.SEE_SENSOR, EntityAndItem.of(app, "any-sensor")));
// and cannot invoke methods
confirmEffectorEntitlement(false);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java
index 24f1e52..a0fd135 100644
--- a/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java
+++ b/core/src/test/java/brooklyn/management/entitlement/AcmeEntitlementManagerTestFixture.java
@@ -40,6 +40,7 @@ import brooklyn.management.entitlement.Entitlements;
import brooklyn.management.entitlement.NotEntitledException;
import brooklyn.management.entitlement.WebEntitlementContext;
import brooklyn.management.entitlement.Entitlements.EntityAndItem;
+import brooklyn.management.entitlement.Entitlements.StringAndArgument;
import brooklyn.test.entity.LocalManagementContextForTests;
import brooklyn.util.config.ConfigBag;
import brooklyn.util.exceptions.Exceptions;
@@ -84,7 +85,7 @@ public abstract class AcmeEntitlementManagerTestFixture {
Entitlements.setEntitlementContext(entitlementContext);
Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.ROOT, null));
Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.SEE_ENTITY, app));
- Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, "any-eff")));
+ Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.SEE_SENSOR, EntityAndItem.of(app, "any-sensor")));
// and can invoke methods
confirmEffectorEntitlement(false);
@@ -101,7 +102,7 @@ public abstract class AcmeEntitlementManagerTestFixture {
Entitlements.setEntitlementContext(entitlementContext);
Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.ROOT, null));
Assert.assertTrue(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.SEE_ENTITY, app));
- Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, "any-eff")));
+ Assert.assertFalse(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
Assert.assertTrue(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.SEE_SENSOR, EntityAndItem.of(app, "any-sensor")));
// and cannot invoke methods
confirmEffectorEntitlement(false);
@@ -118,7 +119,7 @@ public abstract class AcmeEntitlementManagerTestFixture {
Entitlements.setEntitlementContext(entitlementContext);
Assert.assertTrue(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.ROOT, null));
Assert.assertTrue(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.SEE_ENTITY, app));
- Assert.assertTrue(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, "any-eff")));
+ Assert.assertTrue(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
Assert.assertTrue(Entitlements.isEntitled(mgmt.getEntitlementManager(), Entitlements.SEE_SENSOR, EntityAndItem.of(app, "any-sensor")));
// and can invoke methods
confirmEffectorEntitlement(true);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java b/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java
index a4f23de..3e6b207 100644
--- a/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java
+++ b/core/src/test/java/brooklyn/management/entitlement/EntitlementsTest.java
@@ -32,6 +32,8 @@ import brooklyn.entity.basic.BasicApplication;
import brooklyn.entity.basic.Entities;
import brooklyn.entity.proxying.EntitySpec;
import brooklyn.management.ManagementContext;
+import brooklyn.management.entitlement.Entitlements.EntityAndItem;
+import brooklyn.management.entitlement.Entitlements.StringAndArgument;
import brooklyn.test.entity.LocalManagementContextForTests;
@Test
@@ -156,7 +158,7 @@ public class EntitlementsTest {
public void testAppSpecificRootEntitlement() {
EntitlementManager root = Entitlements.root();
assertTrue(root.isEntitled(null, Entitlements.SEE_ENTITY, app));
- assertTrue(root.isEntitled(null, Entitlements.INVOKE_EFFECTOR, Entitlements.EntityAndItem.of(app, "any-eff")));
+ assertTrue(root.isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
assertTrue(root.isEntitled(null, Entitlements.SEE_SENSOR, Entitlements.EntityAndItem.of(app, "any-sensor")));
assertTrue(root.isEntitled(null, Entitlements.SEE_SENSOR, Entitlements.EntityAndItem.of(app, "password")));
assertTrue(root.isEntitled(null, Entitlements.DEPLOY_APPLICATION, Entitlements.EntityAndItem.of(app, null)));
@@ -176,7 +178,7 @@ public class EntitlementsTest {
public void testAppSpecificMinimalEntitlement() {
EntitlementManager minimal = Entitlements.minimal();
assertFalse(minimal.isEntitled(null, Entitlements.SEE_ENTITY, app));
- assertFalse(minimal.isEntitled(null, Entitlements.INVOKE_EFFECTOR, Entitlements.EntityAndItem.of(app, "any-eff")));
+ assertFalse(minimal.isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
assertFalse(minimal.isEntitled(null, Entitlements.SEE_SENSOR, Entitlements.EntityAndItem.of(app, "any-sensor")));
assertFalse(minimal.isEntitled(null, Entitlements.SEE_SENSOR, Entitlements.EntityAndItem.of(app, "password")));
assertFalse(minimal.isEntitled(null, Entitlements.DEPLOY_APPLICATION, Entitlements.EntityAndItem.of(app, null)));
@@ -196,7 +198,7 @@ public class EntitlementsTest {
public void testAppSpecificReadOnlyEntitlement() {
EntitlementManager readOnly = Entitlements.readOnly();
assertTrue(readOnly.isEntitled(null, Entitlements.SEE_ENTITY, app));
- assertFalse(readOnly.isEntitled(null, Entitlements.INVOKE_EFFECTOR, Entitlements.EntityAndItem.of(app, "any-eff")));
+ assertFalse(readOnly.isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
assertTrue(readOnly.isEntitled(null, Entitlements.SEE_SENSOR, Entitlements.EntityAndItem.of(app, "any-sensor")));
assertFalse(readOnly.isEntitled(null, Entitlements.SEE_SENSOR, Entitlements.EntityAndItem.of(app, "password")));
assertFalse(readOnly.isEntitled(null, Entitlements.DEPLOY_APPLICATION, Entitlements.EntityAndItem.of(app, null)));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java b/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java
index c13fe31..d380e6f 100644
--- a/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java
+++ b/core/src/test/java/brooklyn/management/entitlement/EntityEntitlementTest.java
@@ -35,6 +35,7 @@ import brooklyn.entity.proxying.EntitySpec;
import brooklyn.location.Location;
import brooklyn.management.ManagementContext;
import brooklyn.management.entitlement.Entitlements.EntityAndItem;
+import brooklyn.management.entitlement.Entitlements.StringAndArgument;
import brooklyn.management.internal.LocalManagementContext;
import brooklyn.test.entity.LocalManagementContextForTests;
import brooklyn.util.config.ConfigBag;
@@ -66,7 +67,7 @@ public class EntityEntitlementTest {
// default "root" access allows ROOT permission, and invoke effector, etc
Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.ROOT, null));
Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.SEE_ENTITY, app));
- Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, "any-eff")));
+ Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.SEE_SENSOR, EntityAndItem.of(app, "any-sensor")));
// and can invoke methods, without any user/login registered
confirmEffectorEntitlement(true);
@@ -79,7 +80,7 @@ public class EntityEntitlementTest {
Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.ROOT, null));
Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.SEE_ENTITY, app));
- Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, "any-eff")));
+ Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.SEE_SENSOR, EntityAndItem.of(app, "any-sensor")));
confirmEffectorEntitlement(true);
@@ -117,7 +118,7 @@ public class EntityEntitlementTest {
Assert.assertFalse(mgmt.getEntitlementManager().isEntitled(null, Entitlements.ROOT, null));
Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.SEE_ENTITY, app));
- Assert.assertFalse(mgmt.getEntitlementManager().isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, "any-eff")));
+ Assert.assertFalse(mgmt.getEntitlementManager().isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
Assert.assertTrue(mgmt.getEntitlementManager().isEntitled(null, Entitlements.SEE_SENSOR, EntityAndItem.of(app, "any-sensor")));
confirmEffectorEntitlement(false);
@@ -130,7 +131,7 @@ public class EntityEntitlementTest {
Assert.assertFalse(mgmt.getEntitlementManager().isEntitled(null, Entitlements.ROOT, null));
Assert.assertFalse(mgmt.getEntitlementManager().isEntitled(null, Entitlements.SEE_ENTITY, app));
- Assert.assertFalse(mgmt.getEntitlementManager().isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, "any-eff")));
+ Assert.assertFalse(mgmt.getEntitlementManager().isEntitled(null, Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, StringAndArgument.of("any-eff", null))));
Assert.assertFalse(mgmt.getEntitlementManager().isEntitled(null, Entitlements.SEE_SENSOR, EntityAndItem.of(app, "any-sensor")));
confirmEffectorEntitlement(false);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/usage/rest-server/src/main/java/brooklyn/rest/resources/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/ApplicationResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/ApplicationResource.java
index 9511ebe..c9f42ae 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/ApplicationResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/ApplicationResource.java
@@ -60,6 +60,7 @@ import brooklyn.management.Task;
import brooklyn.management.entitlement.EntitlementPredicates;
import brooklyn.management.entitlement.Entitlements;
import brooklyn.management.entitlement.Entitlements.EntityAndItem;
+import brooklyn.management.entitlement.Entitlements.StringAndArgument;
import brooklyn.management.internal.EntityManagementUtils;
import brooklyn.management.internal.EntityManagementUtils.CreationResult;
import brooklyn.rest.api.ApplicationApi;
@@ -281,7 +282,8 @@ public class ApplicationResource extends AbstractBrooklynRestResource implements
CreationResult<? extends Application, Void> result = EntityManagementUtils.createStarting(mgmt(), at);
Application app = result.get();
- if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app, Startable.START.getName()))) {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, EntityAndItem.of(app,
+ StringAndArgument.of(Startable.START.getName(), null)))) {
throw WebResourceUtils.unauthorized("User '%s' is not authorized to start application %s",
Entitlements.getEntitlementContext().user(), at.getType());
}
@@ -358,7 +360,8 @@ public class ApplicationResource extends AbstractBrooklynRestResource implements
@Override
public Response delete(String application) {
Application app = brooklyn().getApplication(application);
- if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, Entitlements.EntityAndItem.of(app, Entitlements.LifecycleEffectors.DELETE))) {
+ if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.INVOKE_EFFECTOR, Entitlements.EntityAndItem.of(app,
+ StringAndArgument.of(Entitlements.LifecycleEffectors.DELETE, null)))) {
throw WebResourceUtils.unauthorized("User '%s' is not authorized to delete application %s",
Entitlements.getEntitlementContext().user(), app);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/usage/rest-server/src/main/java/brooklyn/rest/resources/EffectorResource.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/resources/EffectorResource.java b/usage/rest-server/src/main/java/brooklyn/rest/resources/EffectorResource.java
index dc76de4..1ee4cf4 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/resources/EffectorResource.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/resources/EffectorResource.java
@@ -37,6 +37,7 @@ import brooklyn.entity.Effector;
import brooklyn.entity.basic.EntityLocal;
import brooklyn.management.Task;
import brooklyn.management.entitlement.Entitlements;
+import brooklyn.management.entitlement.Entitlements.StringAndArgument;
import brooklyn.management.internal.EffectorUtils;
import brooklyn.rest.api.EffectorApi;
import brooklyn.rest.domain.EffectorSummary;
@@ -61,7 +62,7 @@ public class EffectorResource extends AbstractBrooklynRestResource implements Ef
@Override
public boolean apply(@Nullable Effector<?> input) {
return Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.INVOKE_EFFECTOR,
- Entitlements.EntityAndItem.of(entity, input.getName()));
+ Entitlements.EntityAndItem.of(entity, StringAndArgument.of(input.getName(), null)));
}
})
.transform(new Function<Effector<?>, EffectorSummary>() {
@@ -83,7 +84,7 @@ public class EffectorResource extends AbstractBrooklynRestResource implements Ef
if (effector.isAbsentOrNull()) {
throw WebResourceUtils.notFound("Entity '%s' has no effector with name '%s'", entityToken, effectorName);
} else if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.INVOKE_EFFECTOR,
- Entitlements.EntityAndItem.of(entity, effector.get().getName()))) {
+ Entitlements.EntityAndItem.of(entity, StringAndArgument.of(effector.get().getName(), null)))) {
throw WebResourceUtils.unauthorized("User '%s' is not authorized to invoke effector %s on entity %s",
Entitlements.getEntitlementContext().user(), effector.get().getName(), entity);
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3ff0e799/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java b/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java
index 5ddf037..b2fd4a5 100644
--- a/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java
+++ b/usage/rest-server/src/main/java/brooklyn/rest/util/BrooklynRestResourceUtils.java
@@ -59,6 +59,7 @@ import brooklyn.location.LocationRegistry;
import brooklyn.management.ManagementContext;
import brooklyn.management.Task;
import brooklyn.management.entitlement.Entitlements;
+import brooklyn.management.entitlement.Entitlements.StringAndArgument;
import brooklyn.policy.Policy;
import brooklyn.policy.basic.AbstractPolicy;
import brooklyn.rest.domain.ApplicationSpec;
@@ -438,7 +439,8 @@ public class BrooklynRestResourceUtils {
public Task<?> expunge(final Entity entity, final boolean release) {
if (mgmt.getEntitlementManager().isEntitled(Entitlements.getEntitlementContext(),
- Entitlements.INVOKE_EFFECTOR, Entitlements.EntityAndItem.of(entity, "expunge"))) {
+ Entitlements.INVOKE_EFFECTOR, Entitlements.EntityAndItem.of(entity,
+ StringAndArgument.of("expunge", MutableMap.of("release", release))))) {
return mgmt.getExecutionManager().submit(
MutableMap.of("displayName", "expunging " + entity, "description", "REST call to expunge entity "
+ entity.getDisplayName() + " (" + entity + ")"), new Runnable() {
[11/11] incubator-brooklyn git commit: This closes #383
Posted by he...@apache.org.
This closes #383
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/92e9d0bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/92e9d0bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/92e9d0bc
Branch: refs/heads/master
Commit: 92e9d0bcc8d40edb3aca7e05683da48d8c710d8a
Parents: 404c685 3b8e5eb
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Feb 6 12:47:46 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Feb 6 12:47:46 2015 +0000
----------------------------------------------------------------------
.../api/AssemblyTemplateSpecInstantiator.java | 5 ++
.../catalog/internal/BasicBrooklynCatalog.java | 13 ++--
.../camp/lite/TestAppAssemblyInstantiator.java | 6 ++
.../BrooklynAssemblyTemplateInstantiator.java | 23 +++++--
.../BrooklynComponentTemplateResolver.java | 14 +---
.../brooklyn/catalog/CatalogYamlEntityTest.java | 69 ++++++++++++++++++++
6 files changed, 105 insertions(+), 25 deletions(-)
----------------------------------------------------------------------