Develop

Dockerfile

@@ -1,5 +1,17 @@
+### Build using Maven ###
+FROM maven:3.8-jdk-11-slim AS maven
+
+COPY pom.xml /tmp/
+COPY . /tmp/
+
+WORKDIR /tmp/
+
+## run maven package ##
+RUN mvn package -U -DskipTests
+
+
 FROM openjdk:11
-ARG JAR_FILE=target/*.jar
-COPY ${JAR_FILE} intelcomp-catalogue.jar
+
+COPY --from=maven /tmp/target/*.jar /intelcomp-catalogue.jar
 ENTRYPOINT ["java","-jar","/intelcomp-catalogue.jar"]
 

pom.xml

@@ -5,18 +5,19 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.6</version>
+		<version>2.5.7</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>eu.intelcomp</groupId>
 	<artifactId>catalogue</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>intelcomp</name>
 	<description>Intelcomp Catalogue Project</description>
 	<properties>
 		<java.version>11</java.version>
-		<registry-core.version>2.3.7</registry-core.version>
+		<registry-core.version>2.7.3</registry-core.version>
+		<elasticsearch.version>7.17.14</elasticsearch.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -46,16 +47,35 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-oauth2-client</artifactId>
-			<version>2.6.1</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
-			<version>2.6.1</version>
+		</dependency>
+
+		<!-- Redis Session -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-data-redis</artifactId>
 		</dependency>
 
 		<dependency>
@@ -78,7 +98,7 @@
 		<dependency>
 			<groupId>gr.athenarc</groupId>
 			<artifactId>catalogue</artifactId>
-			<version>3.0.0</version>
+			<version>5.0.2</version>
 		</dependency>
 
 		<dependency>
@@ -92,9 +112,9 @@
 
 	<repositories>
 		<repository>
-			<id>omtd-snapshots</id>
+			<id>madgik-snapshots</id>
 			<layout>default</layout>
-			<url>https://repo.openminted.eu/content/repositories/snapshots/</url>
+			<url>https://repo.madgik.di.uoa.gr/content/repositories/snapshots/</url>
 			<releases>
 				<enabled>false</enabled>
 			</releases>
@@ -103,9 +123,9 @@
 			</snapshots>
 		</repository>
 		<repository>
-			<id>omtd-releases</id>
+			<id>madgik-releases</id>
 			<layout>default</layout>
-			<url>https://repo.openminted.eu/content/repositories/releases</url>
+			<url>https://repo.madgik.di.uoa.gr/content/repositories/releases</url>
 			<releases>
 				<enabled>true</enabled>
 			</releases>
@@ -165,14 +185,46 @@
 					</dependency>
 				</dependencies>
 			</plugin>
+			<plugin>
+				<groupId>cz.habarta.typescript-generator</groupId>
+				<artifactId>typescript-generator-maven-plugin</artifactId>
+				<version>2.16.538</version>
+				<executions>
+					<execution>
+						<id>generate</id>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<phase>process-classes</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<jsonLibrary>jackson2</jsonLibrary>
+					<classPatterns>
+						<pattern>eu.intelcomp.xsd2java.**</pattern>
+						<pattern>eu.intelcomp.catalogue.domain.**</pattern>
+					</classPatterns>
+					<customTypeNamingFunction>
+						function(name, simpleName) { return name; }
+					</customTypeNamingFunction>
+					<outputFile>target/domain.ts</outputFile>
+					<outputKind>module</outputKind>
+					<outputFileType>implementationFile</outputFileType>
+					<mapEnum>asEnum</mapEnum>
+					<mapClasses>asClasses</mapClasses>
+				</configuration>
+			</plugin>
 		</plugins>
 		<resources>
 			<resource>
 				<directory>src/main/resources</directory>
 				<filtering>true</filtering>
+				<includes>
+					<include>**/application.yml</include>
+					<include>**/resourceTypes/</include>
+				</includes>
 				<excludes>
