Merged the master branch into the EFRS-1286_the_ability_to_delete_expired_access_and_refresh_tokens branch

Author: VolodymyrBushko

.github/workflows/Build-Deploy-auto.yml

@@ -19,7 +19,8 @@ jobs:
     # We need to share it between build and deploy jobs.
     outputs:
       registry_path: ${{ steps.registry_path.outputs.registry_path }}
-      tag: ${{ steps.tag_var.outputs.tag }}
+      tag: ${{ steps.tag_vars.outputs.tag }}
+      tag_latest: ${{ steps.tag_vars.outputs.tag_latest }}
       env_name: ${{ steps.env_var.outputs.env_name }}
 
     steps:
@@ -30,9 +31,11 @@ jobs:
       id: registry_path
       run: echo "registry_path=${{ env.REGISTRY }}/exadel-inc/compreface/" >> $GITHUB_OUTPUT
 
-    - name: Set commit sha output from git
-      id: tag_var
-      run: echo "tag=${{ github.ref_name }}-$(git rev-parse HEAD | cut -c 1-7 | tr -d '\n')" >> $GITHUB_OUTPUT
+    - name: Set tags from git output
+      id: tag_vars
+      run: |
+        echo "tag=${{ github.ref_name }}-$(git rev-parse HEAD | cut -c 1-7 | tr -d '\n')" >> $GITHUB_OUTPUT
+        echo "tag_latest=${{ github.ref_name }}-latest" >> $GITHUB_OUTPUT
 
     - name: Set environment output from git
       id: env_var
@@ -48,19 +51,21 @@ jobs:
     - name: Check outputs
       run: |
         echo "Branch     : ${{ github.ref_name }}"
-        echo "TAG        : ${{ steps.tag_var.outputs.tag }}"
+        echo "Tags       : ${{ steps.tag_vars.outputs.tag }}, ${{ steps.tag_vars.outputs.tag_latest }}"
         echo "Environment: ${{ steps.env_var.outputs.env_name }}"
 
     - name: Build images
       env:
-        TAG: ${{ steps.tag_var.outputs.tag }}
+        TAG: ${{ steps.tag_vars.outputs.tag }}
+        TAG_LATEST: ${{ steps.tag_vars.outputs.tag_latest }}
         REGISTRY_PATH: ${{ steps.registry_path.outputs.registry_path }}
-        APPERY_API_KEY: ${{ secrets.APPERY_API_KEY }}
       working-directory: ./dev
       run: |
         sed -i "s|registry=|registry=${REGISTRY_PATH}|g" .env
         sed -i "s/latest/${TAG}/g" .env
         docker-compose build
+        sed -i "s/${TAG}/${TAG_LATEST}/g" .env
+        docker-compose build
         docker images
 
     - name: Log in to the Container registry
@@ -71,16 +76,21 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Push images to the Container registry
+      env:
+        TAG: ${{ steps.tag_vars.outputs.tag }}
+        TAG_LATEST: ${{ steps.tag_vars.outputs.tag_latest }}
       working-directory: ./dev
       run: |
         docker-compose push
+        sed -i "s/${TAG_LATEST}/${TAG}/g" .env
+        docker-compose push
 
   deploy:
     needs: build
     # It's not possible to use natively env (e.g. env.ENV_NAME) variable on the runs-on job field (yet?)
     # for deploy to different environments depending on branch https://github.com/actions/runner/issues/480
     # That's why we use output from the previous build job
-    # Note: we are using self-hosted runner here
+    # Note: we are using self-hosted runner here 
     runs-on: ["${{needs.build.outputs.env_name}}"]
 
     steps:
@@ -90,11 +100,11 @@ jobs:
     - name: Deploy 
       working-directory: ./dev
       env:
-        TAG: ${{ needs.build.outputs.tag }}
+        TAG_LATEST: ${{ needs.build.outputs.tag_latest }}
         REGISTRY_PATH: ${{ needs.build.outputs.registry_path }}
       run: |
         sed -i "s|registry=|registry=${REGISTRY_PATH}|g" .env
-        sed -i "s/latest/${TAG}/g" .env
+        sed -i "s/latest/${TAG_LATEST}/g" .env
         sudo docker-compose stop
         sudo docker system prune -a -f
         sudo docker-compose pull

.github/workflows/Deploy-qa-demo-manual.yml

@@ -0,0 +1,44 @@
+name: Deploy to QA or Demo environment manually
+
+on: 
+  workflow_dispatch:
+    inputs:
+      environment:
+        type: choice
+        description: 'Choose environment to deploy'
+        required: true
+        default: 'qa'
+        options:
+        - qa
+        - demo
+
+env:
+  REGISTRY_PATH: ghcr.io/exadel-inc/compreface/
+
+jobs:
+  deploy:
+    runs-on: ${{ github.event.inputs.environment }}
+
+    steps:
+    
+    - name: Set environment output from git
+      id: tag_var
+      run: |
+        if [ "${{ github.event.inputs.environment }}" = "qa" ]; then
+          echo "TAG_LATEST=master-latest" >> $GITHUB_ENV
+        else
+          echo "TAG_LATEST=1.1.x-latest" >> $GITHUB_ENV
+        fi   
+    
+    - name: Checkout Repo 
+      uses: actions/checkout@v3
+
+    - name: Deploy 
+      working-directory: ./dev
+      run: |
+        sed -i "s|registry=|registry=${{ env.REGISTRY_PATH }}|g" .env
+        sed -i "s/latest/${{ env.TAG_LATEST }}/g" .env
+        sudo docker-compose stop
+        sudo docker system prune -a -f
+        sudo docker-compose pull
+        HOSTNAME=$HOSTNAME sudo docker-compose -f docker-compose.yml -f docker-compose.env.yml up -d

