NCBACK-25 work version for protect file

.env

@@ -1,6 +1,6 @@
 POSTGRES_DB=no_copy_
-POSTGRES_USER=ncp_db
+POSTGRES_USER=postgres
-POSTGRES_PASSWORD=ncpDbApp
+POSTGRES_PASSWORD=postgres
 POSTGRES_PORT=5432
 POSTGRES_HOST=postgres
 

README.md

@@ -1,68 +0,0 @@
-Создаем сеть:
-docker network create app-network
-
-Войти в БД:
-docker exec -it postgres psql -U ncp_db -d no_copy_
-
-Выполнить команду:
-\du
-
-Должен быть один пользователь:
-                                    List of roles
-Role name |                         Attributes
------------+------------------------------------------------------------
-ncp_db    | Superuser, Create role, Create DB, Replication, Bypass RLS
-
-суперпользователь БД:
-postgres/postgres 
-пользователь бд для бэка
-ncp_db / ncpDbApp
-
-Подключение к БД для приложения,если volume не существует :
-
-Создаться автоматически.
-
-Если уже существует volume :
-
-docker exec -it postgres psql -U postgres -d postgres
-
-CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
-
-GRANT ALL PRIVILEGES ON DATABASE no_copy_ TO ncp_db;
-
-\du
-
-\q
-
--------
-
-psql -U postgres -d no_copy_
-
--- база
-
-GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
-
--- схема
-
-GRANT USAGE ON SCHEMA public TO ncp_db;
-
--- существующие таблицы
-
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
-
--- существующие sequence (очень важно для id)
-
-GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
-
--- будущие таблицы
-
-ALTER DEFAULT PRIVILEGES IN SCHEMA public
-GRANT ALL ON TABLES TO ncp_db;
-
-ALTER DEFAULT PRIVILEGES IN SCHEMA public
-GRANT ALL ON SEQUENCES TO ncp_db;
-
-
-Зайти в контейнер:
-docker exec -it {name} bash
-

build.gradle

@@ -13,6 +13,13 @@ java {
 	}
 }
 
