Skip to content

Checking DEPLOY_APPLICATION entitlement before computing EntitySpec #1429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jcabrerizo wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −0
Open

Checking DEPLOY_APPLICATION entitlement before computing EntitySpec #1429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .../rest-resources/src/main/java/org/apache/brooklyn/rest/resources/ApplicationResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,10 @@ public Response createFromYamlAndFormatAndAppId(String yaml, String format, Stri
}

protected Response createFromYaml(String yaml, String format, Optional<String> appId) {
// Pre check DEPLOY_APPLICATION before computing `spec`
if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.DEPLOY_APPLICATION, null)) {
throw WebResourceUtils.forbidden(AUTHORIZATION_ERR_MSG, Entitlements.getEntitlementContext().user(), yaml);
}
// First of all, see if it's a URL
Preconditions.checkNotNull(yaml, "Blueprint must not be null");
URI uri = null;
Expand Down Expand Up @@ -545,6 +549,10 @@ public Response createWithFormatMultipart(String plan, String format) {
}

public Response createWithFormat(String inputToAutodetectType, String format) {
// Pre check DEPLOY_APPLICATION before computing `spec`
if (!Entitlements.isEntitled(mgmt().getEntitlementManager(), Entitlements.DEPLOY_APPLICATION, null)) {
throw WebResourceUtils.forbidden(AUTHORIZATION_ERR_MSG, Entitlements.getEntitlementContext().user(), inputToAutodetectType);
}
if (format!=null) format = format.trim();
log.debug("Creating app from autodetecting input");

Expand Down