Continuous release #69

.github/workflows/build-test-dev-master.yml

@@ -21,5 +21,13 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: | 
             ${{ runner.os }}-maven-
-      - name: Run docker
-        run: docker-compose build
+      - name: Set up JDK 15
+        uses: actions/setup-java@v2
+        with:
+          java-version: '15'
+          distribution: 'adopt'
+      - name: Test code
+        run: |
+          cd scripts
+          ls
+          bash test.sh

.github/workflows/docker-publish-develop.yml

@@ -20,6 +20,11 @@ jobs:
         env:
           CR_PAT: ${{ secrets.CR_PAT }}
 
+      - name: Run tests
+        run: |
+          cd scripts
+          bash test.sh
+
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME
 

.github/workflows/docker-publish-master.yml

@@ -18,6 +18,11 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Run tests
+        run: |
+          cd scripts
+          bash test.sh
+
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME
 

.github/workflows/sonarcloud.yml

@@ -0,0 +1,38 @@
+name: SonarCloud
+on:
+  push:
+    branches: [ master, develop ]
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Set up JDK 14
+        uses: actions/setup-java@v1
+        with:
+          java-version: 14
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Maven packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          cd scripts
+          bash sonarcloud.sh
+

Dockerfile

@@ -1,13 +1,14 @@
-FROM maven:3.6.3-openjdk-14 as build_step
+FROM maven:3.8.1-openjdk-15 as build_step
 
 ADD ./pom.xml ./pom.xml
 RUN mvn dependency:go-offline -B
 
 ADD . /home/vaultionizer/project
+ADD scripts/test.sh test.sh
 ADD scripts/build_project_docker.sh build_project.sh
 RUN bash build_project.sh
 
-FROM openjdk:14-alpine
+FROM openjdk:15-alpine
 COPY --from=build_step /home/vaultionizer/vaultionizer_server.jar /home/vaultionizer/vaultionizer_server.jar
-EXPOSE 443
+EXPOSE 8080
 ENTRYPOINT ["java", "-jar", "/home/vaultionizer/vaultionizer_server.jar"]

README.md

