gCubeSystem
/
common-smartgears
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allowed context retrieved on request

This commit is contained in:
Lucio Lelii 2022-06-10 18:25:19 +02:00
parent 8030b049d0
commit 80f5de688a
4 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/gcube/smartgears/configuration/container/ContainerConfiguration.java
View File

@ -3,12 +3,8 @@ package org.gcube.smartgears.configuration.container;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import javax.xml.bind.annotation.XmlTransient;
import org.gcube.common.validator.ValidationError; import org.gcube.common.validator.ValidationError;
import org.gcube.common.validator.Validator; import org.gcube.common.validator.Validator;
@ -46,9 +42,6 @@ public class ContainerConfiguration {
@NotEmpty @NotNull @NotEmpty @NotNull
private String accountingFallbackLocation; private String accountingFallbackLocation;
@XmlTransient
private Set<String> allowedContext = new HashSet<String>();
private List<ApplicationConfiguration> apps = new ArrayList<ApplicationConfiguration>(); private List<ApplicationConfiguration> apps = new ArrayList<ApplicationConfiguration>();
@ -234,15 +227,6 @@ public class ContainerConfiguration {
return baseConfiguration.getPublicationFrequencyInSeconds(); return baseConfiguration.getPublicationFrequencyInSeconds();
} }
public Set<String> allowedContexts() {
return allowedContext;
}
public void allowedContexts(Set<String> allowedContexts) {
this.allowedContext = allowedContexts;
}
/** /**
* Validates this configuration * Validates this configuration
* *

9
src/main/java/org/gcube/smartgears/handlers/application/request/RequestValidator.java
View File

@ -5,6 +5,8 @@ import static org.gcube.smartgears.handlers.application.request.RequestError.app
import static org.gcube.smartgears.handlers.application.request.RequestError.application_unavailable_error; import static org.gcube.smartgears.handlers.application.request.RequestError.application_unavailable_error;
import static org.gcube.smartgears.handlers.application.request.RequestError.invalid_request_error; import static org.gcube.smartgears.handlers.application.request.RequestError.invalid_request_error;
import java.util.Set;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import org.gcube.common.security.ContextBean; import org.gcube.common.security.ContextBean;
@ -92,10 +94,11 @@ public class RequestValidator extends RequestHandler {
ContextBean bean = new ContextBean(context); ContextBean bean = new ContextBean(context);
ContainerConfiguration conf = appContext.container().configuration(); ContainerConfiguration conf = appContext.container().configuration();
if (!conf.allowedContexts().contains(context) && Set<String> allowedContexts =conf.authorizationProvider().getContexts();
if (!allowedContexts.contains(context) &&
!(conf.authorizeChildrenContext() && bean.is(Type.VRE) !(conf.authorizeChildrenContext() && bean.is(Type.VRE)
&& conf.allowedContexts().contains(bean.enclosingScope().toString()) ) ) { && allowedContexts.contains(bean.enclosingScope().toString()) ) ) {
log.warn("rejecting call to {} in invalid context {}, allowed context are {}",appContext.name(),context,appContext.container().configuration().allowedContexts()); log.warn("rejecting call to {} in invalid context {}, allowed context are {}",appContext.name(),context,allowedContexts);
invalid_request_error.fire(appContext.name()+" cannot be called in scope "+context); invalid_request_error.fire(appContext.name()+" cannot be called in scope "+context);
} }
} }

3
src/main/java/org/gcube/smartgears/managers/ContainerManager.java
View File

@ -111,10 +111,7 @@ public class ContainerManager {
log.error("no valid contexts found, moving the container to failed"); log.error("no valid contexts found, moving the container to failed");
throw new RuntimeException("no valid contexts found, moving the container to failed"); throw new RuntimeException("no valid contexts found, moving the container to failed");
} }
//context.configuration().startTokens().removeAll(tokensToRemove);
context.configuration().allowedContexts(foundContexts);
} }
public void manage(ApplicationContext app) { public void manage(ApplicationContext app) {

2
src/main/java/org/gcube/smartgears/persistence/PersistenceWriter.java
View File

@ -9,5 +9,7 @@ public interface PersistenceWriter {
File writefile(String path); File writefile(String path);
long getFreeSpace(); long getFreeSpace();
String getLocation();
} }