+//dependencyManagement {
+//	imports {
+//		mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"
+//	}
+//}
+
+
 configurations {
 	compileOnly {
 		extendsFrom annotationProcessor
@@ -21,6 +28,9 @@ configurations {
 
 repositories {
 	mavenCentral()
+	flatDir {
+		dirs 'libs'
+	}
 }
 
 dependencies {
@@ -31,10 +41,6 @@ dependencies {
 	implementation 'org.mapstruct:mapstruct:1.5.5.Final'
 	implementation 'commons-validator:commons-validator:1.7'
 
-	implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
-	implementation 'tools.jackson.core:jackson-core:3.0.3'
-	implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
-
 	annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
 	annotationProcessor 'org.projectlombok:lombok'
 
@@ -49,6 +55,11 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.mockito:mockito-core:5.3.1'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+//	implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.21'
+//	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+//	implementation 'io.insert-koin:koin-core:3.5.0'
+	implementation name: 'testlib-fat-0.1.2-all (1)'
 }
 
 tasks.named('test') {

docker-compose.yaml

@@ -18,7 +18,7 @@ services:
     restart: unless-stopped
 
   db:
-    image: postgres:17.7
+    image: postgres:17
     restart: always
     deploy:
       resources:
@@ -30,15 +30,14 @@ services:
           memory: 1G
     environment:
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: postgres
       POSTGRES_SHARED_BUFFERS: 512MB
       POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
     ports:
       - "54320:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
-      - ./init-scripts:/docker-entrypoint-initdb.d:ro
     container_name: postgres
     networks:
       app-network:
@@ -59,17 +58,13 @@ services:
     environment:
       FILE_STORAGE_PATH: /data/uploads
       MAX_FILE_SIZE: 10737418240
-      FILE_CHUNK_SIZE: 1000000
+      FILE_CHUNK_SIZE: 1048576
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: postgres
       POSTGRES_PORT: 5432
       POSTGRES_HOST: db
       STORAGE_SERVICE_URL: http://storage:8081
-      SPRING_PROFILES_ACTIVE: docker
-      YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
-      YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
-      YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
     depends_on:
       - db
     ports:
@@ -82,10 +77,6 @@ services:
           - api
     volumes:
       - uploads_data:/data/uploads:rw
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d no_copy_" ]
-      interval: 10s
-      retries: 5
 
   grafana:
     image: grafana/grafana:10.3.1

infrastructure/jenkins/deploy.groovy

@@ -30,7 +30,6 @@ pipeline {
             }
         }
 
-
         stage('Deploy with docker-compose') {
             steps {
                 script {
@@ -39,9 +38,7 @@ pipeline {
                                     credentialsId: 'server-root-password',
                                     usernameVariable: 'SSH_USER',
                                     passwordVariable: 'SSH_PASS'
-                            ),
+                            )
-                            string(credentialsId: 'DB_USER', variable: 'DB_USER'),
-                            string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
                     ]) {
                         sh """
                             echo "Deploying branch: ${params.BRANCH}"
@@ -80,8 +77,8 @@ pipeline {
                                   -p 80:8080 \\
                                   -v uploads_data:/data/uploads:rw \\
                                   -e POSTGRES_DB=no_copy_ \\
-                          -e POSTGRES_USER=$DB_USER \\
+                                  -e POSTGRES_USER=postgres \\
-                          -e POSTGRES_PASSWORD=$DB_PASSWORD \\
+                                  -e POSTGRES_PASSWORD=postgres \\
                                   -e POSTGRES_PORT=5432 \\
                                   -e POSTGRES_HOST=db \\
                                   --restart unless-stopped \\

init-scripts/01-init.sql

@@ -1,19 +0,0 @@
-DO $$
-BEGIN
-   IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'ncp_db') THEN
-      CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
-END IF;
-END
-$$;
-
-GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
-GRANT USAGE ON SCHEMA public TO ncp_db;
-
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
-GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
-
-ALTER DEFAULT PRIVILEGES IN SCHEMA public
-GRANT ALL ON TABLES TO ncp_db;
-
-ALTER DEFAULT PRIVILEGES IN SCHEMA public
-GRANT ALL ON SEQUENCES TO ncp_db;

src/main/java/ru/soune/nocopy/configuration/ApplicationConfig.java

@@ -1,17 +1,35 @@
 package ru.soune.nocopy.configuration;
 
+import com.vrt.fileprotection.FileProtector;
+import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
+import java.util.Collections;
+
 @Configuration
 @EnableAutoConfiguration
+@AllArgsConstructor
 public class ApplicationConfig {
 
     @Bean
     PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
     }
+
+    @Bean
+    public com.vrt.NoCopyFileService noCopyFileService(
+            FileProtector.FileProvider fileProvider,
+            FileProtector.ProcessingListener processingListener) {
+
+        return new com.vrt.NoCopyFileService(
+                Collections.emptyList(),
+                fileProvider,
+                processingListener
+        );
     }
+}
+

src/main/java/ru/soune/nocopy/configuration/HandlerConfig.java

@@ -16,9 +16,7 @@ public class HandlerConfig {
             LoginRequestHandler login,
             FileUploadHandler upload,
             FileEntityHandler file,
-            LogoutRequestHandler logoutHandler,
+            LogoutRequestHandler logoutHandler
-            ImageFoundRequestHandler imageFoundRequestHandler,
-            AuthRequestHandler authRequestHandler
     ) {
         Map<Integer, RequestHandler> map = new HashMap<>();
         map.put(20001, login);
@@ -26,8 +24,6 @@ public class HandlerConfig {
         map.put(20004, upload);
         map.put(20005, file);
         map.put(20006, logoutHandler);
-        map.put(20007, imageFoundRequestHandler);
-        map.put(20008, authRequestHandler);
 
         return map;
     }

src/main/java/ru/soune/nocopy/configuration/JacksonConfig.java

@@ -35,8 +35,6 @@ public class JacksonConfig {
 
         mapper.registerModule(javaTimeModule);
         mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        mapper.enable(SerializationFeature.INDENT_OUTPUT);
 
         return mapper;
     }

src/main/java/ru/soune/nocopy/configuration/file/NoCopyInitializer.java

@@ -0,0 +1,19 @@
+package ru.soune.nocopy.configuration.file;
+
+import lombok.AllArgsConstructor;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.service.file.FileProcessingOrchestrator;
+
+@Component
+@AllArgsConstructor
+public class NoCopyInitializer {
+
+    private final FileProcessingOrchestrator orchestrator;
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void initializeOnStartup() {
+        orchestrator.initializeProcessingQueue();
+    }
+}

src/main/java/ru/soune/nocopy/controller/ApiController.java

@@ -1,5 +1,7 @@
 package ru.soune.nocopy.controller;
 
+import com.vrt.NoCopyFileService;
+import com.vrt.fileprotection.FileProtector;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
@@ -19,11 +21,15 @@ import ru.soune.nocopy.dto.file.ChunkUploadResponse;
 import ru.soune.nocopy.dto.file.CompleteUploadResponse;
 import ru.soune.nocopy.dto.file.FileEntityResponse;
 import ru.soune.nocopy.dto.file.UploadProgress;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
 import ru.soune.nocopy.entity.file.UploadStatus;
 import ru.soune.nocopy.exception.*;
 import ru.soune.nocopy.handler.*;
-import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.repository.FileEntityRepository;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileUploadService;
 
@@ -34,6 +40,7 @@ import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -47,7 +54,11 @@ public class ApiController {
 
     private final FileEntityService fileEntityService;
 
-    private final AuthService authService;
+    private final AuthTokenRepository authTokenRepository;
+
+    private final FileEntityRepository fileEntityRepository;
+
+    private final NoCopyFileService noCopyFileService;
 
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
@@ -70,9 +81,6 @@ public class ApiController {
             return ResponseEntity.ok().body(response);
         } catch (ValidationException e) {
             return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
-        } catch (NotFoundAuthToken e) {
-            return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
-                    MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
         } catch (NotValidFieldException e) {
             throw e;
         } catch (Exception e) {
@@ -259,7 +267,7 @@ public class ApiController {
                         errorData));
             }
 
-            Long userId = authService.useUserAuthToken(tokenHeader);
+            Long userId = getUserIdFromToken(tokenHeader);
             FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
 
             if (!entityResponse.getUserId().equals(userId)) {
@@ -334,6 +342,47 @@ public class ApiController {
         }
     }
 
+    @GetMapping("/protect/{fileId}")
+    public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
+        Optional<FileEntity> fileEntity = fileEntityRepository.findById(fileId);
+
+        if (!fileEntity.isPresent()) {
+            return ResponseEntity.notFound().build();
+        }
+
+        FileProtector.FileInfo fileInfo = createFileInfo(fileEntity.get());
+
+        noCopyFileService.addFile(fileInfo);
+
+        fileEntity.get().setProtectionStatus(ProtectionStatus.PROCESSING);
+
+        fileEntityRepository.save(fileEntity.get());
+
+        return ResponseEntity.ok().build();
+    }
+
+    private FileProtector.FileInfo createFileInfo(FileEntity fileEntity) {
+        FileProtector.Type type = determineFileType(fileEntity.getMimeType());
+
+        return new FileProtector.FileInfo(type, fileEntity.getId(), String.valueOf(fileEntity.getUserId()));
+    }
+
+    private FileProtector.Type determineFileType(String mimeType) {
+        if (mimeType == null) {
+            return FileProtector.Type.IMAGE;
+        }
+
+        if (mimeType.startsWith("image")) {
+            return FileProtector.Type.IMAGE;
+        } else if (mimeType.startsWith("video")) {
+            return FileProtector.Type.VIDEO;
+        } else if (mimeType.startsWith("audio")) {
+            return FileProtector.Type.AUDIO;
+        } else {
+            return FileProtector.Type.IMAGE;
+        }
+    }
+
     private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
         List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
                 .stream()
@@ -370,15 +419,10 @@ public class ApiController {
         return contentType;
     }
 
-    private boolean isPreviewSupported(String mimeType) {
+    private Long getUserIdFromToken(String tokenHeader) {
-        if (mimeType == null) {
+        String token = tokenHeader.replace("Bearer ", "");
-            return false;
+        AuthToken authToken = authTokenRepository.findByToken(token)
-        }
+                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
-
+        return authToken.getUser().getId();
-        return mimeType.startsWith("image") ||
-                mimeType.startsWith("text") ||
-                mimeType.equals("pdf") ||
-                mimeType.startsWith("video") ||
-                mimeType.startsWith("audio");
     }
 }

src/main/java/ru/soune/nocopy/dto/BaseRequest.java

@@ -1,11 +1,9 @@
 package ru.soune.nocopy.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
-@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class BaseRequest {
     @JsonProperty("version")
     Integer version;

src/main/java/ru/soune/nocopy/dto/BaseResponse.java

@@ -1,13 +1,11 @@
 package ru.soune.nocopy.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
-@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class BaseResponse {
     @JsonProperty("msg_id")
     private Integer msgId;

src/main/java/ru/soune/nocopy/dto/LoginRequest.java

@@ -1,6 +1,5 @@
 package ru.soune.nocopy.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
@@ -11,7 +10,6 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class LoginRequest {
 
     @NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)

src/main/java/ru/soune/nocopy/dto/MessageCode.java

@@ -10,7 +10,6 @@ public enum MessageCode {
     FILE_UPLOAD_ERROR(2, "File upload error"),
     FILE_DOWNLOAD_ERROR(2, "File download error"),
     FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
-    IMAGE_FOUND_ERROR(2, "Image found error"),
     INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
     INCOMPLETE_UPLOAD(2, "Not load all chunks"),
     MSG_ID_NOT_FOUND(4, "Message id not found"),
@@ -19,7 +18,6 @@ public enum MessageCode {
     AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
     AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
     AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
-    AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
     FILE_NOT_FOUND(4, "File not found"),
     AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
 

src/main/java/ru/soune/nocopy/dto/RegRequest.java

@@ -1,12 +1,10 @@
 package ru.soune.nocopy.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.*;
 import lombok.Data;
 
 
 @Data
-@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class RegRequest {
     @NotEmpty(message = "Full name is required")
     private String fullName;

src/main/java/ru/soune/nocopy/dto/TokenProcessRequest.java

@@ -1,11 +0,0 @@
-package ru.soune.nocopy.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-@Data
-public class TokenProcessRequest {
-
-    @JsonProperty("token")
-    private String token;
-}

src/main/java/ru/soune/nocopy/dto/UserRequest.java

@@ -10,7 +10,6 @@ import ru.soune.nocopy.entity.GenderType;
 import java.time.LocalDate;
 
 @Data
-@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class UserRequest {
     @Size(min = 2)
     private String fullName;

src/main/java/ru/soune/nocopy/dto/file/ImageSearchRequest.java

@@ -1,10 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-@Data
-public class ImageSearchRequest {
-    @JsonProperty("file_id")
-    private String fileId;
-}

src/main/java/ru/soune/nocopy/dto/file/YandexSearchResponse.java

@@ -1,36 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import java.util.List;
-
-@Data
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class YandexSearchResponse {
-
-    @JsonProperty("images")
-    private List<ImageResult> images;
-
-    @Data
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public static class ImageResult {
-        @JsonProperty("url")
-        private String url;
-
-        @JsonProperty("pageUrl")
-        private String pageUrl;
-
-        @JsonProperty("pageTitle")
-        private String pageTitle;
-
-        @JsonProperty("width")
-        private Integer width;
-
-        @JsonProperty("height")
-        private Integer height;
-
-        @JsonProperty("host")
-        private String host;
-    }
-}

src/main/java/ru/soune/nocopy/entity/AuthToken.java

@@ -30,7 +30,7 @@ public class AuthToken {
     private String token;
 
     @Column(name = "expires_at", nullable = false)
-    private LocalDateTime expiresAt = LocalDateTime.now().plusHours(1);
+    private LocalDateTime expiresAt = LocalDateTime.now().plusDays(30);
 
     @CreatedDate
     @Column(name = "created_at", updatable = false, nullable = false)
@@ -41,4 +41,8 @@ public class AuthToken {
 
     @Column(name = "is_active")
     private Boolean isActive = true;
+
+    public boolean isValid() {
+        return Boolean.TRUE.equals(isActive) && expiresAt.isAfter(LocalDateTime.now());
+    }
 }

src/main/java/ru/soune/nocopy/entity/file/FileEntity.java

@@ -60,11 +60,26 @@ public class FileEntity {
     @Column(name = "updated_at")
     private LocalDateTime updatedAt;
 
+    @Column(name = "protected_file_path")
+    private String protectedFilePath;
+
+    @Column(name = "protection_status")
+    @Enumerated(EnumType.STRING)
+    private ProtectionStatus protectionStatus;
+
+    @Column(name = "protected_at")
+    private LocalDateTime protectedAt;
+
     @PrePersist
     public void prePersist() {
         if (this.status == null) {
             this.status = FileStatus.ACTIVE;
         }
+
+        if (this.protectionStatus == null) {
+            this.protectionStatus = ProtectionStatus.NOT_PROTECTED;
+        }
+
         if (this.createdAt == null) {
             this.createdAt = LocalDateTime.now();
         }

src/main/java/ru/soune/nocopy/entity/file/ProtectionStatus.java

@@ -0,0 +1,9 @@
+package ru.soune.nocopy.entity.file;
+
+public enum ProtectionStatus {
+    NOT_PROTECTED,
+    PROCESSING,
+    PROTECTED,
+    FAILED,
+    FAILED_SAVE
+}

src/main/java/ru/soune/nocopy/handler/AuthRequestHandler.java

@@ -1,37 +0,0 @@
-package ru.soune.nocopy.handler;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import ru.soune.nocopy.dto.BaseRequest;
-import ru.soune.nocopy.dto.BaseResponse;
-import ru.soune.nocopy.dto.MessageCode;
-import ru.soune.nocopy.dto.TokenProcessRequest;
-import ru.soune.nocopy.exception.NotFoundAuthToken;
-import ru.soune.nocopy.service.auth.AuthService;
-
-import java.util.Map;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class AuthRequestHandler implements RequestHandler {
-
-    private final ObjectMapper objectMapper;
-
-    private final AuthService authService;
-
-    @Override
-    public BaseResponse handle(BaseRequest request) throws NotFoundAuthToken {
-        TokenProcessRequest tokenProcessRequest = objectMapper.convertValue(request.getMessageBody(),
-                TokenProcessRequest.class);
-
-        authService.useUserAuthToken(tokenProcessRequest.getToken());
-
-        return new BaseResponse(request.getMsgId(),
-                MessageCode.SUCCESS.getCode(),
-                "Token processed successfully",
-                Map.of("token", tokenProcessRequest.getToken()));
-    }
-}

src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java

@@ -6,12 +6,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.dto.file.*;
+import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.exception.FileEntityNotFoundException;
 import ru.soune.nocopy.exception.NotFoundAuthToken;
+import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.FileEntityRepository;
-import ru.soune.nocopy.service.auth.AuthService;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileStatsService;
 
@@ -25,10 +26,10 @@ public class FileEntityHandler implements RequestHandler {
 
     private final FileEntityService fileEntityService;
 
-    private final AuthService authService;
-
     private final FileStatsService fileStatsService;
 
+    private final AuthTokenRepository authTokenRepository;
+
     private final ObjectMapper objectMapper;
 
     private final FileEntityRepository fileEntityRepository;
@@ -61,8 +62,7 @@ public class FileEntityHandler implements RequestHandler {
                             .action(action)
                             .availableActions(Arrays.asList(
                                     "file_info", "file_by_session", "user_files",
-                                    "search_files", "storage_usage", "delete_file",
+                                    "search_files", "storage_usage", "delete_file"))
-                                    "user_files_info"))
                             .build();
 
                     return new BaseResponse(request.getMsgId(),
@@ -80,7 +80,7 @@ public class FileEntityHandler implements RequestHandler {
     }
 
     private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
-        Long userId = authService.useUserAuthToken(fileRequest.getToken());
+        Long userId = getUserIdFromToken(fileRequest.getToken());
         FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
 
         return new BaseResponse(request.getMsgId(),
@@ -91,7 +91,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId =  authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
 
             if (!fileInfo.getUserId().equals(userId)) {
@@ -122,7 +122,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
                     request.getVersion());
 
@@ -154,7 +154,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
 
@@ -181,7 +181,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
 
@@ -228,7 +228,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             long usage = fileEntityService.getUserStorageUsed(userId);
 
             StorageUsageResponse response = StorageUsageResponse.builder()
@@ -258,7 +258,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             String fileId = fileRequest.getFileId();
             FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
             DeleteFileResponse response;
@@ -305,6 +305,20 @@ public class FileEntityHandler implements RequestHandler {
         }
     }
 
+    private Long getUserIdFromToken(String token) {
+        if (token == null || token.isBlank()) {
+            throw new NotFoundAuthToken("Token is required");
+        }
+
+        if (token.startsWith("Bearer ")) {
+            token = token.replace("Bearer ", "");
+        }
+
+        AuthToken authToken = authTokenRepository.findByToken(token)
+                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
+        return authToken.getUser().getId();
+    }
+
     private String formatFileSize(long size) {
         if (size < 1024) return size + " B";
         int exp = (int) (Math.log(size) / Math.log(1024));

src/main/java/ru/soune/nocopy/handler/FileUploadHandler.java

@@ -17,7 +17,6 @@ import ru.soune.nocopy.exception.*;
 import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.FileUploadSessionRepository;
-import ru.soune.nocopy.service.auth.AuthService;
 import ru.soune.nocopy.service.file.FileUploadService;
 
 import java.util.*;
@@ -29,8 +28,6 @@ import java.util.stream.Collectors;
 public class FileUploadHandler implements RequestHandler {
     private final FileUploadService fileUploadService;
 
-    private final AuthService authService;
-
     private final AuthTokenRepository authTokenRepository;
 
     private final FileUploadSessionRepository fileUploadSessionRepository;
@@ -89,7 +86,8 @@ public class FileUploadHandler implements RequestHandler {
                         MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
             }
 
-            Long userId = authService.useUserAuthToken(token);
+            AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
+
             BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
             fileUploadRequestValidator.validate(fileRequest, bindingResult);
 
@@ -107,7 +105,7 @@ public class FileUploadHandler implements RequestHandler {
             }
 
             FileUploadSession session = fileUploadService.initUpload(
-                    userId,
+                    authToken.getUser().getId(),
                     fileRequest.getFileName(),
                     fileRequest.getFileType(),
                     fileRequest.getExtension(),

src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java

@@ -1,36 +0,0 @@
-package ru.soune.nocopy.handler;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import ru.soune.nocopy.dto.BaseRequest;
-import ru.soune.nocopy.dto.BaseResponse;
-import ru.soune.nocopy.dto.MessageCode;
-import ru.soune.nocopy.dto.file.ImageSearchRequest;
-import ru.soune.nocopy.dto.file.YandexSearchResponse;
-import ru.soune.nocopy.service.YandexSearchService;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class ImageFoundRequestHandler implements RequestHandler {
-
-    private final ObjectMapper objectMapper;
-
-    private final YandexSearchService yandexSearchService;
-
-    @Override
-    public BaseResponse handle(BaseRequest request) throws Exception {
-        ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
-                ImageSearchRequest.class);
-
-        String fileId = imageSearchRequest.getFileId();
-
-        YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
-
-        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
-                MessageCode.SUCCESS.getDescription(), response);
-    }
-}

src/main/java/ru/soune/nocopy/handler/LoginRequestHandler.java

@@ -7,7 +7,7 @@ import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.service.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -17,9 +17,7 @@ import java.util.Map;
 public class LoginRequestHandler implements RequestHandler {
 
     private final UserRepository userRepository;
-
     private final AuthService authService;
-
     private final ObjectMapper objectMapper;
 
     @Override
@@ -36,12 +34,9 @@ public class LoginRequestHandler implements RequestHandler {
         }
 
         AuthToken authToken = authService.login(loginRequest);
-        String token = authToken.getToken();
 
         LoginAnswer loginAnswer = new LoginAnswer();
-        loginAnswer.setToken(token);
+        loginAnswer.setToken(authToken.getToken());
-
-        authService.useUserAuthToken(token);
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), loginAnswer);

src/main/java/ru/soune/nocopy/handler/LogoutRequestHandler.java

@@ -9,7 +9,7 @@ import ru.soune.nocopy.entity.User;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.service.AuthService;
 
 import java.util.Objects;
 import java.util.Optional;

src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java

@@ -12,7 +12,7 @@ import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.exception.ValidationException;
 import ru.soune.nocopy.handler.validator.RegRequestValidator;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.service.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -52,11 +52,9 @@ public class RegRequestHandler implements RequestHandler {
         }
 
         AuthToken authToken = authService.register(regRequest);
-        String token = authToken.getToken();
-        authService.useUserAuthToken(token);
 
         RegAnswer regAnswer = new RegAnswer();
-        regAnswer.setToken(token);
+        regAnswer.setToken(authToken.getToken());
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), regAnswer);

src/main/java/ru/soune/nocopy/handler/validator/RegRequestValidator.java

@@ -1,19 +1,16 @@
 package ru.soune.nocopy.handler.validator;
 
-import org.apache.commons.validator.routines.DomainValidator;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 import ru.soune.nocopy.dto.RegRequest;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.*;
 
 @Component
 public class RegRequestValidator implements Validator {
-    private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()\"\"«»„‟”“”‘'’‹›❛❜❝❞〝〞〟]{1,200}$";
+    private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$";
 
     private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
 
@@ -74,6 +71,21 @@ public class RegRequestValidator implements Validator {
             errors.rejectValue("companyName", "companyName.invalid.chars",
                     "Company name contains invalid characters");
         }
+
+        validateForbiddenWords(trimmedCompany, "companyName", errors,
+                Arrays.asList("admin", "root", "system", "test"));
+    }
+
+    private void validateForbiddenWords(String text, String fieldName,
+                                        Errors errors, List<String> forbiddenWords) {
+        String lowerText = text.toLowerCase();
+        for (String word : forbiddenWords) {
+            if (lowerText.contains(word)) {
+                errors.rejectValue(fieldName, fieldName + ".forbidden.word",
+                        "Contains forbidden word: " + word);
+                break;
+            }
+        }
     }
 
     private void validateEmail(String email, Errors errors) {
@@ -141,15 +153,6 @@ public class RegRequestValidator implements Validator {
             errors.rejectValue("password", "password.contains.spaces",
                     "Password cannot contain spaces");
         }
-
-//        recomment if need complexity
-//        checkPasswordComplexity(password, errors);
-
-//        reccoment if need check simply standart password
-//        checkCommonPasswords(password, errors);
-
-//        reccoment if need check simply standart password
-//        checkForSequences(password, errors);
     }
 
     private void checkPasswordComplexity(String password, Errors errors) {

src/main/java/ru/soune/nocopy/repository/AuthTokenRepository.java

@@ -4,13 +4,11 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import ru.soune.nocopy.entity.AuthToken;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
-import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
-    List<AuthToken> findByExpiresAtBefore(LocalDateTime expiresAtBefore);
+    Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
-    Optional<AuthToken> findByLastUsedAtBefore(LocalDateTime lastUsedAt);
     Optional<AuthToken> findByToken(String token);
 }

src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java

@@ -6,6 +6,7 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
 
 import java.util.List;
 import java.util.Optional;
@@ -14,7 +15,6 @@ import java.util.Optional;
 public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
 
     List<FileEntity> findByUserId(Long userId);
-    Optional<FileEntity> findByUserIdAndChecksum(Long userId,  String imageHash);
 
     List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
 
@@ -22,11 +22,17 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
 
     Optional<FileEntity> findByUploadSessionId(String uploadSessionId);
 
+    List<FileEntity> findByProtectionStatus(ProtectionStatus protectionStatus);
+
     boolean existsByFilePath(String filePath);
 
     @Query("SELECT SUM(f.fileSize) FROM FileEntity f WHERE f.userId = :userId AND f.status = 'ACTIVE'")
     Long getTotalSizeByUserId(@Param("userId") Long userId);
 
+    @Query("SELECT f FROM FileEntity f WHERE f.protectionStatus = null AND f.status = 'ACTIVE' OR " +
+            "f.protectionStatus = 'NOT_PROTECTED' AND f.status = 'ACTIVE'")
+    List<FileEntity> findAllActiveFilesAndNotProtected();
+
     @Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%")
     List<FileEntity> searchByFileName(@Param("userId") Long userId, @Param("keyword") String keyword);
 

src/main/java/ru/soune/nocopy/service/AuthService.java

@@ -1,13 +1,13 @@
-package ru.soune.nocopy.service.auth;
+package ru.soune.nocopy.service;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.MessageSource;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
@@ -29,6 +29,8 @@ public class AuthService {
 
     private final PasswordEncoder passwordEncoder;
 
+    private final MessageSource messageSource;
+
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
@@ -79,26 +81,6 @@ public class AuthService {
         return authTokenRepository.save(authToken);
     }
 
-    @Transactional
-    public Long useUserAuthToken(String token) {
-        if (token == null || token.isBlank()) {
-            throw new NotFoundAuthToken("Token is required");
-        }
-
-        if (token.startsWith("Bearer ")) {
-            token = token.replace("Bearer ", "");
-        }
-
-        AuthToken authToken = authTokenRepository.findByToken(token)
-                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
-        authToken.setLastUsedAt(LocalDateTime.now());
-        authToken.setExpiresAt(LocalDateTime.now().plusHours(1));
-
-        authTokenRepository.save(authToken);
-
-        return authToken.getUser().getId();
-    }
-
     @Transactional
     public void logout(String token) {
         authTokenRepository.findByToken(token)

src/main/java/ru/soune/nocopy/service/YandexSearchService.java

@@ -1,162 +0,0 @@
-package ru.soune.nocopy.service;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import jakarta.annotation.PostConstruct;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import ru.soune.nocopy.dto.BaseResponse;
-import ru.soune.nocopy.dto.MessageCode;
-import ru.soune.nocopy.dto.file.YandexSearchResponse;
-import ru.soune.nocopy.entity.file.FileEntity;
-import ru.soune.nocopy.exception.FileEntityNotFoundException;
-import ru.soune.nocopy.exception.NotValidFieldException;
-import ru.soune.nocopy.repository.FileEntityRepository;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Base64;
-import java.util.Map;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class YandexSearchService {
-    private final FileEntityRepository fileEntityRepository;
-
-    private final ObjectMapper objectMapper;
-
-    @Value("${yandex.api-key}")
-    private String apiKey;
-
-    @Value("${yandex.folder-id}")
-    private String folderId;
-
-    @Value("${yandex.search-url}")
-    private String searchUrl;
-
-    @PostConstruct
-    public void init() {
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
-    }
-
-    public YandexSearchResponse searchByFileEntity(String fileId) throws IOException {
-        FileEntity fileEntity = fileEntityRepository.findById(fileId)
-                .orElseThrow(() -> {
-                    throw new NotValidFieldException("File not found", new BaseResponse(20007,
-                            MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
-                            Map.of("fileId",fileId)));
-                });
-        byte[] fileBytes;
-
-        if (!isImageFile(fileEntity)) {
-            log.error("File not image: {}", fileEntity.getMimeType());
-            throw new NotValidFieldException("File not image", new BaseResponse(20007,
-                    MessageCode.INVALID_FIELD.getCode(), MessageCode.INVALID_FIELD.getDescription(),
-                    Map.of("file_type", fileEntity.getMimeType())));
-        }
-
-        try {
-            fileBytes = readFileFromDisk(fileEntity);
-        } catch (IOException e) {
-            throw new NotValidFieldException("File not found or cannot read file", new BaseResponse(20007,
-                    MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
-                    Map.of("fileId", fileId,
-                            "filePath", fileEntity.getFilePath())));
-        }
-
-        return callYandexApi(fileBytes);
-    }
-
-    private boolean isImageFile(FileEntity fileEntity) {
-        String mimeType = fileEntity.getMimeType();
-        return mimeType != null && mimeType.startsWith("image");
-    }
-
-    private byte[] readFileFromDisk(FileEntity fileEntity) throws IOException {
-        Path filePath = Path.of(fileEntity.getFilePath());
-
-        if (!Files.exists(filePath)) {
-            throw new IOException("File not found: " + fileEntity.getFilePath());
-        }
-
-        if (!Files.isReadable(filePath)) {
-            throw new IOException("Cannot read file: " + fileEntity.getFilePath());
-        }
-
-        return Files.readAllBytes(filePath);
-    }
-
-    private YandexSearchResponse callYandexApi(byte[] imageBytes) throws IOException {
-        String imageBase64 = Base64.getEncoder().encodeToString(imageBytes);
-        String jsonRequest = String.format("{\"folderId\":\"%s\",\"data\":\"%s\",\"page\":0,\"showSimilarImages\":true}",
-                folderId, imageBase64);
-
-        URL url = new URL(searchUrl);
-        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-
-        try {
-            connection.setRequestMethod("POST");
-            connection.setRequestProperty("Authorization", "Api-Key " + apiKey);
-            connection.setRequestProperty("Content-Type", "application/json");
-            connection.setRequestProperty("Accept", "application/json");
-            connection.setConnectTimeout(30000);
-            connection.setReadTimeout(30000);
-            connection.setDoOutput(true);
-
-            try (OutputStream os = connection.getOutputStream()) {
-                byte[] input = jsonRequest.getBytes("utf-8");
-                os.write(input, 0, input.length);
-                os.flush();
-            }
-
-            int responseCode = connection.getResponseCode();
-
-            String responseBody;
-            if (responseCode == HttpURLConnection.HTTP_OK) {
-                try (BufferedReader br = new BufferedReader(
-                        new InputStreamReader(connection.getInputStream(), "utf-8"))) {
-                    responseBody = readAll(br);
-                }
-            } else {
-                try (BufferedReader br = new BufferedReader(
-                        new InputStreamReader(connection.getErrorStream(), "utf-8"))) {
-                    responseBody = readAll(br);
-                }
-                throw new IOException("Error Yandex API: " + responseCode + " - " + responseBody);
-            }
-
-            return parseJsonResponse(responseBody);
-
-        } finally {
-            connection.disconnect();
-        }
-    }
-
-    private String readAll(BufferedReader reader) throws IOException {
-        StringBuilder sb = new StringBuilder();
-        String line;
-        while ((line = reader.readLine()) != null) {
-            sb.append(line);
-        }
-        return sb.toString();
-    }
-
-    private YandexSearchResponse parseJsonResponse(String json) {
-        YandexSearchResponse response = null;
-        try {
-            response = objectMapper.readValue(json, YandexSearchResponse.class);
-        } catch (JsonProcessingException e) {
-                throw new RuntimeException(e);
-        }
-
-        return response;
-    }
-}

src/main/java/ru/soune/nocopy/service/auth/CleanupTokenSessionsService.java

@@ -1,37 +0,0 @@
-package ru.soune.nocopy.service.auth;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class CleanupTokenSessionsService {
-    @Autowired
-    private AuthTokenRepository authTokenRepository;
-
-    @Value("${file.storage.auth-token-life-hours}")
-    private int authTokenLife;
-
-    @Transactional
-    @Scheduled(fixedDelay = 30000)
-    public void cleanupExpiredTokens() {
-        LocalDateTime now = LocalDateTime.now();
-
-        List<AuthToken> expiredTokens = authTokenRepository.findByExpiresAtBefore(now);
-
-        if (!expiredTokens.isEmpty()) {
-            authTokenRepository.deleteAll(expiredTokens);
-        }
-    }
-}

src/main/java/ru/soune/nocopy/service/file/FileProcessingOrchestrator.java

@@ -0,0 +1,72 @@
+package ru.soune.nocopy.service.file;
+
+import com.vrt.NoCopyFileService;
+import com.vrt.fileprotection.FileProtector;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
+import ru.soune.nocopy.repository.FileEntityRepository;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class FileProcessingOrchestrator {
+
+    private final NoCopyFileService noCopyFileService;
+
+    private final FileEntityRepository fileRepository;
+
+    public void initializeProcessingQueue() {
+        List<FileEntity> filesToProtect = fileRepository.findByProtectionStatus(ProtectionStatus.NOT_PROTECTED);
+
+        for (FileEntity fileEntity : filesToProtect) {
+            try {
+                FileProtector.FileInfo fileInfo = createFileInfo(fileEntity);
+
+                noCopyFileService.addFile(fileInfo);
+
+                log.info("Add to query: {}", fileEntity.getOriginalFileName());
+            } catch (Exception e) {
+                log.error("Fail add to query: {}", fileEntity.getId(), e);
+            }
+        }
+    }
+
+    @Scheduled(fixedDelay = 120000)
+    public void checkNewFilesForProtection() {
+        List<FileEntity> newFiles = fileRepository.findAllActiveFilesAndNotProtected();
+
+        for (FileEntity fileEntity : newFiles) {
+            FileProtector.FileInfo fileInfo = createFileInfo(fileEntity);
+
+            noCopyFileService.addFile(fileInfo);
+        }
+    }
+
+    private FileProtector.FileInfo createFileInfo(FileEntity fileEntity) {
+        FileProtector.Type type = determineFileType(fileEntity.getMimeType());
+
+        return new FileProtector.FileInfo(type, fileEntity.getId(), String.valueOf(fileEntity.getUserId()));
+    }
+
+    private FileProtector.Type determineFileType(String mimeType) {
+        if (mimeType == null) {
+            return FileProtector.Type.IMAGE;
+        }
+
+        if (mimeType.startsWith("image")) {
+            return FileProtector.Type.IMAGE;
+        } else if (mimeType.startsWith("video")) {
+            return FileProtector.Type.VIDEO;
+        } else if (mimeType.startsWith("audio")) {
+            return FileProtector.Type.AUDIO;
+        } else {
+            return FileProtector.Type.IMAGE;
+        }
+    }
+}

src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java

@@ -102,7 +102,7 @@ public class FileUploadServiceImpl implements FileUploadService {
         int totalChunks = (int) Math.ceil((double) fileSize / chunkSize);
         log.debug("File will be split into {} chunks (chunk size: {} bytes)",
                 totalChunks, chunkSize);
-        Long chunkSize = totalChunks == 1 ? fileSize : 1000000L;
+        Long chunkSize = totalChunks == 1 ? fileSize : 1048576L;
 
         FileUploadSession session = FileUploadSession.builder()
                 .userId(userId)

src/main/java/ru/soune/nocopy/service/file/NoCopyProcessingListener.java

@@ -0,0 +1,46 @@
+package ru.soune.nocopy.service.file;
+
+import com.vrt.fileprotection.FileProtector;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
+import ru.soune.nocopy.exception.FileEntityNotFoundException;
+import ru.soune.nocopy.repository.FileEntityRepository;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class NoCopyProcessingListener implements FileProtector.ProcessingListener {
+
+    private final FileEntityRepository fileEntityRepository;
+
+    @Override
+    public void onStartProcessing(FileProtector.FileInfo fileInfo) {
+        changeStatus(ProtectionStatus.PROCESSING, fileInfo.getId());
+    }
+
+    @Override
+    public void onProcessingFailed(FileProtector.FileInfo fileInfo) {
+        changeStatus(ProtectionStatus.FAILED, fileInfo.getId());
+    }
+
+    @Override
+    public void onSavingFailed(FileProtector.FileInfo fileInfo) {
+        changeStatus(ProtectionStatus.FAILED_SAVE, fileInfo.getId());
+    }
+
+    @Override
+    public void onFinish(FileProtector.FileInfo fileInfo) {
+        changeStatus(ProtectionStatus.PROTECTED, fileInfo.getId());;
+    }
+
+    private void changeStatus(ProtectionStatus newStatus, String fileId) {
+        FileEntity fileEntity = fileEntityRepository.findById(fileId)
+                .orElseThrow(() -> new FileEntityNotFoundException(fileId));
+        fileEntity.setProtectionStatus(newStatus);
+
+        fileEntityRepository.save(fileEntity);
+    }
+}

src/main/java/ru/soune/nocopy/service/file/ProtectionFileProvider.java

@@ -0,0 +1,166 @@
+package ru.soune.nocopy.service.file;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.OperationResult;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.repository.FileEntityRepository;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDateTime;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ProtectionFileProvider implements FileProtector.FileProvider {
+
+
+    private final FileEntityRepository fileRepository;
+
+    @Nullable
+    @Override
+    public File getImageFile(@NotNull String id) {
+        return getFileById(id);
+    }
+
+    @Nullable
+    @Override
+    public File getVideoFile(@NotNull String id) {
+        return getFileById(id);
+    }
+
+    @Nullable
+    @Override
+    public File getAudioFile(@NotNull String id) {
+        return getFileById(id);
+    }
+
+    @NotNull
+    @Override
+    public com.vrt.fileprotection.OperationResult writeSignature(@NotNull String s, @NotNull byte[] bytes) {
+        return null;
+    }
+
+    @NotNull
+    @Override
+    public com.vrt.fileprotection.OperationResult writeAudioFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
+        try {
+            writeProtectedFile(id, data, fileExt);
+            return OperationResult.Companion.success();
+        } catch (Exception e) {
+            log.error("Failed to create protected file: {}", id, e);
+            return OperationResult.Companion.failure("Failed to create protected file");
+        }
+    }
+
+    @NotNull
+    @Override
+    public com.vrt.fileprotection.OperationResult writeVideoFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
+        try {
+            writeProtectedFile(id, data, fileExt);
+            return OperationResult.Companion.success();
+        } catch (Exception e) {
+            log.error("Failed to create protected file: {}", id, e);
+            return OperationResult.Companion.failure("Failed to create protected file");
+        }
+    }
+
+    @NotNull
+    @Override
+    public com.vrt.fileprotection.OperationResult writeImageFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
+        try {
+            writeProtectedFile(id, data, fileExt);
+            return OperationResult.Companion.success();
+        } catch (Exception e) {
+            log.error("Failed to create protected file: {}", id, e);
+            return OperationResult.Companion.failure("Failed to create protected file");
+        }
+    }
+
+    @Nullable
+    @Override
+    public File getSignature(@NotNull String s) {
+        return null;
+    }
+
+    private void writeProtectedFile(String id, byte[] data, String fileExt) throws IOException {
+        FileEntity fileEntity = fileRepository.findById(id)
+                .orElseThrow(() -> new RuntimeException("File not found: " + id));
+
+        String extension = determineFileExtension(fileExt, fileEntity);
+        Path protectedFilePath = prepareProtectedPath(fileEntity, extension);
+
+        if (Files.exists(protectedFilePath)) {
+            Files.delete(protectedFilePath);
+        }
+
+        Files.write(protectedFilePath, data);
+
+        fileEntity.setProtectedFilePath(protectedFilePath.toString());
+        fileEntity.setProtectedAt(LocalDateTime.now());
+        fileEntity.setUpdatedAt(LocalDateTime.now());
+        fileEntity.setFileExtension(extension);
+
+        fileRepository.save(fileEntity);
+    }
+
+
+    private File getFileById(String id) {
+        try {
+            FileEntity fileEntity = fileRepository.findById(id).orElseThrow(() ->
+                    new RuntimeException("File not found: " + id));
+
+            File file = new File(fileEntity.getFilePath());
+
+            if (!file.exists()) {
+                throw new RuntimeException("File not found on disk: " + fileEntity.getFilePath());
+            }
+
+            return file;
+        } catch (Exception e) {
+            log.error("Error getting file: {}", id, e);
+            return null;
+        }
+    }
+
+    private String determineFileExtension(String fileExt, FileEntity fileEntity) {
+        if (fileExt != null && !fileExt.trim().isEmpty()) {
+            return fileExt;
+        } else {
+            return fileEntity.getFileExtension();
+        }
+    }
+
+    private Path prepareProtectedPath(FileEntity fileEntity, String extension) throws IOException {
+        Path originalPath = Paths.get(fileEntity.getFilePath());
+
+        String pathStr = originalPath.toString();
+        pathStr = pathStr.replaceFirst("/uploads/uploads/", "/uploads/protected/");
+
+        Path protectedPath = Paths.get(pathStr);
+        String fileName = protectedPath.getFileName().toString();
+
+        if (extension != null) {
+            String nameWithoutExt = fileName;
+            int lastDotIndex = fileName.lastIndexOf('.');
+            if (lastDotIndex > 0) {
+                nameWithoutExt = fileName.substring(0, lastDotIndex);
+            }
+            fileName = nameWithoutExt + "." + extension;
+
+            protectedPath = protectedPath.getParent().resolve(fileName);
+        }
+
+        Files.createDirectories(protectedPath.getParent());
+
+        return protectedPath;
+    }
+}

src/main/resources/application.yaml

@@ -24,12 +24,12 @@ spring:
 file:
   storage:
     base-path: ${FILE_STORAGE_PATH:/data/uploads}
-    chunk-size: ${FILE_CHUNK_SIZE:1000000}  # 1MB
+    #    chunk-size: ${FILE_CHUNK_SIZE:5242880}  # 5MB
+    chunk-size: ${FILE_CHUNK_SIZE:1048576}  # 1MB
     max-file-size: ${MAX_FILE_SIZE:10737418240}  # 10GB
     max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
     chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000}  # 5 минут
     temp-ttl-hours: ${TEMP_TTL_HOURS:72}  # 3 дня
-    auth-token-life-hours: ${AUTH_TOKEN_LIFE:1}  # 1 час
     session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
 
 security:
@@ -51,8 +51,3 @@ logging:
     name: logs/application.log
   pattern:
     console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
-
-yandex:
-  api-key: ${YANDEX_API_KEY:AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q}
-  folder-id: ${YANDEX_FOLDER_ID:b1gokpdbm6qfpsou8pcd}
-  search-url: ${YANDEX_SEARCH_URL:https://searchapi.api.cloud.yandex.net/v2/image/search_by_image}

src/test/java/ru/soune/nocopy/service/AuthServiceTest.java

@@ -0,0 +1,101 @@
+package ru.soune.nocopy.service;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.springframework.context.MessageSource;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import ru.soune.nocopy.dto.LoginRequest;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.exception.NotValidationPasswordException;
+import ru.soune.nocopy.exception.UserNotFoundException;
+import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.repository.UserRepository;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class AuthServiceTest {
+
+    @Mock
+    private UserRepository userRepository;
+
+    @Mock
+    private AuthTokenRepository authTokenRepository;
+
+    @Mock
+    private PasswordEncoder passwordEncoder;
+
+    @Mock
+    private MessageSource messageSource;
+
+    @InjectMocks
+    private AuthService authService;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+    }
+
+    @Test
+    void login_success() {
+        LoginRequest request = new LoginRequest("test@mail.com", "password");
+
+        User user = new User();
+        user.setId(1L);
+        user.setEmail("test@mail.com");
+        user.setPassword("encoded_pass");
+
+        when(userRepository.findByEmail("test@mail.com"))
+                .thenReturn(Optional.of(user));
+        when(passwordEncoder.matches("password", "encoded_pass"))
+                .thenReturn(true);
+        when(authTokenRepository.save(any(AuthToken.class)))
+                .thenAnswer(invocation -> invocation.getArgument(0));
+
+        AuthToken token = authService.login(request);
+
+        assertNotNull(token);
+        assertNotNull(token.getToken());
+//        assertEquals(user.getTokens().get(0), token.getUser());
+
+        ArgumentCaptor<AuthToken> captor = ArgumentCaptor.forClass(AuthToken.class);
+        verify(authTokenRepository).save(captor.capture());
+
+//        assertEquals(user, captor.getValue().getUser());
+        assertNotNull(captor.getValue().getToken());
+    }
+
+
+    @Test
+    void login_userNotFound() {
+        LoginRequest request = new LoginRequest("missing@mail.com", "pwd");
+
+        when(userRepository.findByEmail("missing@mail.com")).thenReturn(Optional.empty());
+
+        assertThrows(UserNotFoundException.class, () -> authService.login(request));
+    }
+
+
+    @Test
+    void login_invalidPassword() {
+        LoginRequest request = new LoginRequest("test@mail.com", "wrong");
+
+        User user = new User();
+        user.setEmail("test@mail.com");
+        user.setPassword("encoded_pass");
+
+        when(userRepository.findByEmail("test@mail.com")).thenReturn(Optional.of(user));
+        when(passwordEncoder.matches("wrong", "encoded_pass")).thenReturn(false);
+
+        assertThrows(NotValidationPasswordException.class, () -> authService.login(request));
+    }
+}