README.md

@@ -65,7 +65,6 @@
   * [Contributing](#contributing)
   * [License info](#license-info)
 
-
 # Overview
 
 Exadel CompreFace is a free and open-source face recognition GitHub project. 

java/admin/src/main/java/com/exadel/frs/controller/UserController.java

@@ -256,10 +256,8 @@ public void assignAndSendResetPasswordToken(
             @ApiParam(value = "An email of a user", required = true)
             @Valid
             @RequestBody
-            final ForgotPasswordDto forgotPasswordDto,
-            final HttpServletResponse response) throws IOException {
+            final ForgotPasswordDto forgotPasswordDto) {
         resetPasswordTokenService.assignAndSendToken(forgotPasswordDto.getEmail());
-        redirectToLoginPage(response);
     }
 
     @PutMapping("/reset-password")
@@ -271,11 +269,9 @@ public void resetPassword(
             final ResetPasswordDto resetPasswordDto,
             @ApiParam(value = "A reset password token", required = true)
             @RequestParam
-            final String token,
-            final HttpServletResponse response) throws IOException {
+            final String token) {
         val user = resetPasswordTokenService.exchangeTokenOnUser(token);
         userService.resetPassword(user, resetPasswordDto.getPassword());
-        redirectToLoginPage(response);
     }
 
     private void redirectToLoginPage(final HttpServletResponse response) throws IOException {

java/admin/src/main/java/com/exadel/frs/dto/ui/AppCreateDto.java

@@ -16,7 +16,9 @@
 
 package com.exadel.frs.dto.ui;
 
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -31,5 +33,6 @@ public class AppCreateDto {
 
     @NotBlank(message = "Application name cannot be empty")
     @Size(min = 1, max = 50, message = "Application name size must be between 1 and 50")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String name;
 }

java/admin/src/main/java/com/exadel/frs/dto/ui/AppUpdateDto.java

@@ -16,7 +16,9 @@
 
 package com.exadel.frs.dto.ui;
 
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -31,5 +33,6 @@ public class AppUpdateDto {
 
     @NotBlank(message = "Application name cannot be empty")
     @Size(min = 1, max = 50, message = "Application name size must be between 1 and 50")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String name;
 }

java/admin/src/main/java/com/exadel/frs/dto/ui/ModelCloneDto.java

@@ -16,7 +16,9 @@
 
 package com.exadel.frs.dto.ui;
 
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -31,5 +33,6 @@ public class ModelCloneDto {
 
     @NotBlank(message = "Model name cannot be empty")
     @Size(min = 1, max = 50, message = "Model name size must be between 1 and 50")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String name;
 }

java/admin/src/main/java/com/exadel/frs/dto/ui/ModelCreateDto.java

@@ -16,9 +16,11 @@
 
 package com.exadel.frs.dto.ui;
 
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import com.exadel.frs.commonservice.enums.ModelType;
 import com.exadel.frs.validation.ValidEnum;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -33,6 +35,7 @@ public class ModelCreateDto {
 
     @NotBlank(message = "Model name cannot be empty")
     @Size(min = 1, max = 50, message = "Model name size must be between 1 and 50")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String name;
 
     @NotBlank(message = "Model Type cannot be empty")

java/admin/src/main/java/com/exadel/frs/dto/ui/ModelUpdateDto.java

@@ -16,7 +16,9 @@
 
 package com.exadel.frs.dto.ui;
 
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -31,5 +33,6 @@ public class ModelUpdateDto {
 
     @NotBlank(message = "Model name cannot be empty")
     @Size(min = 1, max = 50, message = "Model name size must be between 1 and 50")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String name;
 }

java/admin/src/main/resources/application.yml

@@ -1,5 +1,8 @@
 server:
   port: ${CRUD_PORT:8080}
+  tomcat:
+    relaxed-path-chars: [ '[', ']' ]
+    relaxed-query-chars: [ '[', ']' ]
 
 app:
   security:
@@ -127,7 +130,7 @@ forgot-password:
       cron: '0 0 0 * * ?'
   email:
     subject: 'CompreFace Reset Password'
-    message: 'In order to reset a password click the following link: %s/admin/reset-password?token=%s'
+    message: 'In order to reset a password click the following link: %s/reset-password?token=%s'
 
 # "environment" and "image" blocks should be same in those files:
 #    * api/src/main/resources/application.properties