From 9ea8a5b9173aaa80f662f87658a9714259415c9d Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 1 Sep 2022 16:28:25 +0200
Subject: [PATCH] Added support for authorization-utils

---
 CHANGELOG.md                                  |  2 +-
 pom.xml                                       |  3 +-
 .../executor/rest/RequestFilter.java          | 61 +++++++++++++++++++
 3 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/org/gcube/vremanagement/executor/rest/RequestFilter.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90fba1d..b515ec3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for Smart Executor Service
 
-## [v3.0.1-SNAPSHOT]
+## [v3.1.0-SNAPSHOT]
 
 - Ported service to authorization-utils [#22871]
 
diff --git a/pom.xml b/pom.xml
index 6780dec..e5ea0f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.vremanagement</groupId>
 	<artifactId>smart-executor</artifactId>
-	<version>3.0.1-SNAPSHOT</version>
+	<version>3.1.0-SNAPSHOT</version>
 	<name>SmartExecutor</name>
 	<description>Smart Executor Service allows to launch recurrent tasks such as task for infrastructure management, healthy monitoring etc.</description>
 	<packaging>war</packaging>
@@ -44,6 +44,7 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>authorization-utils</artifactId>
+			<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>
diff --git a/src/main/java/org/gcube/vremanagement/executor/rest/RequestFilter.java b/src/main/java/org/gcube/vremanagement/executor/rest/RequestFilter.java
new file mode 100644
index 0000000..abcd132
--- /dev/null
+++ b/src/main/java/org/gcube/vremanagement/executor/rest/RequestFilter.java
@@ -0,0 +1,61 @@
+package org.gcube.vremanagement.executor.rest;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.ContainerResponseContext;
+import javax.ws.rs.container.ContainerResponseFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.ext.Provider;
+
+import org.gcube.common.authorization.library.provider.AccessTokenProvider;
+import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+import org.gcube.common.authorization.utils.manager.SecretManager;
+import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
+import org.gcube.common.authorization.utils.secret.GCubeSecret;
+import org.gcube.common.authorization.utils.secret.JWTSecret;
+import org.gcube.common.authorization.utils.secret.Secret;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+@Provider
+@PreMatching
+public class RequestFilter implements ContainerRequestFilter, ContainerResponseFilter {
+	
+	private final static Logger logger = LoggerFactory.getLogger(RequestFilter.class);
+	
+	@Override
+	public void filter(ContainerRequestContext requestContext) throws IOException {
+		logger.trace("PreMatching RequestFilter");
+		
+		SecretManagerProvider.instance.reset();
+		SecretManager secretManager = new SecretManager();
+		
+		String token = AccessTokenProvider.instance.get();
+		if(token!=null) {
+			Secret secret = new JWTSecret(token);
+			secretManager.addSecret(secret);
+		}
+		
+		token = SecurityTokenProvider.instance.get();
+		if(token!=null) {
+			Secret secret = new GCubeSecret(token);
+			secretManager.addSecret(secret);
+		}
+		
+		SecretManagerProvider.instance.set(secretManager);
+		
+	}
+
+	@Override
+	public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+			throws IOException {
+		logger.trace("ResponseFilter");
+		SecretManagerProvider.instance.reset();
+	}
+
+}