-					<exclude>**/application.yml</exclude>
-					<exclude>**/registry.properties</exclude>
+					<exclude>**/application.properties</exclude>
 				</excludes>
 			</resource>
 		</resources>

src/main/java/eu/intelcomp/catalogue/IntelcompApplication.java

@@ -2,13 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@SpringBootApplication
 public class IntelcompApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(IntelcompApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(IntelcompApplication.class, args);
+    }
 
 }

src/main/java/eu/intelcomp/catalogue/aspects/SecurityAspect.java

@@ -0,0 +1,80 @@
+package eu.intelcomp.catalogue.aspects;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+
+@Aspect
+@Component
+public class SecurityAspect {
+
+    private static final Logger logger = LoggerFactory.getLogger(SecurityAspect.class);
+
+    public SecurityAspect() {
+    }
+
+    @Before(value = "execution(* gr.athenarc.catalogue.controller.GenericItemController.create(String,..)) && args(resourceType)", argNames = "resourceType")
+    void beforeCreate(String resourceType) {
+        authorize(resourceType);
+    }
+
+    @Before(value = "(execution(* gr.athenarc.catalogue.controller.GenericItemController.update(String, String, ..)) ||" +
+            "execution(* gr.athenarc.catalogue.controller.GenericItemController.delete(String, String, ..))) " +
+            "&& args(id, resourceType,..)", argNames = "id,resourceType")
+    void beforeUpdate_Delete(String id, String resourceType) {
+        authorize(resourceType);
+    }
+
+    void authorize(String resourceType) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        boolean authorized = false;
+        if (authentication.getAuthorities().contains(new SimpleGrantedAuthority("ADMIN"))) {
+            return;
+        }
+        switch (resourceType) {
+            case "tool":
+                authorized = authorizeAiTool(authentication);
+                break;
+            case "ai_model":
+                authorized = authorizeAiModel(authentication);
+                break;
+            case "dataset_type":
+                authorized = authorizeDatasetType(authentication);
+                break;
+            case "dataset_instance":
+                authorized = authorizeDatasetInstance(authentication);
+                break;
+            default:
+                authorized = authentication.getAuthorities().contains(new SimpleGrantedAuthority("ADMIN"));
+        }
+        if (!authorized) {
+            throw new AccessDeniedException("Forbidden");
+        }
+    }
+
+    boolean authorizeDatasetType(Authentication authentication) {
+        SimpleGrantedAuthority[] authorities = {new SimpleGrantedAuthority("OPERATOR_DATASET-INGESTOR")};
+        return Arrays.stream(authorities).anyMatch(authority -> authentication.getAuthorities().contains(authority));
+    }
+
+    boolean authorizeDatasetInstance(Authentication authentication) {
+        return authentication.getAuthorities().contains(new SimpleGrantedAuthority("OPERATOR_DATASET-INGESTOR"));
+    }
+
+    boolean authorizeAiTool(Authentication authentication) {
+        return authentication.getAuthorities().contains(new SimpleGrantedAuthority("OPERATOR_DEVELOPER"));
+    }
+
+    boolean authorizeAiModel(Authentication authentication) {
+        return authentication.getAuthorities().contains(new SimpleGrantedAuthority("OPERATOR_DEVELOPER"));
+    }
+}

src/main/java/eu/intelcomp/catalogue/config/AuthSuccessHandler.java

@@ -1,10 +1,10 @@
 package eu.intelcomp.catalogue.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 
@@ -14,19 +14,18 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.time.Instant;
-import java.util.Date;
 
 @Component
 public class AuthSuccessHandler implements AuthenticationSuccessHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(AuthSuccessHandler.class);
 
-    private final ApplicationProperties applicationProperties;
+    private final IntelcompProperties intelcompProperties;
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
     @Autowired
