Feature/FF-218

.github/workflows/tests.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - 'src/**'
       - 'pom.xml'
+      - '.github/workflows/tests.yml'
 
 jobs:
   Run_all_tests:
@@ -25,8 +26,13 @@ jobs:
           docker create -p 27017:27017 --name FileFighterDB mongo:latest
           docker start FileFighterDB
       -
-        name: Run Tests and update Sonar
-        run: mvn clean verify sonar:sonar -s ./settings.xml
+        name: Run Tests and update Sonar (import cert first)
+        run: |
+          echo "${{ secrets.SSL_CERT }}" > filefighter.de_ssl_certificate.cer
+          yes yes | keytool -import -alias filefighterde -file filefighter.de_ssl_certificate.cer  -storetype JKS -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit
+          mvn clean verify sonar:sonar -s ./settings.xml
+          rm filefighter.de_ssl_certificate.cer
+          keytool -delete -alias filefighterde -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit
         env:
           SONAR_LOGIN: ${{ secrets.SONAR_LOGIN }}
           SONAR_PASSWORD: ${{ secrets.SONAR_PASSWORD }}

.gitignore

@@ -30,4 +30,4 @@ build/
 !**/src/test/**/build/
 
 ### VS Code ###
-.vscode/
+.vscode/

README.md

@@ -1,11 +1,11 @@
 # RestApi
