From 943dc7065b72ade845813a1abc373e567fa782e5 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 22 Feb 2021 09:49:18 +0100 Subject: [PATCH 1/2] Removed links which should not be there refs #20785 --- .../application/BridgedApplicationConfiguration.java | 2 +- .../application/DefaultApplicationConfiguration.java | 2 +- .../configuration/container/ContainerConfiguration.java | 2 +- .../handlers/container/lifecycle/AccountingManager.java | 2 +- .../smartgears/handlers/container/lifecycle/ProfileBuilder.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/configuration/application/BridgedApplicationConfiguration.java b/src/main/java/org/gcube/smartgears/configuration/application/BridgedApplicationConfiguration.java index 89e99b3..caa3de1 100644 --- a/src/main/java/org/gcube/smartgears/configuration/application/BridgedApplicationConfiguration.java +++ b/src/main/java/org/gcube/smartgears/configuration/application/BridgedApplicationConfiguration.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; /** * * @author Fabio Simeoni - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) */ public class BridgedApplicationConfiguration implements ApplicationConfiguration { diff --git a/src/main/java/org/gcube/smartgears/configuration/application/DefaultApplicationConfiguration.java b/src/main/java/org/gcube/smartgears/configuration/application/DefaultApplicationConfiguration.java index 89e93ff..a4fe514 100644 --- a/src/main/java/org/gcube/smartgears/configuration/application/DefaultApplicationConfiguration.java +++ b/src/main/java/org/gcube/smartgears/configuration/application/DefaultApplicationConfiguration.java @@ -28,7 +28,7 @@ import org.gcube.smartgears.persistence.Persistence; * Includes the list of its client services. * * @author Fabio Simeoni - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ @XmlRootElement(name="application") diff --git a/src/main/java/org/gcube/smartgears/configuration/container/ContainerConfiguration.java b/src/main/java/org/gcube/smartgears/configuration/container/ContainerConfiguration.java index a12fca5..f138d93 100644 --- a/src/main/java/org/gcube/smartgears/configuration/container/ContainerConfiguration.java +++ b/src/main/java/org/gcube/smartgears/configuration/container/ContainerConfiguration.java @@ -32,7 +32,7 @@ import org.gcube.smartgears.persistence.Persistence; * The configuration of the container. * * @author Fabio Simeoni - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) */ @XmlRootElement(name="container") public class ContainerConfiguration { diff --git a/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java b/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java index 73f6802..a879731 100644 --- a/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java +++ b/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/AccountingManager.java @@ -14,7 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) */ @XmlRootElement(name = accounting_management) public class AccountingManager extends ContainerHandler { diff --git a/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/ProfileBuilder.java b/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/ProfileBuilder.java index d8d3b12..05c5ec6 100644 --- a/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/ProfileBuilder.java +++ b/src/main/java/org/gcube/smartgears/handlers/container/lifecycle/ProfileBuilder.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; /** * @author Fabio Simeoni - * @author Luca Frosini (ISTI - CNR) http://www.lucafrosini.com/ + * @author Luca Frosini (ISTI - CNR) * */ public class ProfileBuilder { From 0ab8e327cfaefff25bb7f9a4e30d25a8719f48ae Mon Sep 17 00:00:00 2001 From: Lucio Lelii Date: Mon, 22 Feb 2021 10:09:11 +0100 Subject: [PATCH 2/2] Update 'src/main/java/org/gcube/smartgears/handlers/application/request/RequestValidator.java' removed call redirect when not authorized --- .../handlers/application/request/RequestValidator.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/handlers/application/request/RequestValidator.java b/src/main/java/org/gcube/smartgears/handlers/application/request/RequestValidator.java index 97d6955..4ba8831 100644 --- a/src/main/java/org/gcube/smartgears/handlers/application/request/RequestValidator.java +++ b/src/main/java/org/gcube/smartgears/handlers/application/request/RequestValidator.java @@ -98,10 +98,9 @@ public class RequestValidator extends RequestHandler { if (token == null && scope==null){ log.warn("rejecting call to {}, authorization required",context.name(),token); - 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"); - }else { + //if (call.context().container().configuration().authenticationEnpoint()==null){ + RequestError.request_not_authorized_error.fire(context.name()+": authorization required"); + /*}else { 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()); //call.response().setHeader("Allowed-Contexts", call.context().container().configuration().allowedContexts().toString()); @@ -110,7 +109,7 @@ public class RequestValidator extends RequestHandler { } catch (IOException e) { log.error("errror redirecting call",e ); } - } + }*/ } }