-    public AuthSuccessHandler(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
+    public AuthSuccessHandler(IntelcompProperties intelcompProperties) {
+        this.intelcompProperties = intelcompProperties;
     }
 
     @Override
@@ -36,28 +35,13 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
 
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
-        Cookie cookie = new Cookie("AccessToken", ((OidcUser) authentication.getPrincipal()).getIdToken().getTokenValue());
-        cookie.setMaxAge(createCookieMaxAge(authentication));
+        Cookie cookie = new Cookie("AccessToken", "deprecated");
         cookie.setPath("/");
-//        cookie.setSecure(true);
 
+        logger.debug("Assigning Cookie: {}", objectMapper.writeValueAsString(cookie));
         response.addCookie(cookie);
-        response.sendRedirect(applicationProperties.getLoginRedirect());
-    }
-
-    private int createCookieMaxAge(Authentication authentication) {
-        Integer age = getExp(authentication);
-        return age != null ? age : 3600;
-    }
-
-    private Integer getExp(Authentication authentication) {
-        OidcUser user = ((OidcUser) authentication.getPrincipal());
-        if (user.getAttribute("exp") instanceof Instant) {
-            Instant exp = user.getAttribute("exp");
-            int age = (int) (exp.getEpochSecond() - (new Date().getTime() / 1000));
-            return age;
-        }
-        return null;
+        logger.debug("Authentication Successful - Redirecting to: {}", intelcompProperties.getLoginRedirect());
+        response.sendRedirect(intelcompProperties.getLoginRedirect());
     }
 }
 

src/main/java/eu/intelcomp/catalogue/config/CompleteLogoutSuccessHandler.java

@@ -23,12 +23,12 @@ public class CompleteLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler
 
     private final String OPENID_CONFIGURATION = "/.well-known/openid-configuration";
     private final String END_SESSION_ENDPOINT = "end_session_endpoint";
-    private final ApplicationProperties applicationProperties;
+    private final IntelcompProperties intelcompProperties;
     private final RestTemplate restTemplate = new RestTemplate();
 
     @Autowired
-    public CompleteLogoutSuccessHandler(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
+    public CompleteLogoutSuccessHandler(IntelcompProperties intelcompProperties) {
+        this.intelcompProperties = intelcompProperties;
     }
 
     @Override
@@ -44,9 +44,9 @@ public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse resp
         String logoutEndpoint = getLogoutEndpoint(url);
         String logoutUrl;
         if (logoutEndpoint != null) {
-            logoutUrl = String.format("%s?redirect_uri=%s", logoutEndpoint, applicationProperties.getLogoutRedirect());
+            logoutUrl = String.format("%s?redirect_uri=%s", logoutEndpoint, intelcompProperties.getLogoutRedirect());
         } else {
-            logoutUrl = applicationProperties.getLogoutRedirect();
+            logoutUrl = intelcompProperties.getLogoutRedirect();
         }
         response.sendRedirect(logoutUrl);
         super.onLogoutSuccess(request, response, authentication);

src/main/java/eu/intelcomp/catalogue/config/IntelcompConfiguration.java

@@ -1,29 +1,12 @@
 package eu.intelcomp.catalogue.config;
 
-import eu.openminted.registry.core.controllers.ResourceSyncController;
-import gr.athenarc.catalogue.CatalogueApplication;
-import gr.athenarc.catalogue.config.CatalogueLibConfiguration;
-import gr.athenarc.catalogue.config.LibConfiguration;
-import gr.athenarc.catalogue.config.RegistryCoreConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 
 @Configuration
-@ComponentScan(value = {
-        "gr.athenarc",
-        "eu.openminted.registry.core",
-},
-excludeFilters = {
-        @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = CatalogueApplication.class),
-        @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = LibConfiguration.class), // TODO: remove if lib is fixed
-        @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = RegistryCoreConfiguration.class),
-        @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = ResourceSyncController.class)
-})
-public class IntelcompConfiguration implements CatalogueLibConfiguration {
-
-    @Override
-    public String generatedClassesPackageName() {
-        return "eu.intelcomp.xsd2java";
-    }
+@EnableConfigurationProperties(IntelcompProperties.class)
+@ComponentScan(value = {"eu.openminted.registry.core"}, excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = eu.openminted.registry.core.controllers.GenericController.class)})
+public class IntelcompConfiguration {
 }