-Backend REST API for FileFighter </br>
+Backend REST API for FileFighter  
 ![Docker Release](https://img.shields.io/github/v/release/filefighter/restapi?color=dark-green&label=Stable%20Version&logo=docker&style=for-the-badge)
-![Docker Pulls](https://img.shields.io/docker/pulls/filefighter/rest?logo=docker&style=for-the-badge)</br>
-[![Quality Gate Status](http://filefighter.ddns.net:9000/api/project_badges/measure?project=de.filefighter%3Arest&metric=alert_status)](http://filefighter.ddns.net:9000/dashboard?id=de.filefighter%3Arest)
-[![Coverage](http://filefighter.ddns.net:9000/api/project_badges/measure?project=de.filefighter%3Arest&metric=coverage)](http://filefighter.ddns.net:9000/dashboard?id=de.filefighter%3Arest)
-[![Lines of Code](http://filefighter.ddns.net:9000/api/project_badges/measure?project=de.filefighter%3Arest&metric=ncloc)](http://filefighter.ddns.net:9000/dashboard?id=de.filefighter%3Arest)
-[![Security Rating](http://filefighter.ddns.net:9000/api/project_badges/measure?project=de.filefighter%3Arest&metric=security_rating)](http://filefighter.ddns.net:9000/dashboard?id=de.filefighter%3Arest)</br>
+![Docker Pulls](https://img.shields.io/docker/pulls/filefighter/rest?logo=docker&style=for-the-badge)  
+[![Quality Gate Status](http://sonar.filefighter.de/api/project_badges/measure?project=de.filefighter%3Arest&metric=alert_status)](https://sonar.filefighter.de/dashboard?id=de.filefighter%3Arest)
+[![Coverage](http://sonar.filefighter.de/api/project_badges/measure?project=de.filefighter%3Arest&metric=coverage)](https://sonar.filefighter.de/dashboard?id=de.filefighter%3Arest)
+[![Lines of Code](http://sonar.filefighter.de/api/project_badges/measure?project=de.filefighter%3Arest&metric=ncloc)](https://sonar.filefighter.de/dashboard?id=de.filefighter%3Arest)
+[![Security Rating](http://sonar.filefighter.de/api/project_badges/measure?project=de.filefighter%3Arest&metric=security_rating)](https://sonar.filefighter.de/dashboard?id=de.filefighter%3Arest)  
 ![Latest Release](https://github.com/FileFighter/RestApi/workflows/Latest%20Release/badge.svg)
 ![Stable Release](https://github.com/FileFighter/RestApi/workflows/Stable%20Release/badge.svg)
 ![Tests](https://github.com/FileFighter/RestApi/workflows/Tests/badge.svg)

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>de.filefighter</groupId>
     <artifactId>rest</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
     <name>RestApi</name>
     <description>RestApi for FileFighter</description>
 
@@ -180,10 +180,8 @@
                                     </includes>
                                     <excludes>
                                         <!-- NOT IMPLEMENTED YET -->
-                                        <!-- TODO: remove fs -->
                                         <exclude>*FileSystemRestService</exclude>
                                         <exclude>*PermissionRestService</exclude>
-                                        <exclude>*FileSystemBusinessService</exclude>
                                     </excludes>
                                     <limits>
                                         <limit>

settings.xml

@@ -10,7 +10,7 @@
             </activation>
             <properties>
                 <sonar.host.url>
-                  http://filefighter.ddns.net:9000
+                  https://sonar.filefighter.de
                 </sonar.host.url>
                 <sonar.login>${env.SONAR_LOGIN}</sonar.login>
                 <sonar.password>${env.SONAR_PASSWORD}</sonar.password>

src/main/java/de/filefighter/rest/configuration/CorsConfig.java

@@ -0,0 +1,36 @@
+package de.filefighter.rest.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+import java.util.ArrayList;
+
+@Configuration
+public class CorsConfig {
+
+    @Bean
+    @Profile({"dev","stage"})
+    public CorsFilter corsFilter() {
+        final CorsConfiguration config = new CorsConfiguration().applyPermitDefaultValues();
+        ArrayList<String> allowedOrigins = new ArrayList<>();
+        allowedOrigins.add("*");
+        config.setAllowedOrigins(allowedOrigins);
+
+        ArrayList<String> allowedMethods = new ArrayList<>();
+        allowedMethods.add("HEAD");
+        allowedMethods.add("GET");
+        allowedMethods.add("POST");
+        allowedMethods.add("PUT");
+        allowedMethods.add("DELETE");
+        allowedMethods.add("OPTIONS");
+        config.setAllowedMethods(allowedMethods);
+
+        final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", config);
+        return new CorsFilter(source);
+    }
+}

src/main/java/de/filefighter/rest/configuration/PrepareDataBase.java

@@ -21,8 +21,8 @@
 @Configuration
 public class PrepareDataBase {
 
-    private static final String MESSAGE_ON_SUCCESS = " was successful.";
-    private static final String MESSAGE_ON_FAILURE = " failed.";
+    private static final String MESSAGE_ON_SUCCESS = "was successful.";
+    private static final String MESSAGE_ON_FAILURE = "failed.";
 
     @Value("${server.port}")
     int serverPort;
@@ -32,25 +32,26 @@ public class PrepareDataBase {
 
     @Value("${filefighter.date}")
     String date;
-
+
+    @SuppressWarnings("squid:S106")
     @Bean
     @Profile({"dev", "prod"})
     CommandLineRunner veryImportantFileFighterStartScript() {
         return args -> {
             System.out.println();
             System.out.println("-------------------------------< REST API >-------------------------------");
             System.out.println();
-            System.out.println("  _____   _   _          _____   _           _       _                 ");
-            System.out.println(" |  ___| (_) | |   ___  |  ___| (_)   __ _  | |__   | |_    ___   _ __ ");
+            System.out.println("  _____   _   _          _____   _           _       _");
+            System.out.println(" |  ___| (_) | |   ___  |  ___| (_)   __ _  | |__   | |_    ___   _ __");
             System.out.println(" | |_    | | | |  / _ \\ | |_    | |  / _  | | '_ \\  | __|  / _ \\ | '__|");
-            System.out.println(" |  _|   | | | | |  __/ |  _|   | | | (_| | | | | | | |_  |  __/ | |   ");
-            System.out.println(" |_|     |_| |_|  \\___| |_|     |_|  \\__, | |_| |_|  \\__|  \\___| |_|   ");
-            System.out.println("                                     |___/                             ");
-            System.out.println("                  Version v" + version + " Last updated at " + date + "               ");
-            System.out.println("             Developed by Gimleux, Valentin, Open-Schnick.            ");
-            System.out.println("           Development Blog: https://filefighter.github.io            ");
-            System.out.println("       The code can be found at: https://www.github.com/filefighter    ");
-            System.out.println("                   Running on http://localhost:" + serverPort);
+            System.out.println(" |  _|   | | | | |  __/ |  _|   | | | (_| | | | | | | |_  |  __/ | |");
+            System.out.println(" |_|     |_| |_|  \\___| |_|     |_|  \\__, | |_| |_|  \\__|  \\___| |_|");
+            System.out.println("                                     |___/");
+            System.out.println("                 Version v" + version + " Last updated at " + date + "");
+            System.out.println("               Developed by Gimleux, Valentin, Open-Schnick.");
+            System.out.println("               Development Blog: https://blog.filefighter.de");
+            System.out.println("        The code can be found at: https://www.github.com/filefighter");
+            System.out.println("                    Running on http://localhost:" + serverPort);
             System.out.println();
             System.out.println("-------------------------------< REST API >-------------------------------");
             System.out.println();
@@ -83,19 +84,31 @@ CommandLineRunner initDataBaseProd(UserRepository userRepository, FileSystemRepo
                     .groupIds(new long[]{0, 1})
                     .build()));
 
-            log.info("Preloading default fsStructure: {}.", fileSystemRepository.save(FileSystemEntity
-                    .builder()
-                    .createdByUserId(0)
-                    .fileSystemId(0)
-                    .isFile(false)
-                    .path("/")
-                    .itemIds(new long[0])
-                    .lastUpdated(Instant.now().getEpochSecond())
-                    .name("root")
-                    .size(0)
-                    .typeId(FileSystemType.FOLDER.getId())
-                    .visibleForGroupIds(new long[]{-1, 0, 1})
-                    .build()));
+            log.info("Preloading default fsStructure: {} {}.", fileSystemRepository.save(FileSystemEntity
+                            .builder()
+                            .createdByUserId(0)
+                            .fileSystemId(0)
+                            .isFile(false)
+                            .path("/")
+                            .itemIds(new long[0])
+                            .lastUpdated(Instant.now().getEpochSecond())
+                            .name("root")
+                            .size(0)
+                            .typeId(FileSystemType.FOLDER.getId())
+                            .visibleForGroupIds(new long[]{-1, 0, 1})
+                            .itemIds(new long[]{1})
+                            .build()),
+                    fileSystemRepository.save(FileSystemEntity.builder()
+                            .createdByUserId(0)
+                            .fileSystemId(1)
+                            .isFile(true)
+                            .lastUpdated(Instant.now().getEpochSecond())
+                            .name("dummyFile.txt")
+                            .size(420)
+                            .typeId(FileSystemType.TEXT.getId())
+                            .editableFoGroupIds(new long[]{0})
+                            .visibleForGroupIds(new long[]{0})
+                            .build()));
 
             log.info("Inserting Users {}", (userRepository.findAll().size() == 1 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
             log.info("Inserting fsItems {}", (fileSystemRepository.findAll().size() == 1 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
@@ -123,7 +136,7 @@ CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepo
                             .lowercaseUsername("user1")
                             .password("12345")
                             .refreshToken("rft")
-                            .groupIds(new long[]{-1})
+                            .groupIds(new long[]{0})
                             .build()));
 
             log.info("Preloading default tokens: {} {}",
@@ -140,22 +153,33 @@ CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepo
                             .validUntil(Instant.now().getEpochSecond() + AccessTokenBusinessService.ACCESS_TOKEN_DURATION_IN_SECONDS)
                             .build()));
 
-            log.info("Preloading default fsItems: {} {}.",
+            log.info("Preloading default fsItems: {} {} {}.",
                     fileSystemRepository.save(FileSystemEntity.builder()
                             .createdByUserId(0)
                             .fileSystemId(0)
                             .isFile(false)
                             .path("/")
-                            .itemIds(new long[]{1})
+                            .itemIds(new long[]{2})
                             .lastUpdated(Instant.now().getEpochSecond())
-                            .name("root")
+                            .name("HOME_User")
+                            .size(420)
+                            .typeId(FileSystemType.FOLDER.getId())
+                            .visibleForGroupIds(new long[]{0, 1})
+                            .build()),
+                    fileSystemRepository.save(FileSystemEntity.builder()
+                            .createdByUserId(1)
+                            .fileSystemId(1)
+                            .isFile(false)
+                            .path("/")
+                            .lastUpdated(Instant.now().getEpochSecond())
+                            .name("HOME_User1")
                             .size(420)
                             .typeId(FileSystemType.FOLDER.getId())
                             .visibleForGroupIds(new long[]{-1, 0, 1})
                             .build()),
                     fileSystemRepository.save(FileSystemEntity.builder()
                             .createdByUserId(0)
-                            .fileSystemId(1)
+                            .fileSystemId(2)
                             .isFile(true)
                             .lastUpdated(Instant.now().getEpochSecond())
                             .name("dummyFile.txt")
@@ -165,7 +189,7 @@ CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepo
                             .visibleForGroupIds(new long[]{0})
                             .build()));
 
-            log.info("Inserting FileSystemItems {}", (fileSystemRepository.findAll().size() == 2 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
+            log.info("Inserting FileSystemItems {}", (fileSystemRepository.findAll().size() == 3 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
             log.info("Inserting token {}", (accessTokenRepository.findAll().size() == 2 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
             log.info("Inserting Users {}", (userRepository.findAll().size() == 2 ? MESSAGE_ON_SUCCESS : MESSAGE_ON_FAILURE));
         };

src/main/java/de/filefighter/rest/configuration/RestConfiguration.java

@@ -12,6 +12,6 @@ public class RestConfiguration {
     public static final String DEFAULT_ERROR_URI = "/error";
 
     private RestConfiguration(){
-        // Cannot be inst
+        // Cannot be instantiated.
     }
 }

src/main/java/de/filefighter/rest/domain/common/DtoServiceInterface.java → src/main/java/de/filefighter/rest/domain/common/DTOServiceInterface.java

@@ -1,6 +1,6 @@
 package de.filefighter.rest.domain.common;
 
-public interface DtoServiceInterface<D,E> {
+public interface DTOServiceInterface<D,E> {
     D createDto(E entity);
     E findEntity(D dto);
 }