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

Merge branch 'master' of https://code-repo.d4science.org/gCubeSystem/common-smartgears.git

This commit is contained in:
lucio.lelii 2021-03-01 16:22:17 +01:00
parent bc1f02cdb5 0ab8e327cf
commit e8a32631f2
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/smartgears/configuration/application/BridgedApplicationConfiguration.java
View File

@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory;
/** /**
* *
* @author Fabio Simeoni * @author Fabio Simeoni
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR)
*/ */
public class BridgedApplicationConfiguration implements ApplicationConfiguration { public class BridgedApplicationConfiguration implements ApplicationConfiguration {

2
src/main/java/org/gcube/smartgears/configuration/application/DefaultApplicationConfiguration.java
View File

@ -28,7 +28,7 @@ import org.gcube.smartgears.persistence.Persistence;
* Includes the list of its client services. * Includes the list of its client services.
* *
* @author Fabio Simeoni * @author Fabio Simeoni
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR)
* *
*/ */
@XmlRootElement(name="application") @XmlRootElement(name="application")

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

@ -32,7 +32,7 @@ import org.gcube.smartgears.persistence.Persistence;
* The configuration of the container. * The configuration of the container.
* *
* @author Fabio Simeoni * @author Fabio Simeoni
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR)
*/ */
@XmlRootElement(name="container") @XmlRootElement(name="container")
public class ContainerConfiguration { public class ContainerConfiguration {

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

@ -98,10 +98,9 @@ public class RequestValidator extends RequestHandler {
if (token == null && scope==null){ if (token == null && scope==null){
log.warn("rejecting call to {}, authorization required",context.name(),token); log.warn("rejecting call to {}, authorization required",context.name(),token);
if (call.context().container().configuration().authenticationEnpoint()==null){ //if (call.context().container().configuration().authenticationEnpoint()==null){
log.warn("rejecting call to {}, authorization required",context.name(),token); RequestError.request_not_authorized_error.fire(context.name()+": authorization required");
RequestError.request_not_authorized_error.fire(context.name()+": authorization required"); /*}else {
}else {
log.info("authorization enpoint found on configuration, redirecting the call"); log.info("authorization enpoint found on configuration, redirecting the call");
String recallLocation = String.format("http://%s:%d%s", call.context().container().configuration().hostname(), call.context().container().configuration().port(), call.uri()); String recallLocation = String.format("http://%s:%d%s", call.context().container().configuration().hostname(), call.context().container().configuration().port(), call.uri());
//call.response().setHeader("Allowed-Contexts", call.context().container().configuration().allowedContexts().toString()); //call.response().setHeader("Allowed-Contexts", call.context().container().configuration().allowedContexts().toString());
@ -110,7 +109,7 @@ public class RequestValidator extends RequestHandler {
} catch (IOException e) { } catch (IOException e) {
log.error("errror redirecting call",e ); log.error("errror redirecting call",e );
} }
} }*/
} }
} }

2
src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java
View File

@ -14,7 +14,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR)
*/ */
@XmlRootElement(name = accounting_management) @XmlRootElement(name = accounting_management)
public class AccountingManager extends ContainerHandler { public class AccountingManager extends ContainerHandler {

2
src/main/java/org/gcube/smartgears/handlers/container/lifecycle/ProfileBuilder.java
View File

@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
/** /**
* @author Fabio Simeoni * @author Fabio Simeoni
* @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ * @author Luca Frosini (ISTI - CNR)
* *
*/ */
public class ProfileBuilder { public class ProfileBuilder {