@@ -2,6 +2,9 @@
 
 Hey, welcome to the Github repository for the backend for the [Vaultionizer Android application](https://github.com/Vaultionizer/vault-android-app).
 
+[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=Vaultionizer_vault-server&metric=ncloc)](https://sonarcloud.io/dashboard?id=Vaultionizer_vault-server)[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Vaultionizer_vault-server&metric=alert_status)](https://sonarcloud.io/dashboard?id=Vaultionizer_vault-server)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=Vaultionizer_vault-server&metric=coverage)](https://sonarcloud.io/dashboard?id=Vaultionizer_vault-server)[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=Vaultionizer_vault-server&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=Vaultionizer_vault-server)
+
 The application aims at enabling a user to securely store data online without having to fear the data being analyzed, breached or anything similar. Our goal is to put zero trust into server instances and instead rely solely on the user knowing what to do.
 
 Before reading any further, note that this application is explorative and should not be used in practice (since for debugging purposes, the data is not encrypted yet)!
@@ -16,4 +19,4 @@ All semantic data (like filenames, contents etc.) is stored in a custom (JSON-ba
 The backend can easily be deployed using Docker and then used by the Android application.
 
 ## Swagger-API
-For the current API, see [here](https://v2202006123966120989.bestsrv.de/swagger-ui.html#/).
+For the current API, see [here](https://api.vault.jatsqi/swagger-ui.html#/).

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: vaultionizer_app
     build: ./
     ports:
-      - "443:443"
+      - "8080:8080"
     depends_on:
       - postgres_vault
     environment:

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M3</version>
+		<version>2.5.3</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.vaultionizer</groupId>
@@ -16,6 +16,9 @@
 
 	<properties>
 		<java.version>14</java.version>
+		<sonar.projectKey>Vaultionizer_vault-server</sonar.projectKey>
+		<sonar.organization>vaultionizer</sonar.organization>
+		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
 	</properties>
 
 	<dependencies>
@@ -50,18 +53,23 @@
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
-			<version>2.9.2</version>
+			<version>3.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-ui</artifactId>
+			<version>1.5.10</version>
 		</dependency>
 
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-core</artifactId>
-			<version>2.9.2</version>
+			<version>3.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger-ui</artifactId>
-			<version>2.9.2</version>
+			<version>3.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
@@ -86,7 +94,12 @@
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20171018</version>
+			<version>20231013</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>5.3.9</version>
 		</dependency>
 
 
@@ -97,40 +110,46 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>sockjs-client</artifactId>
-			<version>1.0.2</version>
+			<version>1.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>stomp-websocket</artifactId>
-			<version>2.3.3</version>
+			<version>2.3.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>bootstrap</artifactId>
-			<version>3.3.7</version>
+			<version>5.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>jquery</artifactId>
-			<version>3.1.1-1</version>
+			<version>3.6.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>io.cucumber</groupId>
 			<artifactId>cucumber-java</artifactId>
-			<version>6.8.0</version>
+			<version>6.10.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.cucumber</groupId>
 			<artifactId>cucumber-junit</artifactId>
-			<version>6.8.0</version>
+			<version>6.10.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>io.cucumber</groupId>
 			<artifactId>cucumber-spring</artifactId>
-			<version>6.8.0</version>
+			<version>6.10.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<version>5.7.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -141,6 +160,26 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>0.8.7</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

scripts/build_project_docker.sh

@@ -3,12 +3,8 @@ cd /home/vaultionizer/project
 rm target/vaultserver*
 export MAVEN_OPTS="-Xmx1024m"
 
-echo "installing dependencies..."
-mvn clean install -o > /home/vaultionizer/log_install.txt
-echo "Finished installing dependencies."
-
 echo "Packaging project"
-mvn package
+mvn package -Dmaven.test.skip=true
 
 mv target/*jar ../vaultionizer_server.jar
 cd ..

scripts/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3.1'
+services:
+  postgres_vault_test:
+    image: postgres
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=mydb

scripts/sonarcloud.sh

@@ -0,0 +1,15 @@
+# start test vaultionizer postgres
+
+export VAULT_ENABLE_SSL=false
+export VAULT_DB_USER=postgres
+export VAULT_DB_PASSWORD=password
+export VAULT_DB_DATABASE=mydb
+export VAULT_DB_HOST=localhost:5432
+
+docker-compose up --build -d
+
+cd ..
+mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+docker stop scripts_postgres_vault_test_1
+docker rm scripts_postgres_vault_test_1
+

scripts/test.sh

@@ -0,0 +1,15 @@
+# start test vaultionizer postgres
+
+export VAULT_ENABLE_SSL=false
+export VAULT_DB_USER=postgres
+export VAULT_DB_PASSWORD=password
+export VAULT_DB_DATABASE=mydb
+export VAULT_DB_HOST=localhost:5432
+
+docker-compose up --build -d
+
+cd ..
+mvn test
+docker stop scripts_postgres_vault_test_1
+docker rm scripts_postgres_vault_test_1
+

src/main/java/com/vaultionizer/vaultserver/VaultserverApplication.java

@@ -5,14 +5,14 @@
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class })
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class})
 @EnableJpaAuditing
 public class VaultserverApplication {
 
-	public static void main(String[] args) {
-		SpringApplication app = new SpringApplication(VaultserverApplication.class);
-		app.setAdditionalProfiles("ssl");
-		app.run(args);
-	}
+    public static void main(String[] args) {
+        var app = new SpringApplication(VaultserverApplication.class);
+        app.setAdditionalProfiles("ssl");
+        app.run(args);
+    }
 
 }

src/main/java/com/vaultionizer/vaultserver/config/SecurityConfig.java

@@ -24,13 +24,15 @@ protected void configure(HttpSecurity http) throws Exception {
 
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
-        CorsConfiguration configuration = new CorsConfiguration();
-        configuration.setAllowedOrigins(Arrays.asList("https://www.vault.gottwuerfeltnicht.de"));
+        var configuration = new CorsConfiguration();
+        configuration.setAllowedOrigins(Arrays.asList("https://www.api.vault.jatsqi.com"));
+        // for testing:
+        // configuration.setAllowedOrigins(Arrays.asList("http://localhost:63342"));
         configuration.setAllowedMethods(Arrays.asList("POST", "PUT", "GET", "OPTIONS", "DELETE"));
         configuration.setAllowedHeaders(Arrays.asList("authorization", "content-type", "x-auth-token"));
         configuration.setExposedHeaders(Arrays.asList("x-auth-token"));
         configuration.setAllowCredentials(true);
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        var source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", configuration);
         return source;
     }

src/main/java/com/vaultionizer/vaultserver/config/SwaggerConfig.java

@@ -41,14 +41,14 @@ public LinkDiscoverers discoverers() {
     }
 
     private static final ApiInfo apiInfo = new ApiInfo( // TODO: work on that
-                "Vaultionizer API",
-                "A safe space for everybody that seeks after privacy.",
-                "1.0.0",
-                "https://www.vault.gottwuerfeltnicht.de",
-                new Contact("Team Vaultionizer", "https://vaultionizer.com/", "contact@vaultionizer.com"),
-                "ODC DbCL v1.0 License",
-                "https://opendatacommons.org/licenses/dbcl/1.0/",
-                new ArrayList<>()
+            "Vaultionizer API",
+            "A safe space for everybody that seeks after privacy.",
+            "1.0.0",
+            "https://www.vault.gottwuerfeltnicht.de",
+            new Contact("Team Vaultionizer", "https://vaultionizer.com/", "contact@vaultionizer.com"),
+            "ODC DbCL v1.0 License",
+            "https://opendatacommons.org/licenses/dbcl/1.0/",
+            new ArrayList<>()
     );
 
 }