Compare commits
24
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ab3eef1668 | ||
|
|
63c3794aa4 | ||
|
|
d638819ee9 | ||
|
|
51654fd060 | ||
|
|
e37cc06cd0 | ||
|
|
5a3e26b6a3 | ||
|
|
409c677ba6 | ||
|
|
95deda12f3 | ||
|
|
ad9cbd96f6 | ||
|
|
211b99b986 | ||
|
|
60678ef889 | ||
|
|
f0a87648cf | ||
|
|
c2ffcdcd6e | ||
|
|
0c0fadf5ec | ||
|
|
e979712b7c | ||
|
|
5027920199 | ||
|
|
3d679440f6 | ||
|
|
20e1ab321d | ||
|
|
2b7a8b97e1 | ||
|
|
3e06040123 | ||
|
|
18d35cb0fb | ||
|
|
f136ac1f0a | ||
|
|
f1222ede57 | ||
|
|
0da0404488 |
@@ -1,3 +1,18 @@
|
|||||||
|
Создаем сеть:
|
||||||
|
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
|
postgres/postgres
|
||||||
пользователь бд для бэка
|
пользователь бд для бэка
|
||||||
@@ -46,3 +61,18 @@ GRANT ALL ON TABLES TO ncp_db;
|
|||||||
|
|
||||||
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
ALTER DEFAULT PRIVILEGES IN SCHEMA public
|
||||||
GRANT ALL ON SEQUENCES TO ncp_db;
|
GRANT ALL ON SEQUENCES TO ncp_db;
|
||||||
|
|
||||||
|
|
||||||
|
Зайти в контейнер:
|
||||||
|
docker exec -it {name} bash
|
||||||
|
|
||||||
|
------
|
||||||
|
|
||||||
|
Создать для сущности FileEntity sequence для икремента индетификатора
|
||||||
|
|
||||||
|
CREATE SEQUENCE IF NOT EXISTS file_support_id_seq START 1;
|
||||||
|
|
||||||
|
ALTER TABLE file_entities
|
||||||
|
ALTER COLUMN support_id
|
||||||
|
SET DEFAULT nextval('file_support_id_seq');
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,9 @@ configurations {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
flatDir {
|
||||||
|
dirs 'libs'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -51,6 +54,9 @@ dependencies {
|
|||||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
||||||
testImplementation 'org.mockito:mockito-core:5.3.1'
|
testImplementation 'org.mockito:mockito-core:5.3.1'
|
||||||
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
|
||||||
|
|
||||||
|
implementation name: 'testlib-fat-0.2.1-all'
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named('test') {
|
tasks.named('test') {
|
||||||
|
|||||||
@@ -30,8 +30,6 @@ services:
|
|||||||
memory: 1G
|
memory: 1G
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
# POSTGRES_USER: postgres
|
|
||||||
# POSTGRES_PASSWORD: postgres
|
|
||||||
POSTGRES_USER: ${POSTGRES_USER}
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
POSTGRES_SHARED_BUFFERS: 512MB
|
POSTGRES_SHARED_BUFFERS: 512MB
|
||||||
@@ -61,11 +59,8 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
FILE_STORAGE_PATH: /data/uploads
|
FILE_STORAGE_PATH: /data/uploads
|
||||||
MAX_FILE_SIZE: 10737418240
|
MAX_FILE_SIZE: 10737418240
|
||||||
# FILE_CHUNK_SIZE: 1048576
|
|
||||||
FILE_CHUNK_SIZE: 1000000
|
FILE_CHUNK_SIZE: 1000000
|
||||||
POSTGRES_DB: no_copy_
|
POSTGRES_DB: no_copy_
|
||||||
# POSTGRES_USER: postgres
|
|
||||||
# POSTGRES_PASSWORD: postgres
|
|
||||||
POSTGRES_USER: ${POSTGRES_USER}
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
POSTGRES_PORT: 5432
|
POSTGRES_PORT: 5432
|
||||||
|
|||||||
Binary file not shown.
@@ -1,17 +1,49 @@
|
|||||||
package ru.soune.nocopy.configuration;
|
package ru.soune.nocopy.configuration;
|
||||||
|
|
||||||
|
import com.vrt.AudioFilePathProvider;
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import com.vrt.fileprotection.audio.AudioLocalSearch;
|
||||||
|
import com.vrt.fileprotection.image.ImageLocalSearch;
|
||||||
|
import com.vrt.fileprotection.image.ImageUniqueCheck;
|
||||||
|
import com.vrt.fileprotection.image.phash.PerceptualHashHelper;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableAutoConfiguration
|
@EnableAutoConfiguration
|
||||||
|
@AllArgsConstructor
|
||||||
public class ApplicationConfig {
|
public class ApplicationConfig {
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
PasswordEncoder passwordEncoder() {
|
PasswordEncoder passwordEncoder() {
|
||||||
return new BCryptPasswordEncoder();
|
return new BCryptPasswordEncoder();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public com.vrt.
|
||||||
|
NoCopyFileService noCopyFileService(
|
||||||
|
FileProtector.FileProvider fileProvider,
|
||||||
|
FileProtector.ProcessingListener processingListener,
|
||||||
|
ImageUniqueCheck imageUniqueCheck,
|
||||||
|
ImageLocalSearch imageLocalSearch,
|
||||||
|
AudioLocalSearch audioLocalSearch,
|
||||||
|
AudioFilePathProvider audioFilePathProvider) {
|
||||||
|
|
||||||
|
return new com.vrt.NoCopyFileService(
|
||||||
|
Collections.emptyList(),
|
||||||
|
fileProvider,
|
||||||
|
processingListener,
|
||||||
|
imageUniqueCheck,
|
||||||
|
imageLocalSearch,
|
||||||
|
audioLocalSearch,
|
||||||
|
audioFilePathProvider
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ public class HandlerConfig {
|
|||||||
FileUploadHandler upload,
|
FileUploadHandler upload,
|
||||||
FileEntityHandler file,
|
FileEntityHandler file,
|
||||||
LogoutRequestHandler logoutHandler,
|
LogoutRequestHandler logoutHandler,
|
||||||
ImageFoundRequestHandler imageFoundRequestHandler
|
ImageFoundRequestHandler imageFoundRequestHandler,
|
||||||
|
AuthRequestHandler authRequestHandler
|
||||||
) {
|
) {
|
||||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
map.put(20001, login);
|
map.put(20001, login);
|
||||||
@@ -26,6 +27,7 @@ public class HandlerConfig {
|
|||||||
map.put(20005, file);
|
map.put(20005, file);
|
||||||
map.put(20006, logoutHandler);
|
map.put(20006, logoutHandler);
|
||||||
map.put(20007, imageFoundRequestHandler);
|
map.put(20007, imageFoundRequestHandler);
|
||||||
|
map.put(20008, authRequestHandler);
|
||||||
|
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,12 +1,15 @@
|
|||||||
package ru.soune.nocopy.controller;
|
package ru.soune.nocopy.controller;
|
||||||
|
|
||||||
import jakarta.persistence.EntityManager;
|
import com.vrt.NoCopyFileService;
|
||||||
import jakarta.persistence.PersistenceContext;
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import com.vrt.fileprotection.NoCopyCheckResult;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.core.io.Resource;
|
import org.springframework.core.io.Resource;
|
||||||
import org.springframework.core.io.UrlResource;
|
import org.springframework.core.io.UrlResource;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.web.PageableDefault;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
@@ -19,19 +22,24 @@ import ru.soune.nocopy.dto.BaseResponse;
|
|||||||
import ru.soune.nocopy.dto.MessageCode;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
import ru.soune.nocopy.dto.RegAnswer;
|
import ru.soune.nocopy.dto.RegAnswer;
|
||||||
import ru.soune.nocopy.dto.file.*;
|
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.FileEntity;
|
||||||
|
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.file.FileStatus;
|
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.entity.file.UploadStatus;
|
||||||
import ru.soune.nocopy.exception.*;
|
import ru.soune.nocopy.exception.*;
|
||||||
import ru.soune.nocopy.handler.*;
|
import ru.soune.nocopy.handler.*;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
import ru.soune.nocopy.service.FileSimilarityService;
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
import ru.soune.nocopy.service.ImageHashService;
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
import ru.soune.nocopy.service.file.FileEntityService;
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
import ru.soune.nocopy.util.FileUtil;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
@@ -53,12 +61,16 @@ public class ApiController {
|
|||||||
|
|
||||||
private final FileEntityService fileEntityService;
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
private final AuthService authService;
|
||||||
|
|
||||||
private final FileSimilarityService fileSimilarityService;
|
private final FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
private final FileEntityRepository fileEntityRepository;
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
private final NoCopyFileService noCopyFileService;
|
||||||
|
|
||||||
|
private final FileUtil fileUtil;
|
||||||
|
|
||||||
@PostMapping("/v{version}/data")
|
@PostMapping("/v{version}/data")
|
||||||
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
|
||||||
@PathVariable("version") int version) {
|
@PathVariable("version") int version) {
|
||||||
@@ -80,6 +92,9 @@ public class ApiController {
|
|||||||
return ResponseEntity.ok().body(response);
|
return ResponseEntity.ok().body(response);
|
||||||
} catch (ValidationException e) {
|
} catch (ValidationException e) {
|
||||||
return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
|
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) {
|
} catch (NotValidFieldException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -111,68 +126,52 @@ public class ApiController {
|
|||||||
return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
|
return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
|
||||||
}
|
}
|
||||||
|
|
||||||
UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
|
fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
|
||||||
|
|
||||||
if (uploadProgressResponse.getStatus().equals(UploadStatus.COMPLETED)) {
|
|
||||||
ResponseEntity<BaseResponse> duplicateCheckResult = checkForDuplicates(uploadProgressResponse.getUploadId());
|
|
||||||
if (duplicateCheckResult != null) {
|
|
||||||
return duplicateCheckResult;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return buildSuccessResponse(uploadId, chunkNumber, chunk);
|
return buildSuccessResponse(uploadId, chunkNumber, chunk);
|
||||||
|
} catch (DuplicateImageException e) {
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||||
|
MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
|
||||||
|
Map.of("duplicateOwnerId", e.userId(), "duplicateFileId", e.duplicateFileId())));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Error uploading chunk", e);
|
log.error("Error uploading chunk", e);
|
||||||
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> checkForDuplicates(String uploadId) throws IOException {
|
@GetMapping("/v{version}/files/{fileId}/similar")
|
||||||
Optional<FileEntity> uploadedFile = fileEntityRepository.findByUploadSessionId(uploadId);
|
public ResponseEntity<BaseResponse> findSimilarFiles(
|
||||||
|
@PathVariable("version") int version,
|
||||||
|
@PathVariable String fileId,
|
||||||
|
@RequestParam(required = false) List<String> similarityLevels,
|
||||||
|
@PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
|
||||||
|
SimilarityFilter filter = SimilarityFilter.builder()
|
||||||
|
.similarityLevels(similarityLevels)
|
||||||
|
.build();
|
||||||
|
Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable);
|
||||||
|
|
||||||
if (uploadedFile.isEmpty() || !uploadedFile.get().getMimeType().equals("image")) {
|
String messageDesc;
|
||||||
return null;
|
MessageCode success;
|
||||||
|
|
||||||
|
if (similarFiles.isEmpty()) {
|
||||||
|
messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
|
||||||
|
success = MessageCode.FILE_NOT_FOUND;
|
||||||
|
} else {
|
||||||
|
messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
|
||||||
|
success = MessageCode.SIMILAR_FILES_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
FileEntity fileEntity = uploadedFile.get();
|
Map<String, Object> responseData = new HashMap<>();
|
||||||
List<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
|
responseData.put("content", similarFiles.getContent());
|
||||||
|
responseData.put("page", similarFiles.getNumber());
|
||||||
|
responseData.put("size", similarFiles.getSize());
|
||||||
|
responseData.put("totalElements", similarFiles.getTotalElements());
|
||||||
|
responseData.put("totalPages", similarFiles.getTotalPages());
|
||||||
|
responseData.put("hasNext", similarFiles.hasNext());
|
||||||
|
responseData.put("hasPrevious", similarFiles.hasPrevious());
|
||||||
|
|
||||||
if (hasDuplicate(similarFiles)) {
|
return ResponseEntity.ok()
|
||||||
return handleDuplicate(fileEntity, similarFiles);
|
.body(new BaseResponse(20004, success.getCode(), messageDesc, responseData));
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean hasDuplicate(List<SimilarFileResponse> similarFiles) {
|
|
||||||
return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
|
|
||||||
}
|
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileResponse> similarFiles)
|
|
||||||
throws IOException {
|
|
||||||
fileEntityService.deleteFromDisk(fileEntity);
|
|
||||||
|
|
||||||
Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
|
|
||||||
|
|
||||||
if (originalFile.isPresent()) {
|
|
||||||
Map<String, String> duplicateInfo = Map.of(
|
|
||||||
"duplicate_file_id", originalFile.get().getId(),
|
|
||||||
"owner_user_id", String.valueOf(originalFile.get().getUserId()));
|
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(
|
|
||||||
20004,
|
|
||||||
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
|
||||||
"Failed to upload chunk, duplicate",
|
|
||||||
duplicateInfo));
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/files/{fileId}/similar")
|
|
||||||
public List<SimilarFileResponse> getSimilarFiles(@PathVariable String fileId) {
|
|
||||||
return fileSimilarityService.findSimilarFiles(fileId);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/v{version}/files/progress/{uploadId}")
|
@GetMapping("/v{version}/files/progress/{uploadId}")
|
||||||
@@ -205,7 +204,8 @@ public class ApiController {
|
|||||||
.uploadId(uploadId)
|
.uploadId(uploadId)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
||||||
"Failed to get upload progress: " + e.getMessage(), responseBody));
|
"Failed to get upload progress: " + e.getMessage(), responseBody));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -289,7 +289,7 @@ public class ApiController {
|
|||||||
errorData));
|
errorData));
|
||||||
}
|
}
|
||||||
|
|
||||||
Long userId = getUserIdFromToken(tokenHeader);
|
Long userId = authService.useUserAuthToken(tokenHeader);
|
||||||
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
|
||||||
|
|
||||||
if (!entityResponse.getUserId().equals(userId)) {
|
if (!entityResponse.getUserId().equals(userId)) {
|
||||||
@@ -364,6 +364,87 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/protect/{fileId}")
|
||||||
|
public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
|
||||||
|
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
||||||
|
|
||||||
|
if (!optionalFileEntity.isPresent()) {
|
||||||
|
return ResponseEntity.notFound().build();
|
||||||
|
}
|
||||||
|
FileEntity fileEntity = optionalFileEntity.get();
|
||||||
|
FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
|
||||||
|
|
||||||
|
noCopyFileService.addFile(fileInfo);
|
||||||
|
|
||||||
|
fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING);
|
||||||
|
fileEntityRepository.save(fileEntity);
|
||||||
|
|
||||||
|
return ResponseEntity.ok().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/check/{fileId}/{type}")
|
||||||
|
public ResponseEntity<?> check(@PathVariable(required = false) String fileId,
|
||||||
|
@PathVariable(required = false) String type) {
|
||||||
|
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
|
||||||
|
if (!optionalFileEntity.isPresent()) {
|
||||||
|
return ResponseEntity.notFound().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
FileEntity fileEntity = optionalFileEntity.get();
|
||||||
|
|
||||||
|
Path path = Paths.get(fileEntity.getProtectedFilePath());
|
||||||
|
File file = path.toFile();
|
||||||
|
|
||||||
|
NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file,
|
||||||
|
FileProtector.Type.valueOf(type.toUpperCase()));
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(noCopyCheckResult);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> checkForDuplicates(String uploadId) throws IOException {
|
||||||
|
Optional<FileEntity> uploadedFile = fileEntityRepository.findByUploadSessionId(uploadId);
|
||||||
|
|
||||||
|
if (uploadedFile.isEmpty() || !uploadedFile.get().getMimeType().equals("image")) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
FileEntity fileEntity = uploadedFile.get();
|
||||||
|
List<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
|
||||||
|
|
||||||
|
if (hasDuplicate(similarFiles)) {
|
||||||
|
return handleDuplicate(fileEntity, similarFiles);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean hasDuplicate(List<SimilarFileDTO> similarFiles) {
|
||||||
|
return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileDTO> similarFiles)
|
||||||
|
throws IOException {
|
||||||
|
fileEntityService.deleteFromDisk(fileEntity);
|
||||||
|
|
||||||
|
fileEntityService.markAsDeleted(fileEntity);
|
||||||
|
|
||||||
|
Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
|
||||||
|
|
||||||
|
if (originalFile.isPresent()) {
|
||||||
|
Map<String, String> duplicateInfo = Map.of(
|
||||||
|
"duplicate_file_id", originalFile.get().getId(),
|
||||||
|
"owner_user_id", String.valueOf(originalFile.get().getUserId()));
|
||||||
|
|
||||||
|
return ResponseEntity.ok().body(new BaseResponse(
|
||||||
|
20004,
|
||||||
|
MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
|
||||||
|
"Failed to upload chunk, duplicate",
|
||||||
|
duplicateInfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk) {
|
private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk) {
|
||||||
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
|
||||||
.uploadId(uploadId)
|
.uploadId(uploadId)
|
||||||
@@ -427,11 +508,4 @@ public class ApiController {
|
|||||||
}
|
}
|
||||||
return contentType;
|
return contentType;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Long getUserIdFromToken(String tokenHeader) {
|
|
||||||
String token = tokenHeader.replace("Bearer ", "");
|
|
||||||
AuthToken authToken = authTokenRepository.findByToken(token)
|
|
||||||
.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
|
||||||
return authToken.getUser().getId();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -20,8 +20,10 @@ public enum MessageCode {
|
|||||||
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
|
||||||
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
|
AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
|
||||||
AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
|
AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
|
||||||
|
AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
|
||||||
FILE_NOT_FOUND(4, "File not found"),
|
FILE_NOT_FOUND(4, "File not found"),
|
||||||
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
|
AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match"),
|
||||||
|
SIMILAR_FILES_FOUND(0, "Similar files found");
|
||||||
|
|
||||||
private final Integer code;
|
private final Integer code;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
package ru.soune.nocopy.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class TokenProcessRequest {
|
||||||
|
|
||||||
|
@JsonProperty("token")
|
||||||
|
private String token;
|
||||||
|
}
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
package ru.soune.nocopy.dto.file;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class FileApiResponse<T> {
|
|
||||||
|
|
||||||
private boolean success;
|
|
||||||
private String message;
|
|
||||||
private T data;
|
|
||||||
private String error;
|
|
||||||
|
|
||||||
public static <T> FileApiResponse<T> success(T data) {
|
|
||||||
return FileApiResponse.<T>builder()
|
|
||||||
.success(true)
|
|
||||||
.message("Operation completed successfully")
|
|
||||||
.data(data)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T> FileApiResponse<T> success(String message, T data) {
|
|
||||||
return FileApiResponse.<T>builder()
|
|
||||||
.success(true)
|
|
||||||
.message(message)
|
|
||||||
.data(data)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static <T> FileApiResponse<T> error(String error) {
|
|
||||||
return FileApiResponse.<T>builder()
|
|
||||||
.success(false)
|
|
||||||
.error(error)
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -30,4 +30,5 @@ public class FileEntityResponse {
|
|||||||
private String formattedSize;
|
private String formattedSize;
|
||||||
private String downloadUrl;
|
private String downloadUrl;
|
||||||
private boolean existsOnDisk;
|
private boolean existsOnDisk;
|
||||||
|
private Integer supportId;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -5,10 +5,11 @@ import lombok.Value;
|
|||||||
|
|
||||||
@Value
|
@Value
|
||||||
@Builder
|
@Builder
|
||||||
public class SimilarFileResponse {
|
public class SimilarFileDTO {
|
||||||
String fileId;
|
String fileId;
|
||||||
String originalFileName;
|
String originalFileName;
|
||||||
Long fileSize;
|
Long fileSize;
|
||||||
Integer hammingDistance;
|
Integer hammingDistance;
|
||||||
String similarityLevel;
|
String similarityLevel;
|
||||||
|
Long ownerId;
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class SimilarityFilter {
|
||||||
|
private List<String> similarityLevels;
|
||||||
|
private Integer page;
|
||||||
|
private Integer size;
|
||||||
|
}
|
||||||
@@ -30,7 +30,7 @@ public class AuthToken {
|
|||||||
private String token;
|
private String token;
|
||||||
|
|
||||||
@Column(name = "expires_at", nullable = false)
|
@Column(name = "expires_at", nullable = false)
|
||||||
private LocalDateTime expiresAt = LocalDateTime.now().plusDays(30);
|
private LocalDateTime expiresAt = LocalDateTime.now().plusHours(1);
|
||||||
|
|
||||||
@CreatedDate
|
@CreatedDate
|
||||||
@Column(name = "created_at", updatable = false, nullable = false)
|
@Column(name = "created_at", updatable = false, nullable = false)
|
||||||
@@ -41,8 +41,4 @@ public class AuthToken {
|
|||||||
|
|
||||||
@Column(name = "is_active")
|
@Column(name = "is_active")
|
||||||
private Boolean isActive = true;
|
private Boolean isActive = true;
|
||||||
|
|
||||||
public boolean isValid() {
|
|
||||||
return Boolean.TRUE.equals(isActive) && expiresAt.isAfter(LocalDateTime.now());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,49 +0,0 @@
|
|||||||
package ru.soune.nocopy.entity;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import lombok.*;
|
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Table(name = "image_protection")
|
|
||||||
@Getter
|
|
||||||
@Setter
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
@ToString
|
|
||||||
@EntityListeners(AuditingEntityListener.class)
|
|
||||||
public class ImageProtection {
|
|
||||||
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
||||||
private Long protectionId;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
|
||||||
@JoinColumn(name = "user_id", nullable = false)
|
|
||||||
@ToString.Exclude
|
|
||||||
private User user;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
|
||||||
@JoinColumn(name = "content_id", nullable = false)
|
|
||||||
@ToString.Exclude
|
|
||||||
private UserContent content;
|
|
||||||
|
|
||||||
@Column(name = "protection_method", nullable = false, length = 50)
|
|
||||||
private String protectionMethod;
|
|
||||||
|
|
||||||
@Column(name = "protection_level", nullable = false)
|
|
||||||
private Integer protectionLevel;
|
|
||||||
|
|
||||||
@Column(name = "is_active", nullable = false)
|
|
||||||
private Boolean isActive = true;
|
|
||||||
|
|
||||||
@CreatedDate
|
|
||||||
@Column(name = "applied_at", nullable = false, updatable = false)
|
|
||||||
private LocalDateTime appliedAt;
|
|
||||||
|
|
||||||
@Column(name = "metadata", columnDefinition = "JSON")
|
|
||||||
private String metadata;
|
|
||||||
}
|
|
||||||
@@ -84,10 +84,4 @@ public class User {
|
|||||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
@ToString.Exclude
|
@ToString.Exclude
|
||||||
private List<Violation> violations = new ArrayList<>();
|
private List<Violation> violations = new ArrayList<>();}
|
||||||
|
|
||||||
@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
|
|
||||||
@JsonIgnore
|
|
||||||
@ToString.Exclude
|
|
||||||
private List<ImageProtection> imageProtections = new ArrayList<>();
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,11 +1,15 @@
|
|||||||
package ru.soune.nocopy.entity.file;
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
import org.hibernate.annotations.GenerationTime;
|
||||||
import org.springframework.data.annotation.CreatedDate;
|
import org.springframework.data.annotation.CreatedDate;
|
||||||
import org.springframework.data.annotation.LastModifiedDate;
|
import org.springframework.data.annotation.LastModifiedDate;
|
||||||
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
|
|
||||||
|
import java.sql.DriverManager;
|
||||||
|
import java.sql.SQLException;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@@ -16,11 +20,13 @@ import java.time.LocalDateTime;
|
|||||||
@Table(name = "file_entities")
|
@Table(name = "file_entities")
|
||||||
@EntityListeners(AuditingEntityListener.class)
|
@EntityListeners(AuditingEntityListener.class)
|
||||||
public class FileEntity {
|
public class FileEntity {
|
||||||
|
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.UUID)
|
@GeneratedValue(strategy = GenerationType.UUID)
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
|
@Column(name = "support_id", unique = true, updatable = false)
|
||||||
|
private Integer supportId;
|
||||||
|
|
||||||
@Column(name = "user_id", nullable = false)
|
@Column(name = "user_id", nullable = false)
|
||||||
private Long userId;
|
private Long userId;
|
||||||
|
|
||||||
@@ -60,11 +66,34 @@ public class FileEntity {
|
|||||||
@Column(name = "updated_at")
|
@Column(name = "updated_at")
|
||||||
private LocalDateTime updatedAt;
|
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;
|
||||||
|
|
||||||
|
@Column(name = "signature")
|
||||||
|
@JsonIgnore
|
||||||
|
private String signature;
|
||||||
|
|
||||||
|
@OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
|
||||||
|
@JsonIgnore
|
||||||
|
private ImageHashEntity imageHash;
|
||||||
|
|
||||||
@PrePersist
|
@PrePersist
|
||||||
public void prePersist() {
|
public void prePersist() {
|
||||||
if (this.status == null) {
|
if (this.status == null) {
|
||||||
this.status = FileStatus.ACTIVE;
|
this.status = FileStatus.ACTIVE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.protectionStatus == null) {
|
||||||
|
this.protectionStatus = ProtectionStatus.NOT_PROTECTED;
|
||||||
|
}
|
||||||
|
|
||||||
if (this.createdAt == null) {
|
if (this.createdAt == null) {
|
||||||
this.createdAt = LocalDateTime.now();
|
this.createdAt = LocalDateTime.now();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ public enum FileType {
|
|||||||
IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
|
IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
|
||||||
VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
|
VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
|
||||||
"3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
|
"3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
|
||||||
AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
|
AUDIO("audio", List.of("wav"));
|
||||||
|
|
||||||
private final String displayName;
|
private final String displayName;
|
||||||
private final List<String> allowedExtensions;
|
private final List<String> allowedExtensions;
|
||||||
|
|||||||
@@ -26,10 +26,10 @@ public class ImageHashEntity {
|
|||||||
private FileEntity file;
|
private FileEntity file;
|
||||||
|
|
||||||
@Column(name = "hash64_hi")
|
@Column(name = "hash64_hi")
|
||||||
private Integer hash64Hi;
|
private Long hash64Hi;
|
||||||
|
|
||||||
@Column(name = "hash64_lo")
|
@Column(name = "hash64_lo")
|
||||||
private Integer hash64Lo;
|
private Long hash64Lo;
|
||||||
|
|
||||||
@Column(name = "hash_algorithm", nullable = false)
|
@Column(name = "hash_algorithm", nullable = false)
|
||||||
private String hashAlgorithm;
|
private String hashAlgorithm;
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package ru.soune.nocopy.entity.file;
|
||||||
|
|
||||||
|
public enum ProtectionStatus {
|
||||||
|
NOT_PROTECTED,
|
||||||
|
PROCESSING,
|
||||||
|
PROTECTED,
|
||||||
|
FAILED,
|
||||||
|
FAILED_SAVE
|
||||||
|
}
|
||||||
@@ -1,7 +1,20 @@
|
|||||||
package ru.soune.nocopy.exception;
|
package ru.soune.nocopy.exception;
|
||||||
|
|
||||||
public class DuplicateImageException extends RuntimeException {
|
public class DuplicateImageException extends RuntimeException {
|
||||||
public DuplicateImageException(String message) {
|
private final String duplicateFileId;
|
||||||
|
private final Long userId;
|
||||||
|
|
||||||
|
public DuplicateImageException(String message, String duplicateFileId, Long userId) {
|
||||||
super(message);
|
super(message);
|
||||||
|
this.duplicateFileId = duplicateFileId;
|
||||||
|
this.userId = userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String duplicateFileId() {
|
||||||
|
return duplicateFileId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long userId() {
|
||||||
|
return userId;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
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()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,13 +6,12 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.dto.file.*;
|
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.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
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.FileEntityService;
|
||||||
import ru.soune.nocopy.service.file.FileStatsService;
|
import ru.soune.nocopy.service.file.FileStatsService;
|
||||||
|
|
||||||
@@ -26,9 +25,9 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private final FileEntityService fileEntityService;
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
private final FileStatsService fileStatsService;
|
private final AuthService authService;
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
private final FileStatsService fileStatsService;
|
||||||
|
|
||||||
private final ObjectMapper objectMapper;
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
@@ -81,7 +80,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
|
FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(),
|
return new BaseResponse(request.getMsgId(),
|
||||||
@@ -92,7 +91,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
|
FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
|
||||||
|
|
||||||
if (!fileInfo.getUserId().equals(userId)) {
|
if (!fileInfo.getUserId().equals(userId)) {
|
||||||
@@ -123,7 +122,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
|
FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
|
||||||
request.getVersion());
|
request.getVersion());
|
||||||
|
|
||||||
@@ -155,7 +154,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
||||||
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
||||||
|
|
||||||
@@ -182,7 +181,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
||||||
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
||||||
|
|
||||||
@@ -229,7 +228,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
long usage = fileEntityService.getUserStorageUsed(userId);
|
long usage = fileEntityService.getUserStorageUsed(userId);
|
||||||
|
|
||||||
StorageUsageResponse response = StorageUsageResponse.builder()
|
StorageUsageResponse response = StorageUsageResponse.builder()
|
||||||
@@ -259,7 +258,7 @@ public class FileEntityHandler implements RequestHandler {
|
|||||||
|
|
||||||
private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
|
private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
Long userId = authService.useUserAuthToken(fileRequest.getToken());
|
||||||
String fileId = fileRequest.getFileId();
|
String fileId = fileRequest.getFileId();
|
||||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
|
FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
|
||||||
DeleteFileResponse response;
|
DeleteFileResponse response;
|
||||||
@@ -306,20 +305,6 @@ 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) {
|
private String formatFileSize(long size) {
|
||||||
if (size < 1024) return size + " B";
|
if (size < 1024) return size + " B";
|
||||||
int exp = (int) (Math.log(size) / Math.log(1024));
|
int exp = (int) (Math.log(size) / Math.log(1024));
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import ru.soune.nocopy.exception.*;
|
|||||||
import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
|
import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
||||||
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
import ru.soune.nocopy.service.file.FileUploadService;
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -28,6 +29,8 @@ import java.util.stream.Collectors;
|
|||||||
public class FileUploadHandler implements RequestHandler {
|
public class FileUploadHandler implements RequestHandler {
|
||||||
private final FileUploadService fileUploadService;
|
private final FileUploadService fileUploadService;
|
||||||
|
|
||||||
|
private final AuthService authService;
|
||||||
|
|
||||||
private final AuthTokenRepository authTokenRepository;
|
private final AuthTokenRepository authTokenRepository;
|
||||||
|
|
||||||
private final FileUploadSessionRepository fileUploadSessionRepository;
|
private final FileUploadSessionRepository fileUploadSessionRepository;
|
||||||
@@ -86,10 +89,9 @@ public class FileUploadHandler implements RequestHandler {
|
|||||||
MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
|
MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
|
||||||
}
|
}
|
||||||
|
|
||||||
AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
|
Long userId = authService.useUserAuthToken(token);
|
||||||
|
|
||||||
BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
|
BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
|
||||||
fileUploadRequestValidator.validate(fileRequest, bindingResult);
|
fileUploadRequestValidator.validate(fileRequest, bindingResult);
|
||||||
|
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
Map<String, String> fieldErrors = bindingResult.getFieldErrors()
|
Map<String, String> fieldErrors = bindingResult.getFieldErrors()
|
||||||
@@ -105,7 +107,7 @@ public class FileUploadHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
FileUploadSession session = fileUploadService.initUpload(
|
FileUploadSession session = fileUploadService.initUpload(
|
||||||
authToken.getUser().getId(),
|
userId,
|
||||||
fileRequest.getFileName(),
|
fileRequest.getFileName(),
|
||||||
fileRequest.getFileType(),
|
fileRequest.getFileType(),
|
||||||
fileRequest.getExtension(),
|
fileRequest.getExtension(),
|
||||||
@@ -175,34 +177,6 @@ public class FileUploadHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private BaseResponse handleRetryUpload(BaseRequest request, FileUploadRequest fileRequest) {
|
|
||||||
try {
|
|
||||||
fileUploadService.retryFailedUpload(fileRequest.getUploadId());
|
|
||||||
ru.soune.nocopy.dto.file.UploadProgressResponse progress =
|
|
||||||
fileUploadService.getUploadProgress(fileRequest.getUploadId());
|
|
||||||
|
|
||||||
RetryUploadResponse response = RetryUploadResponse.builder()
|
|
||||||
.uploadId(progress.getUploadId())
|
|
||||||
.message("Upload retry initiated")
|
|
||||||
.status(progress.getStatus().toString())
|
|
||||||
.build();
|
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), "Upload retry initiated",
|
|
||||||
response);
|
|
||||||
|
|
||||||
} catch (UploadSessionNotFoundException e) {
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
|
|
||||||
"Upload session not found", null);
|
|
||||||
} catch (FileUploadException e) {
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(),
|
|
||||||
null);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error retrying upload", e);
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
|
|
||||||
"Failed to retry upload", null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private BaseResponse handleGetChunkStatus(BaseRequest request, FileUploadRequest fileRequest) {
|
private BaseResponse handleGetChunkStatus(BaseRequest request, FileUploadRequest fileRequest) {
|
||||||
try {
|
try {
|
||||||
FileUploadSession session = fileUploadSessionRepository.findById(fileRequest.getUploadId())
|
FileUploadSession session = fileUploadSessionRepository.findById(fileRequest.getUploadId())
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import ru.soune.nocopy.dto.*;
|
|||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.AuthService;
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -17,7 +17,9 @@ import java.util.Map;
|
|||||||
public class LoginRequestHandler implements RequestHandler {
|
public class LoginRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
private final UserRepository userRepository;
|
private final UserRepository userRepository;
|
||||||
|
|
||||||
private final AuthService authService;
|
private final AuthService authService;
|
||||||
|
|
||||||
private final ObjectMapper objectMapper;
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -34,9 +36,12 @@ public class LoginRequestHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AuthToken authToken = authService.login(loginRequest);
|
AuthToken authToken = authService.login(loginRequest);
|
||||||
|
String token = authToken.getToken();
|
||||||
|
|
||||||
LoginAnswer loginAnswer = new LoginAnswer();
|
LoginAnswer loginAnswer = new LoginAnswer();
|
||||||
loginAnswer.setToken(authToken.getToken());
|
loginAnswer.setToken(token);
|
||||||
|
|
||||||
|
authService.useUserAuthToken(token);
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
MessageCode.SUCCESS.getDescription(), loginAnswer);
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import ru.soune.nocopy.entity.User;
|
|||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.AuthService;
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import ru.soune.nocopy.exception.NotValidFieldException;
|
|||||||
import ru.soune.nocopy.exception.ValidationException;
|
import ru.soune.nocopy.exception.ValidationException;
|
||||||
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
import ru.soune.nocopy.service.AuthService;
|
import ru.soune.nocopy.service.auth.AuthService;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -52,9 +52,11 @@ public class RegRequestHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AuthToken authToken = authService.register(regRequest);
|
AuthToken authToken = authService.register(regRequest);
|
||||||
|
String token = authToken.getToken();
|
||||||
|
authService.useUserAuthToken(token);
|
||||||
|
|
||||||
RegAnswer regAnswer = new RegAnswer();
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
regAnswer.setToken(authToken.getToken());
|
regAnswer.setToken(token);
|
||||||
|
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
MessageCode.SUCCESS.getDescription(), regAnswer);
|
MessageCode.SUCCESS.getDescription(), regAnswer);
|
||||||
|
|||||||
@@ -1,14 +1,11 @@
|
|||||||
package ru.soune.nocopy.handler.validator;
|
package ru.soune.nocopy.handler.validator;
|
||||||
|
|
||||||
import org.apache.commons.validator.routines.DomainValidator;
|
|
||||||
import org.apache.commons.validator.routines.EmailValidator;
|
import org.apache.commons.validator.routines.EmailValidator;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.validation.Errors;
|
import org.springframework.validation.Errors;
|
||||||
import org.springframework.validation.Validator;
|
import org.springframework.validation.Validator;
|
||||||
import ru.soune.nocopy.dto.RegRequest;
|
import ru.soune.nocopy.dto.RegRequest;
|
||||||
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.net.UnknownHostException;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
@@ -141,15 +138,6 @@ public class RegRequestValidator implements Validator {
|
|||||||
errors.rejectValue("password", "password.contains.spaces",
|
errors.rejectValue("password", "password.contains.spaces",
|
||||||
"Password cannot contain 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) {
|
private void checkPasswordComplexity(String password, Errors errors) {
|
||||||
|
|||||||
@@ -4,11 +4,13 @@ import org.springframework.data.jpa.repository.JpaRepository;
|
|||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
|
public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
|
||||||
Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
|
List<AuthToken> findByExpiresAtBefore(LocalDateTime expiresAtBefore);
|
||||||
|
Optional<AuthToken> findByLastUsedAtBefore(LocalDateTime lastUsedAt);
|
||||||
Optional<AuthToken> findByToken(String token);
|
Optional<AuthToken> findByToken(String token);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,14 +6,15 @@ import org.springframework.data.repository.query.Param;
|
|||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
|
public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
|
||||||
|
|
||||||
List<FileEntity> findByUserId(Long userId);
|
List<FileEntity> findByUserId(Long userId);
|
||||||
|
|
||||||
Optional<FileEntity> findByUserIdAndChecksum(Long userId, String imageHash);
|
Optional<FileEntity> findByUserIdAndChecksum(Long userId, String imageHash);
|
||||||
|
|
||||||
List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
|
List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
|
||||||
@@ -22,13 +23,28 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
|
|||||||
|
|
||||||
Optional<FileEntity> findByUploadSessionId(String uploadSessionId);
|
Optional<FileEntity> findByUploadSessionId(String uploadSessionId);
|
||||||
|
|
||||||
|
List<FileEntity> findByProtectionStatus(ProtectionStatus protectionStatus);
|
||||||
|
|
||||||
boolean existsByFilePath(String filePath);
|
boolean existsByFilePath(String filePath);
|
||||||
|
|
||||||
@Query("SELECT SUM(f.fileSize) FROM FileEntity f WHERE f.userId = :userId AND f.status = 'ACTIVE'")
|
@Query("SELECT SUM(f.fileSize) FROM FileEntity f WHERE f.userId = :userId AND f.status = 'ACTIVE'")
|
||||||
Long getTotalSizeByUserId(@Param("userId") Long userId);
|
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%")
|
@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);
|
List<FileEntity> searchByFileName(@Param("userId") Long userId, @Param("keyword") String keyword);
|
||||||
|
|
||||||
|
@Query("SELECT f FROM FileEntity f WHERE f.status = :status")
|
||||||
|
List<FileEntity> searchFileEntityByStatus(@Param("status") FileStatus status);
|
||||||
|
|
||||||
|
@Query("SELECT f FROM FileEntity f WHERE f.id = :fileId")
|
||||||
|
FileEntity findByFileId(@Param("fileId") String fileId);
|
||||||
|
|
||||||
|
@Query("SELECT f FROM FileEntity f WHERE f.signature = :signature")
|
||||||
|
FileEntity findBySignature(@Param("signature") String signature);
|
||||||
|
|
||||||
long countByUserId(Long userId);
|
long countByUserId(Long userId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,11 @@ import org.springframework.data.jpa.repository.JpaRepository;
|
|||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
import ru.soune.nocopy.entity.file.ImageHashEntity;
|
import ru.soune.nocopy.entity.file.ImageHashEntity;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface ImageHashRepository extends JpaRepository<ImageHashEntity, String> {
|
public interface ImageHashRepository extends JpaRepository<ImageHashEntity, String> {
|
||||||
void deleteByFileId(String fileId);
|
void deleteByFileId(String fileId);
|
||||||
|
List<ImageHashEntity> findByFileId(String fileId);
|
||||||
|
ImageHashEntity findByHash64HiAndHash64Lo(Long hash64Hi, Long hash64Lo);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,8 @@ public interface ImageSimilarityRepository
|
|||||||
extends JpaRepository<FileEntity, String> {
|
extends JpaRepository<FileEntity, String> {
|
||||||
|
|
||||||
@Query(value = """
|
@Query(value = """
|
||||||
SELECT
|
|
||||||
|
SELECT
|
||||||
f.id AS similarFileId,
|
f.id AS similarFileId,
|
||||||
f.original_file_name AS originalFileName,
|
f.original_file_name AS originalFileName,
|
||||||
f.file_size AS fileSize,
|
f.file_size AS fileSize,
|
||||||
@@ -30,6 +31,24 @@ public interface ImageSimilarityRepository
|
|||||||
List<SimilarImageProjection> findCandidates(
|
List<SimilarImageProjection> findCandidates(
|
||||||
@Param("fileId") String fileId
|
@Param("fileId") String fileId
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@Query(value = """
|
||||||
|
SELECT
|
||||||
|
h.hash64_hi AS hash64Hi,
|
||||||
|
h.hash64_lo AS hash64Lo,
|
||||||
|
h.file_id AS fileId,
|
||||||
|
f.user_id AS userId,
|
||||||
|
f.original_file_name AS originalFileName,
|
||||||
|
f.file_size AS fileSize,
|
||||||
|
f.stored_file_name AS similarFileId
|
||||||
|
FROM image_hashes h
|
||||||
|
JOIN file_entities f ON f.id = h.file_id
|
||||||
|
WHERE h.hash64_hi = :hash64Hi
|
||||||
|
AND h.hash64_lo = :hash64Lo
|
||||||
|
""",
|
||||||
|
nativeQuery = true)
|
||||||
|
List<SimilarImageProjection> findExactDuplicates(
|
||||||
|
@Param("hash64Hi") Long hash64_hi,
|
||||||
|
@Param("hash64Lo") Long hash64_lo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
package ru.soune.nocopy.repository;
|
package ru.soune.nocopy.repository;
|
||||||
|
|
||||||
public interface SimilarImageProjection {
|
public interface SimilarImageProjection {
|
||||||
|
Long getHash64Hi();
|
||||||
String getSimilarFileId();
|
Long getHash64Lo();
|
||||||
|
String getFileId();
|
||||||
|
Long getUserId();
|
||||||
String getOriginalFileName();
|
String getOriginalFileName();
|
||||||
|
|
||||||
Long getFileSize();
|
Long getFileSize();
|
||||||
|
|
||||||
Integer getHash64Hi();
|
|
||||||
|
|
||||||
Integer getHash64Lo();
|
|
||||||
}
|
}
|
||||||
@@ -1,37 +1,48 @@
|
|||||||
package ru.soune.nocopy.service;
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.PageImpl;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import ru.soune.nocopy.dto.file.SimilarFileResponse;
|
import ru.soune.nocopy.dto.file.SimilarFileDTO;
|
||||||
|
import ru.soune.nocopy.dto.file.SimilarityFilter;
|
||||||
import ru.soune.nocopy.repository.ImageHashRepository;
|
import ru.soune.nocopy.repository.ImageHashRepository;
|
||||||
import ru.soune.nocopy.repository.ImageSimilarityRepository;
|
import ru.soune.nocopy.repository.ImageSimilarityRepository;
|
||||||
import ru.soune.nocopy.repository.SimilarImageProjection;
|
import ru.soune.nocopy.repository.SimilarImageProjection;
|
||||||
|
import ru.soune.nocopy.util.FileUtil;
|
||||||
|
|
||||||
|
import java.util.AbstractMap;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class FileSimilarityService {
|
public class FileSimilarityService {
|
||||||
|
|
||||||
private final ImageSimilarityRepository repository;
|
private final ImageSimilarityRepository repository;
|
||||||
|
|
||||||
private final ImageHashRepository hashRepository;
|
private final ImageHashRepository hashRepository;
|
||||||
|
|
||||||
public List<SimilarFileResponse> findSimilarFiles(String fileId) {
|
private final FileUtil fileUtil;
|
||||||
|
|
||||||
|
public List<SimilarFileDTO> findSimilarFiles(String fileId) {
|
||||||
var imageHashEntity = hashRepository.findById(fileId)
|
var imageHashEntity = hashRepository.findById(fileId)
|
||||||
.orElseThrow(() -> new RuntimeException("Hash not found"));
|
.orElseThrow(() -> new RuntimeException("Hash not found"));
|
||||||
|
|
||||||
Integer hash64Hi = imageHashEntity.getHash64Hi();
|
Long hash64Hi = imageHashEntity.getHash64Hi();
|
||||||
Integer hash64Lo = imageHashEntity.getHash64Lo();
|
Long hash64Lo = imageHashEntity.getHash64Lo();
|
||||||
|
|
||||||
List<SimilarImageProjection> candidates =
|
List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
|
||||||
repository.findCandidates(fileId);
|
|
||||||
|
|
||||||
return candidates.stream()
|
return candidates.stream()
|
||||||
.map(c -> {
|
.map(c -> {
|
||||||
Integer cHi = c.getHash64Hi();
|
Long cHi = c.getHash64Hi();
|
||||||
Integer cLo = c.getHash64Lo();
|
Long cLo = c.getHash64Lo();
|
||||||
|
|
||||||
int hamming = hamming64(hash64Hi, hash64Lo, cHi, cLo);
|
int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, cHi, cLo);
|
||||||
|
|
||||||
String level;
|
String level;
|
||||||
if (hamming <= 5) {
|
if (hamming <= 5) {
|
||||||
@@ -42,8 +53,8 @@ public class FileSimilarityService {
|
|||||||
level = "DIFFERENT";
|
level = "DIFFERENT";
|
||||||
}
|
}
|
||||||
|
|
||||||
return SimilarFileResponse.builder()
|
return SimilarFileDTO.builder()
|
||||||
.fileId(c.getSimilarFileId())
|
.fileId(c.getFileId())
|
||||||
.originalFileName(c.getOriginalFileName())
|
.originalFileName(c.getOriginalFileName())
|
||||||
.fileSize(c.getFileSize())
|
.fileSize(c.getFileSize())
|
||||||
.hammingDistance(hamming)
|
.hammingDistance(hamming)
|
||||||
@@ -55,8 +66,115 @@ public class FileSimilarityService {
|
|||||||
.toList();
|
.toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
private int hamming64(int aHi, int aLo, int bHi, int bLo) {
|
public List<SimilarFileDTO> findDuplicateByHammingDistance(String fileId, int hammingDistance,
|
||||||
return Integer.bitCount(aHi ^ bHi)
|
int duplicate, int similar) {
|
||||||
+ Integer.bitCount(aLo ^ bLo);
|
List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
|
||||||
|
|
||||||
|
var imageHashEntity = hashRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new RuntimeException("Hash not found"));
|
||||||
|
|
||||||
|
Long hash64Hi = imageHashEntity.getHash64Hi();
|
||||||
|
Long hash64Lo = imageHashEntity.getHash64Lo();
|
||||||
|
|
||||||
|
return candidates.stream()
|
||||||
|
.map(c -> {
|
||||||
|
Long cHi = c.getHash64Hi();
|
||||||
|
Long cLo = c.getHash64Lo();
|
||||||
|
|
||||||
|
int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, cHi, cLo);
|
||||||
|
|
||||||
|
return new AbstractMap.SimpleEntry<>(c, hamming);
|
||||||
|
})
|
||||||
|
.filter(entry -> entry.getValue() <= hammingDistance)
|
||||||
|
.sorted((a, b) -> Integer.compare(a.getValue(), b.getValue()))
|
||||||
|
.map(entry -> {
|
||||||
|
SimilarImageProjection similarImageProjection = entry.getKey();
|
||||||
|
int hamming = entry.getValue();
|
||||||
|
|
||||||
|
String level;
|
||||||
|
if (hamming <= duplicate) {
|
||||||
|
level = "DUPLICATE";
|
||||||
|
} else if (hamming <= similar) {
|
||||||
|
level = "SIMILAR";
|
||||||
|
} else {
|
||||||
|
level = "DIFFERENT";
|
||||||
|
}
|
||||||
|
|
||||||
|
return SimilarFileDTO.builder()
|
||||||
|
.fileId(similarImageProjection.getFileId())
|
||||||
|
.originalFileName(similarImageProjection.getOriginalFileName())
|
||||||
|
.fileSize(similarImageProjection.getFileSize())
|
||||||
|
.hammingDistance(hamming)
|
||||||
|
.similarityLevel(level)
|
||||||
|
.ownerId(similarImageProjection.getUserId())
|
||||||
|
.build();
|
||||||
|
})
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<SimilarImageProjection> findDuplicatedByHash(Long hash64Hi, Long hash64Lo) {
|
||||||
|
List<SimilarImageProjection> duplicates = repository.findExactDuplicates(hash64Hi,hash64Lo);
|
||||||
|
|
||||||
|
if (duplicates.isEmpty()) {
|
||||||
|
return new ArrayList<>();
|
||||||
|
}
|
||||||
|
|
||||||
|
return duplicates;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Page<SimilarFileDTO> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable) {
|
||||||
|
var imageHashEntity = hashRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new RuntimeException("Hash not found"));
|
||||||
|
|
||||||
|
Long hash64Hi = imageHashEntity.getHash64Hi();
|
||||||
|
Long hash64Lo = imageHashEntity.getHash64Lo();
|
||||||
|
|
||||||
|
List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
|
||||||
|
|
||||||
|
List<String> similarityLevels = (filter != null && filter.getSimilarityLevels() != null)
|
||||||
|
? filter.getSimilarityLevels()
|
||||||
|
: List.of("DUPLICATE", "SIMILAR", "DIFFERENT");
|
||||||
|
|
||||||
|
List<SimilarFileDTO> allResults = candidates.stream()
|
||||||
|
.map(c -> createSimilarFileResponse(c, hash64Hi, hash64Lo))
|
||||||
|
.filter(response -> similarityLevels.contains(response.getSimilarityLevel()))
|
||||||
|
.sorted(Comparator.comparingInt(SimilarFileDTO::getHammingDistance))
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
int total = allResults.size();
|
||||||
|
int page = (pageable != null) ? pageable.getPageNumber() : 0;
|
||||||
|
int size = (pageable != null) ? pageable.getPageSize() : 20;
|
||||||
|
|
||||||
|
int fromIndex = Math.min(page * size, total);
|
||||||
|
int toIndex = Math.min(fromIndex + size, total);
|
||||||
|
|
||||||
|
List<SimilarFileDTO> pageContent = allResults.subList(fromIndex, toIndex);
|
||||||
|
|
||||||
|
return new PageImpl<>(pageContent, pageable, total);
|
||||||
|
}
|
||||||
|
|
||||||
|
private SimilarFileDTO createSimilarFileResponse(SimilarImageProjection similarImageProjection,
|
||||||
|
Long hash64Hi, Long hash64Lo) {
|
||||||
|
Long imageProjectionHash64Hi = similarImageProjection.getHash64Hi();
|
||||||
|
Long similarImageProjectionHash64Lo = similarImageProjection.getHash64Lo();
|
||||||
|
|
||||||
|
int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, imageProjectionHash64Hi, similarImageProjectionHash64Lo);
|
||||||
|
|
||||||
|
String level;
|
||||||
|
if (hamming <= 5) {
|
||||||
|
level = "DUPLICATE";
|
||||||
|
} else if (hamming <= 12) {
|
||||||
|
level = "SIMILAR";
|
||||||
|
} else {
|
||||||
|
level = "DIFFERENT";
|
||||||
|
}
|
||||||
|
|
||||||
|
return SimilarFileDTO.builder()
|
||||||
|
.fileId(similarImageProjection.getFileId())
|
||||||
|
.originalFileName(similarImageProjection.getOriginalFileName())
|
||||||
|
.fileSize(similarImageProjection.getFileSize())
|
||||||
|
.hammingDistance(hamming)
|
||||||
|
.similarityLevel(level)
|
||||||
|
.build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package ru.soune.nocopy.service;
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
|
import com.vrt.fileprotection.image.phash.PHash;
|
||||||
|
import com.vrt.fileprotection.image.phash.PerceptualHashHelper;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -7,15 +9,11 @@ import ru.soune.nocopy.entity.file.FileEntity;
|
|||||||
import ru.soune.nocopy.entity.file.ImageHashEntity;
|
import ru.soune.nocopy.entity.file.ImageHashEntity;
|
||||||
import ru.soune.nocopy.repository.ImageHashRepository;
|
import ru.soune.nocopy.repository.ImageHashRepository;
|
||||||
|
|
||||||
import javax.imageio.ImageIO;
|
import java.io.File;
|
||||||
import java.awt.*;
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.Arrays;
|
import java.util.Map;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@@ -24,131 +22,27 @@ public class ImageHashService {
|
|||||||
|
|
||||||
private final ImageHashRepository repository;
|
private final ImageHashRepository repository;
|
||||||
|
|
||||||
public void create(FileEntity file, Path imagePath) {
|
public Map<String, Long> calculateHash(Path imagePath) throws IOException {
|
||||||
try {
|
File file = imagePath.toFile();
|
||||||
long hash64 = computePhash64(imagePath);
|
PHash pHash = PerceptualHashHelper.INSTANCE.generateDCTPerceptualHash(file);
|
||||||
|
Long firstPart = pHash.getFirstPart();
|
||||||
int hi = high32(hash64);
|
Long secondPart = pHash.getSecondPart();
|
||||||
int lo = low32(hash64);
|
Map<String, Long> hash = Map.of(
|
||||||
|
"hi", firstPart,
|
||||||
ImageHashEntity entity = ImageHashEntity.builder()
|
"low", secondPart);
|
||||||
.file(file)
|
|
||||||
.hash64Hi(hi)
|
|
||||||
.hash64Lo(lo)
|
|
||||||
.hashAlgorithm("PHASH64")
|
|
||||||
.createdAt(LocalDateTime.now())
|
|
||||||
.build();
|
|
||||||
|
|
||||||
repository.save(entity);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException("Failed to compute image hash", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private long computePhash64(Path path) throws IOException {
|
|
||||||
try (InputStream is = Files.newInputStream(path)) {
|
|
||||||
BufferedImage image = ImageIO.read(is);
|
|
||||||
if (image == null) throw new IOException("Cannot read image file: " + path);
|
|
||||||
|
|
||||||
BufferedImage gray = toGrayScale(image);
|
|
||||||
BufferedImage resized = resizeImage(gray, 32, 32);
|
|
||||||
|
|
||||||
double[][] dct = applyDCT(resized);
|
|
||||||
double[][] topLeft = extractTopLeft8x8(dct);
|
|
||||||
double median = calculateMedian(topLeft, true);
|
|
||||||
|
|
||||||
return create64BitHashLong(topLeft, median);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private BufferedImage toGrayScale(BufferedImage image) {
|
|
||||||
BufferedImage gray = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
|
|
||||||
Graphics2D g = gray.createGraphics();
|
|
||||||
g.drawImage(image, 0, 0, null);
|
|
||||||
g.dispose();
|
|
||||||
return gray;
|
|
||||||
}
|
|
||||||
|
|
||||||
private BufferedImage resizeImage(BufferedImage image, int width, int height) {
|
|
||||||
BufferedImage resized = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_GRAY);
|
|
||||||
Graphics2D g = resized.createGraphics();
|
|
||||||
g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
|
|
||||||
g.drawImage(image, 0, 0, width, height, null);
|
|
||||||
g.dispose();
|
|
||||||
return resized;
|
|
||||||
}
|
|
||||||
|
|
||||||
private double[][] applyDCT(BufferedImage image) {
|
|
||||||
int w = image.getWidth();
|
|
||||||
int h = image.getHeight();
|
|
||||||
double[][] pixels = new double[h][w];
|
|
||||||
|
|
||||||
for (int y = 0; y < h; y++) {
|
|
||||||
for (int x = 0; x < w; x++) {
|
|
||||||
int gray = image.getRGB(x, y) & 0xFF;
|
|
||||||
pixels[y][x] = gray;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
double[][] dct = new double[h][w];
|
|
||||||
for (int u = 0; u < h; u++) {
|
|
||||||
double au = u == 0 ? 1.0 / Math.sqrt(h) : Math.sqrt(2.0 / h);
|
|
||||||
for (int v = 0; v < w; v++) {
|
|
||||||
double av = v == 0 ? 1.0 / Math.sqrt(w) : Math.sqrt(2.0 / w);
|
|
||||||
double sum = 0.0;
|
|
||||||
for (int x = 0; x < h; x++) {
|
|
||||||
for (int y = 0; y < w; y++) {
|
|
||||||
sum += pixels[x][y] *
|
|
||||||
Math.cos((2 * x + 1) * u * Math.PI / (2.0 * h)) *
|
|
||||||
Math.cos((2 * y + 1) * v * Math.PI / (2.0 * w));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dct[u][v] = au * av * sum;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return dct;
|
|
||||||
}
|
|
||||||
|
|
||||||
private double[][] extractTopLeft8x8(double[][] dct) {
|
|
||||||
double[][] block = new double[8][8];
|
|
||||||
for (int i = 0; i < 8; i++) System.arraycopy(dct[i], 0, block[i], 0, 8);
|
|
||||||
return block;
|
|
||||||
}
|
|
||||||
|
|
||||||
private double calculateMedian(double[][] block, boolean excludeDC) {
|
|
||||||
double[] vals = new double[63];
|
|
||||||
int idx = 0;
|
|
||||||
for (int i = 0; i < 8; i++) {
|
|
||||||
for (int j = 0; j < 8; j++) {
|
|
||||||
if (i == 0 && j == 0 && excludeDC) continue;
|
|
||||||
vals[idx++] = block[i][j];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Arrays.sort(vals);
|
|
||||||
return (vals.length % 2 == 0) ?
|
|
||||||
(vals[vals.length / 2 - 1] + vals[vals.length / 2]) / 2.0 :
|
|
||||||
vals[vals.length / 2];
|
|
||||||
}
|
|
||||||
|
|
||||||
private long create64BitHashLong(double[][] block, double median) {
|
|
||||||
long hash = 0L;
|
|
||||||
|
|
||||||
for (int i = 0; i < 8; i++) {
|
|
||||||
for (int j = 0; j < 8; j++) {
|
|
||||||
if (i == 0 && j == 0) continue;
|
|
||||||
hash <<= 1;
|
|
||||||
if (block[i][j] > median) hash |= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
private int high32(long hash64) {
|
public void create(FileEntity file, Map<String, Long> stringIntegerMap) {
|
||||||
return (int) (hash64 >>> 32);
|
ImageHashEntity entity = ImageHashEntity.builder()
|
||||||
}
|
.file(file)
|
||||||
|
.hash64Hi(stringIntegerMap.get("hi"))
|
||||||
|
.hash64Lo(stringIntegerMap.get("low"))
|
||||||
|
.hashAlgorithm("PHASH64")
|
||||||
|
.createdAt(LocalDateTime.now())
|
||||||
|
.build();
|
||||||
|
|
||||||
private int low32(long hash64) {
|
repository.save(entity);
|
||||||
return (int) hash64;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import ru.soune.nocopy.dto.BaseResponse;
|
|||||||
import ru.soune.nocopy.dto.MessageCode;
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
|||||||
+22
-4
@@ -1,13 +1,13 @@
|
|||||||
package ru.soune.nocopy.service;
|
package ru.soune.nocopy.service.auth;
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.context.MessageSource;
|
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import ru.soune.nocopy.dto.*;
|
import ru.soune.nocopy.dto.*;
|
||||||
import ru.soune.nocopy.entity.AuthToken;
|
import ru.soune.nocopy.entity.AuthToken;
|
||||||
import ru.soune.nocopy.entity.User;
|
import ru.soune.nocopy.entity.User;
|
||||||
|
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||||
import ru.soune.nocopy.repository.UserRepository;
|
import ru.soune.nocopy.repository.UserRepository;
|
||||||
@@ -29,8 +29,6 @@ public class AuthService {
|
|||||||
|
|
||||||
private final PasswordEncoder passwordEncoder;
|
private final PasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
private final MessageSource messageSource;
|
|
||||||
|
|
||||||
private final SecureRandom secureRandom = new SecureRandom();
|
private final SecureRandom secureRandom = new SecureRandom();
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
@@ -81,6 +79,26 @@ public class AuthService {
|
|||||||
return authTokenRepository.save(authToken);
|
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
|
@Transactional
|
||||||
public void logout(String token) {
|
public void logout(String token) {
|
||||||
authTokenRepository.findByToken(token)
|
authTokenRepository.findByToken(token)
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,17 +9,22 @@ import ru.soune.nocopy.dto.file.FileResponse;
|
|||||||
import ru.soune.nocopy.entity.file.FileEntity;
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
import ru.soune.nocopy.entity.file.FileStatus;
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.entity.file.FileUploadSession;
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
|
import ru.soune.nocopy.exception.DuplicateImageException;
|
||||||
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
import ru.soune.nocopy.repository.FileEntityRepository;
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.repository.SimilarImageProjection;
|
||||||
import ru.soune.nocopy.service.FileSimilarityService;
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
import ru.soune.nocopy.service.ImageHashService;
|
import ru.soune.nocopy.service.ImageHashService;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@@ -33,7 +38,7 @@ public class FileEntityService {
|
|||||||
|
|
||||||
private final FileSimilarityService fileSimilarityService;
|
private final FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
@Transactional
|
@Transactional(noRollbackFor = DuplicateImageException.class)
|
||||||
public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
|
public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
|
||||||
log.info("Creating FileEntity for upload session: {}", session.getUploadId());
|
log.info("Creating FileEntity for upload session: {}", session.getUploadId());
|
||||||
|
|
||||||
@@ -44,6 +49,21 @@ public class FileEntityService {
|
|||||||
throw new IOException("File not found on disk: " + filePath);
|
throw new IOException("File not found on disk: " + filePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Map<String, Long> imageHash = Map.of();
|
||||||
|
|
||||||
|
if (session.getFileType().startsWith("image")) {
|
||||||
|
imageHash = imageHashService.calculateHash(filePath);
|
||||||
|
List<SimilarImageProjection> duplicatedByHash = fileSimilarityService.findDuplicatedByHash(
|
||||||
|
imageHash.get("hi"), imageHash.get("low"));
|
||||||
|
|
||||||
|
if (!duplicatedByHash.isEmpty()) {
|
||||||
|
SimilarImageProjection similarImageProjection = duplicatedByHash.get(0);
|
||||||
|
|
||||||
|
throw new DuplicateImageException("Duplicate", similarImageProjection.getFileId(),
|
||||||
|
similarImageProjection.getUserId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
long fileSize = Files.size(filePath);
|
long fileSize = Files.size(filePath);
|
||||||
String originalName = session.getFileName();
|
String originalName = session.getFileName();
|
||||||
String storedName = filePath.getFileName().toString();
|
String storedName = filePath.getFileName().toString();
|
||||||
@@ -63,8 +83,8 @@ public class FileEntityService {
|
|||||||
|
|
||||||
FileEntity saved = fileEntityRepository.save(fileEntity);
|
FileEntity saved = fileEntityRepository.save(fileEntity);
|
||||||
|
|
||||||
if (saved.getMimeType().startsWith("image")) {
|
if (!imageHash.isEmpty()) {
|
||||||
imageHashService.create(saved, Path.of(saved.getFilePath()));
|
imageHashService.create(saved, imageHash);
|
||||||
}
|
}
|
||||||
|
|
||||||
return saved;
|
return saved;
|
||||||
@@ -92,6 +112,39 @@ public class FileEntityService {
|
|||||||
return convertToResponse(fileEntity, version);
|
return convertToResponse(fileEntity, version);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public FileEntityResponse getByFilePath(String filePath, int version) {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findByFilePath(filePath)
|
||||||
|
.orElseThrow(() -> new FileEntityNotFoundException("Path: " + filePath));
|
||||||
|
|
||||||
|
return convertToResponse(fileEntity, version);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
public FileResponse getAllUserFiles(Long userId, int version) {
|
||||||
|
List<FileEntity> fileEntities = fileEntityRepository.findByUserIdAndStatus(
|
||||||
|
userId, FileStatus.ACTIVE);
|
||||||
|
|
||||||
|
List<FileEntityResponse> files = fileEntities.stream()
|
||||||
|
.map(file -> convertToResponse(file, version))
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
long totalSize = fileEntities.stream()
|
||||||
|
.mapToLong(FileEntity::getFileSize)
|
||||||
|
.sum();
|
||||||
|
|
||||||
|
return FileResponse.builder()
|
||||||
|
.files(files)
|
||||||
|
.totalCount(files.size())
|
||||||
|
.totalSize(totalSize)
|
||||||
|
.formattedTotalSize(formatFileSize(totalSize))
|
||||||
|
.page(1)
|
||||||
|
.pageSize(files.size())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
|
public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
|
||||||
List<FileEntity> allFiles = fileEntityRepository.findByUserIdAndStatus(
|
List<FileEntity> allFiles = fileEntityRepository.findByUserIdAndStatus(
|
||||||
@@ -160,6 +213,95 @@ public class FileEntityService {
|
|||||||
return totalSize != null ? totalSize : 0L;
|
return totalSize != null ? totalSize : 0L;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void changeStatus(ProtectionStatus newStatus, String fileId) {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> new FileEntityNotFoundException(fileId));
|
||||||
|
fileEntity.setProtectionStatus(newStatus);
|
||||||
|
|
||||||
|
fileEntityRepository.save(fileEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public void writeProtectedFile(String id, byte[] data, String fileExt) throws IOException {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.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);
|
||||||
|
fileEntity.setProtectionStatus(ProtectionStatus.PROTECTED);
|
||||||
|
|
||||||
|
fileEntityRepository.save(fileEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FileEntity findBySignature(String signature) {
|
||||||
|
return fileEntityRepository.findBySignature(signature);
|
||||||
|
}
|
||||||
|
|
||||||
|
public File getFileById(String id) {
|
||||||
|
try {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateSignature(String signature, String fileId) throws IOException {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
|
||||||
|
fileEntity.setSignature(signature);
|
||||||
|
fileEntity.setProtectionStatus(ProtectionStatus.PROTECTED);
|
||||||
|
fileEntity.setUpdatedAt(LocalDateTime.now());
|
||||||
|
fileEntity.setProtectedAt(LocalDateTime.now());
|
||||||
|
fileEntity.setProtectedFilePath(prepareProtectedPath(fileEntity, fileEntity.getFileExtension()).toString());
|
||||||
|
|
||||||
|
fileEntityRepository.save(fileEntity);
|
||||||
|
}
|
||||||
|
|
||||||
private boolean checkFileExistsOnDisk(String filePath) {
|
private boolean checkFileExistsOnDisk(String filePath) {
|
||||||
try {
|
try {
|
||||||
return Files.exists(Paths.get(filePath));
|
return Files.exists(Paths.get(filePath));
|
||||||
@@ -169,6 +311,14 @@ public class FileEntityService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String determineFileExtension(String fileExt, FileEntity fileEntity) {
|
||||||
|
if (fileExt != null && !fileExt.trim().isEmpty()) {
|
||||||
|
return fileExt;
|
||||||
|
} else {
|
||||||
|
return fileEntity.getFileExtension();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) {
|
private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) {
|
||||||
boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath());
|
boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath());
|
||||||
|
|
||||||
@@ -189,6 +339,7 @@ public class FileEntityService {
|
|||||||
.formattedSize(formatFileSize(fileEntity.getFileSize()))
|
.formattedSize(formatFileSize(fileEntity.getFileSize()))
|
||||||
.downloadUrl("/api/v" + version + "/files/download/" + fileEntity.getId())
|
.downloadUrl("/api/v" + version + "/files/download/" + fileEntity.getId())
|
||||||
.existsOnDisk(existsOnDisk)
|
.existsOnDisk(existsOnDisk)
|
||||||
|
.supportId(fileEntity.getSupportId())
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
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 ru.soune.nocopy.util.FileUtil;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class FileProcessingOrchestrator {
|
||||||
|
|
||||||
|
private final NoCopyFileService noCopyFileService;
|
||||||
|
|
||||||
|
private final FileEntityRepository fileRepository;
|
||||||
|
|
||||||
|
private final FileUtil fileUtil;
|
||||||
|
|
||||||
|
public void initializeProcessingQueue() {
|
||||||
|
List<FileEntity> filesToProtect = fileRepository.findByProtectionStatus(ProtectionStatus.NOT_PROTECTED);
|
||||||
|
|
||||||
|
for (FileEntity fileEntity : filesToProtect) {
|
||||||
|
try {
|
||||||
|
FileProtector.FileInfo fileInfo = fileUtil.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 = fileUtil.createFileInfo(fileEntity);
|
||||||
|
|
||||||
|
noCopyFileService.addFile(fileInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,7 +17,5 @@ public interface FileUploadService {
|
|||||||
|
|
||||||
void handleExpiredSession(FileUploadSession session);
|
void handleExpiredSession(FileUploadSession session);
|
||||||
|
|
||||||
public void retryFailedUpload(String uploadId);
|
|
||||||
|
|
||||||
public void cancelUpload(String uploadId);
|
public void cancelUpload(String uploadId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package ru.soune.nocopy.service.file;
|
||||||
|
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class NotExistFilesCleanupService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
@Scheduled(fixedDelay = 30000)
|
||||||
|
public void cleanUpNotExistFiles() {
|
||||||
|
List<FileEntity> fileEntities = fileEntityRepository.searchFileEntityByStatus(FileStatus.DELETED);
|
||||||
|
|
||||||
|
for (FileEntity fileEntity : fileEntities) {
|
||||||
|
boolean exists = Files.exists(Paths.get(fileEntity.getFilePath()));
|
||||||
|
if (!exists) {
|
||||||
|
fileEntityRepository.delete(fileEntity);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package ru.soune.nocopy.service.file.impl;
|
||||||
|
|
||||||
|
import com.vrt.AudioFilePathProvider;
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class AudioFilePathProviderImpl implements AudioFilePathProvider {
|
||||||
|
|
||||||
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull String providePath(@NotNull FileProtector.FileInfo fileInfo) {
|
||||||
|
String filePath;
|
||||||
|
Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileInfo.getId());
|
||||||
|
|
||||||
|
if (optionalFileEntity.isEmpty()) {
|
||||||
|
throw new NullPointerException();
|
||||||
|
}
|
||||||
|
|
||||||
|
FileEntity fileEntity = optionalFileEntity.get();
|
||||||
|
|
||||||
|
try {
|
||||||
|
filePath = fileEntityService.prepareProtectedPath(fileEntity, fileEntity.getFileExtension()).toString();
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return filePath;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package ru.soune.nocopy.service.file.impl;
|
||||||
|
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import com.vrt.fileprotection.audio.AudioLocalSearch;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
|
import ru.soune.nocopy.util.FileUtil;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class AudioLocalSearchImpl implements AudioLocalSearch {
|
||||||
|
|
||||||
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
|
private final FileUtil fileUtil;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @Nullable FileProtector.FileInfo findBySignature(@NotNull String signature) {
|
||||||
|
FileEntity fileEntity = fileEntityService.findBySignature(signature);
|
||||||
|
|
||||||
|
return fileUtil.createFileInfo(fileEntity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateSignature(@NotNull String signature, @NotNull FileProtector.FileInfo fileInfo) {
|
||||||
|
try {
|
||||||
|
fileEntityService.updateSignature(signature, fileInfo.getId());
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
+135
-51
@@ -1,5 +1,7 @@
|
|||||||
package ru.soune.nocopy.service.file;
|
package ru.soune.nocopy.service.file.impl;
|
||||||
|
|
||||||
|
import com.vrt.NoCopyFileService;
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
import jakarta.annotation.PostConstruct;
|
import jakarta.annotation.PostConstruct;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -10,12 +12,22 @@ import org.springframework.stereotype.Service;
|
|||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
import ru.soune.nocopy.dto.file.UploadProgressResponse;
|
import ru.soune.nocopy.dto.file.UploadProgressResponse;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.FileStatus;
|
||||||
import ru.soune.nocopy.entity.file.FileUploadSession;
|
import ru.soune.nocopy.entity.file.FileUploadSession;
|
||||||
import ru.soune.nocopy.entity.file.UploadStatus;
|
import ru.soune.nocopy.entity.file.UploadStatus;
|
||||||
import ru.soune.nocopy.exception.ChunkSizeExceededException;
|
import ru.soune.nocopy.exception.ChunkSizeExceededException;
|
||||||
|
import ru.soune.nocopy.exception.DuplicateImageException;
|
||||||
import ru.soune.nocopy.exception.FileUploadException;
|
import ru.soune.nocopy.exception.FileUploadException;
|
||||||
import ru.soune.nocopy.exception.UploadSessionNotFoundException;
|
import ru.soune.nocopy.exception.UploadSessionNotFoundException;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
import ru.soune.nocopy.repository.FileUploadSessionRepository;
|
||||||
|
import ru.soune.nocopy.repository.SimilarImageProjection;
|
||||||
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
|
import ru.soune.nocopy.service.ImageHashService;
|
||||||
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
|
import ru.soune.nocopy.service.file.FileUploadService;
|
||||||
|
import ru.soune.nocopy.util.FileUtil;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.nio.file.*;
|
import java.nio.file.*;
|
||||||
@@ -23,10 +35,7 @@ import java.nio.file.attribute.PosixFilePermission;
|
|||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.Comparator;
|
import java.util.*;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
@@ -57,9 +66,22 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
|
|
||||||
private Path storageRoot;
|
private Path storageRoot;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ImageHashService imageHashService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private FileEntityService fileEntityService;
|
private FileEntityService fileEntityService;
|
||||||
|
|
||||||
|
private final NoCopyFileService noCopyFileService;
|
||||||
|
|
||||||
|
private final FileUtil fileUtil;
|
||||||
|
|
||||||
@PostConstruct
|
@PostConstruct
|
||||||
public void init() {
|
public void init() {
|
||||||
try {
|
try {
|
||||||
@@ -129,10 +151,6 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
@Transactional
|
@Transactional
|
||||||
public UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber,
|
public UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber,
|
||||||
MultipartFile chunkFile) {
|
MultipartFile chunkFile) {
|
||||||
|
|
||||||
log.info("Processing chunk {} for session {}, size: {} bytes",
|
|
||||||
chunkNumber, uploadId, chunkFile.getSize());
|
|
||||||
|
|
||||||
FileUploadSession session = sessionRepository.findById(uploadId)
|
FileUploadSession session = sessionRepository.findById(uploadId)
|
||||||
.orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
|
.orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
|
||||||
|
|
||||||
@@ -173,12 +191,13 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
|
|
||||||
@Async("fileUploadTaskExecutor")
|
@Async("fileUploadTaskExecutor")
|
||||||
@Transactional
|
@Transactional
|
||||||
public void assembleFileAsync(FileUploadSession session) {
|
public void assembleFileAsync(FileUploadSession session) throws DuplicateImageException {
|
||||||
try {
|
try {
|
||||||
assembleFile(session);
|
assembleFile(session);
|
||||||
log.info("File assembly completed successfully for session: {}",
|
log.info("File assembly completed successfully for session: {}",
|
||||||
session.getUploadId());
|
session.getUploadId());
|
||||||
|
} catch (DuplicateImageException e) {
|
||||||
|
throw new DuplicateImageException("DUBL", e.duplicateFileId(), e.userId());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Failed to assemble file for session {}: {}",
|
log.error("Failed to assemble file for session {}: {}",
|
||||||
session.getUploadId(), e.getMessage(), e);
|
session.getUploadId(), e.getMessage(), e);
|
||||||
@@ -205,35 +224,6 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
log.info("Upload cancelled: {}", uploadId);
|
log.info("Upload cancelled: {}", uploadId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Transactional
|
|
||||||
public void retryFailedUpload(String uploadId) {
|
|
||||||
FileUploadSession session = sessionRepository.findById(uploadId)
|
|
||||||
.orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
|
|
||||||
|
|
||||||
if (session.getStatus() != UploadStatus.FAILED) {
|
|
||||||
throw new FileUploadException("Only failed uploads can be retried");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (session.getRetryCount() >= maxRetryAttempts) {
|
|
||||||
throw new FileUploadException("Max retry attempts exceeded");
|
|
||||||
}
|
|
||||||
|
|
||||||
session.setStatus(UploadStatus.UPLOADING);
|
|
||||||
session.setRetryCount(session.getRetryCount() + 1);
|
|
||||||
session.setLastError(null);
|
|
||||||
|
|
||||||
sessionRepository.save(session);
|
|
||||||
|
|
||||||
if (session.getChunksUploaded().equals(session.getTotalChunks())) {
|
|
||||||
log.info("Retrying file assembly for session: {}", uploadId);
|
|
||||||
assembleFileAsync(session);
|
|
||||||
}
|
|
||||||
|
|
||||||
log.info("Upload retry initiated for session: {} (attempt {})",
|
|
||||||
uploadId, session.getRetryCount());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public UploadProgressResponse getUploadProgress(String uploadId) {
|
public UploadProgressResponse getUploadProgress(String uploadId) {
|
||||||
FileUploadSession session = sessionRepository.findById(uploadId)
|
FileUploadSession session = sessionRepository.findById(uploadId)
|
||||||
@@ -271,9 +261,47 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private UploadProgressResponse processChunk(FileUploadSession session,
|
@Async("fileUploadTaskExecutor")
|
||||||
Integer chunkNumber,
|
@Transactional
|
||||||
MultipartFile chunkFile) {
|
public void completeFileProcessingAsync(FileUploadSession session) {
|
||||||
|
try {
|
||||||
|
Path filePath = Paths.get(session.getFilePath());
|
||||||
|
String checksum = calculateChecksum(filePath);
|
||||||
|
|
||||||
|
FileEntity fileEntity = FileEntity.builder()
|
||||||
|
.userId(session.getUserId())
|
||||||
|
.originalFileName(session.getFileName())
|
||||||
|
.storedFileName(filePath.getFileName().toString())
|
||||||
|
.filePath(session.getFilePath())
|
||||||
|
.fileSize(session.getFileSize())
|
||||||
|
.mimeType(session.getFileType())
|
||||||
|
.fileExtension(session.getExtension())
|
||||||
|
.checksum(checksum)
|
||||||
|
.uploadSessionId(session.getUploadId())
|
||||||
|
.status(FileStatus.ACTIVE)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
FileEntity saved = fileEntityRepository.save(fileEntity);
|
||||||
|
|
||||||
|
if (session.getFileType().equals("image")) {
|
||||||
|
Map<String, Long> hash = imageHashService.calculateHash(filePath);
|
||||||
|
|
||||||
|
imageHashService.create(saved, hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanupSessionFiles(session);
|
||||||
|
|
||||||
|
noCopyFileService.addFile(fileUtil.createFileInfo(fileEntity));
|
||||||
|
|
||||||
|
log.info("File processing completed for session: {}", session.getUploadId());
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Failed to complete file processing for session {}: {}",
|
||||||
|
session.getUploadId(), e.getMessage(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private UploadProgressResponse processChunk(FileUploadSession session, Integer chunkNumber, MultipartFile chunkFile) {
|
||||||
String chunkPath = null;
|
String chunkPath = null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -291,17 +319,42 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
log.debug("Chunk {} saved successfully. Uploaded: {}/{}",
|
log.debug("Chunk {} saved successfully. Uploaded: {}/{}",
|
||||||
chunkNumber, session.getChunksUploaded(), session.getTotalChunks());
|
chunkNumber, session.getChunksUploaded(), session.getTotalChunks());
|
||||||
|
|
||||||
if (session.getChunksUploaded().equals(session.getTotalChunks())) {
|
boolean isLastChunk = session.getChunksUploaded().equals(session.getTotalChunks());
|
||||||
|
|
||||||
|
if (isLastChunk) {
|
||||||
log.info("All chunks uploaded for session {}. Starting assembly...",
|
log.info("All chunks uploaded for session {}. Starting assembly...",
|
||||||
session.getUploadId());
|
session.getUploadId());
|
||||||
sessionRepository.save(session);
|
|
||||||
assembleFileAsync(session);
|
String finalFilePath = assembleFileSynchronously(session);
|
||||||
|
|
||||||
|
if (session.getFileType().startsWith("image")) {
|
||||||
|
checkForDuplicatesSynchronously(finalFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
session.setStatus(UploadStatus.COMPLETED);
|
||||||
|
session.setFilePath(finalFilePath);
|
||||||
|
|
||||||
|
completeFileProcessingAsync(session);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
sessionRepository.save(session);
|
sessionRepository.save(session);
|
||||||
}
|
}
|
||||||
|
|
||||||
return UploadProgressResponse.fromSession(session);
|
return UploadProgressResponse.fromSession(session);
|
||||||
|
|
||||||
|
} catch (DuplicateImageException e) {
|
||||||
|
if (chunkPath != null) {
|
||||||
|
cleanupFailedChunk(chunkPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
log.warn("Duplicate image found for session {}: {}",
|
||||||
|
session.getUploadId(), e.getMessage());
|
||||||
|
|
||||||
|
session.setStatus(UploadStatus.FAILED);
|
||||||
|
session.setLastError(e.getMessage());
|
||||||
|
sessionRepository.save(session);
|
||||||
|
|
||||||
|
throw e;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
if (chunkPath != null) {
|
if (chunkPath != null) {
|
||||||
cleanupFailedChunk(chunkPath);
|
cleanupFailedChunk(chunkPath);
|
||||||
@@ -318,6 +371,30 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String assembleFileSynchronously(FileUploadSession session) throws IOException {
|
||||||
|
Path finalFilePath = prepareFinalFile(session);
|
||||||
|
|
||||||
|
validateAllChunksExist(session);
|
||||||
|
mergeChunksToFile(session, finalFilePath);
|
||||||
|
validateFinalFile(session, finalFilePath);
|
||||||
|
|
||||||
|
return finalFilePath.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkForDuplicatesSynchronously(String filePath)
|
||||||
|
throws IOException {
|
||||||
|
Path path = Paths.get(filePath);
|
||||||
|
Map<String, Long> hash = imageHashService.calculateHash(path);
|
||||||
|
|
||||||
|
List<SimilarImageProjection> duplicates = fileSimilarityService.findDuplicatedByHash(
|
||||||
|
hash.get("hi"), hash.get("low"));
|
||||||
|
|
||||||
|
if (!duplicates.isEmpty()) {
|
||||||
|
throw new DuplicateImageException("Duplicate", duplicates.get(0).getFileId(),
|
||||||
|
duplicates.get(0).getUserId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private UploadProgressResponse handleExistingChunk(FileUploadSession session,
|
private UploadProgressResponse handleExistingChunk(FileUploadSession session,
|
||||||
Integer chunkNumber,
|
Integer chunkNumber,
|
||||||
MultipartFile chunkFile) throws IOException {
|
MultipartFile chunkFile) throws IOException {
|
||||||
@@ -325,25 +402,24 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
Path chunkPath = Paths.get(existingPath);
|
Path chunkPath = Paths.get(existingPath);
|
||||||
|
|
||||||
if (!Files.exists(chunkPath)) {
|
if (!Files.exists(chunkPath)) {
|
||||||
log.warn("Chunk file missing, re-uploading: {}", chunkPath);
|
|
||||||
session.getChunkPaths().remove(chunkNumber);
|
session.getChunkPaths().remove(chunkNumber);
|
||||||
session.setChunksUploaded(session.getChunksUploaded() - 1);
|
session.setChunksUploaded(session.getChunksUploaded() - 1);
|
||||||
sessionRepository.save(session);
|
sessionRepository.save(session);
|
||||||
|
|
||||||
return processChunk(session, chunkNumber, chunkFile);
|
return processChunk(session, chunkNumber, chunkFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
long existingSize = Files.size(chunkPath);
|
long existingSize = Files.size(chunkPath);
|
||||||
|
|
||||||
if (existingSize != chunkFile.getSize()) {
|
if (existingSize != chunkFile.getSize()) {
|
||||||
log.warn("Chunk size mismatch, re-uploading: {} != {}",
|
|
||||||
existingSize, chunkFile.getSize());
|
|
||||||
Files.deleteIfExists(chunkPath);
|
Files.deleteIfExists(chunkPath);
|
||||||
session.getChunkPaths().remove(chunkNumber);
|
session.getChunkPaths().remove(chunkNumber);
|
||||||
session.setChunksUploaded(session.getChunksUploaded() - 1);
|
session.setChunksUploaded(session.getChunksUploaded() - 1);
|
||||||
sessionRepository.save(session);
|
sessionRepository.save(session);
|
||||||
|
|
||||||
return processChunk(session, chunkNumber, chunkFile);
|
return processChunk(session, chunkNumber, chunkFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
log.debug("Chunk {} already uploaded and valid", chunkNumber);
|
|
||||||
return UploadProgressResponse.fromSession(session);
|
return UploadProgressResponse.fromSession(session);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -421,13 +497,21 @@ public class FileUploadServiceImpl implements FileUploadService {
|
|||||||
session.setChecksum(checksum);
|
session.setChecksum(checksum);
|
||||||
session.setStatus(UploadStatus.COMPLETED);
|
session.setStatus(UploadStatus.COMPLETED);
|
||||||
session.setCompletedAt(LocalDateTime.now());
|
session.setCompletedAt(LocalDateTime.now());
|
||||||
|
|
||||||
sessionRepository.save(session);
|
sessionRepository.save(session);
|
||||||
log.info("Upload session updated to COMPLETED: {}", session.getUploadId());
|
log.info("Upload session updated to COMPLETED: {}", session.getUploadId());
|
||||||
|
|
||||||
try {
|
try {
|
||||||
fileEntityService.createFromUploadSession(session, checksum);
|
FileEntity fileEntity = fileEntityService.createFromUploadSession(session, checksum);
|
||||||
|
|
||||||
|
FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
|
||||||
|
|
||||||
|
noCopyFileService.addFile(fileInfo);
|
||||||
|
|
||||||
log.info("FileEntity successfully created for session: {}",
|
log.info("FileEntity successfully created for session: {}",
|
||||||
session.getUploadId());
|
session.getUploadId());
|
||||||
|
} catch (DuplicateImageException e) {
|
||||||
|
throw new DuplicateImageException("Duplicate", e.duplicateFileId(), e.userId());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("Failed to create FileEntity for session {} (file uploaded, but metadata not saved): {}",
|
log.error("Failed to create FileEntity for session {} (file uploaded, but metadata not saved): {}",
|
||||||
session.getUploadId(), e.getMessage());
|
session.getUploadId(), e.getMessage());
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package ru.soune.nocopy.service.file.impl;
|
||||||
|
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import com.vrt.fileprotection.image.ImageLocalSearch;
|
||||||
|
import com.vrt.fileprotection.image.phash.PHash;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.dto.file.SimilarFileDTO;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.entity.file.ImageHashEntity;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
import ru.soune.nocopy.repository.ImageHashRepository;
|
||||||
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
|
import ru.soune.nocopy.util.FileUtil;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ImageLocalSearchImpl implements ImageLocalSearch {
|
||||||
|
|
||||||
|
private final FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
|
private final ImageHashRepository imageHashRepository;
|
||||||
|
|
||||||
|
private final FileUtil fileUtil;
|
||||||
|
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull List<Result> find(@NotNull FileProtector.FileInfo fileInfo) {
|
||||||
|
List<SimilarFileDTO> duplicateByHammingDistance =
|
||||||
|
fileSimilarityService.findDuplicateByHammingDistance(fileInfo.getId(), 10,
|
||||||
|
5, 10);
|
||||||
|
|
||||||
|
return duplicateByHammingDistance.stream()
|
||||||
|
.map(fileUtil::convertToResult)
|
||||||
|
.toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @Nullable FileProtector.FileInfo findByPHash(@NotNull PHash pHash) {
|
||||||
|
ImageHashEntity imageHashEntity =
|
||||||
|
imageHashRepository.findByHash64HiAndHash64Lo(pHash.getFirstPart(),
|
||||||
|
pHash.getSecondPart());
|
||||||
|
FileEntity file = fileEntityRepository.findByFileId(imageHashEntity.getFileId());
|
||||||
|
|
||||||
|
return new FileProtector.FileInfo(FileProtector.Type.IMAGE, imageHashEntity.getFileId(),
|
||||||
|
String.valueOf(file.getUserId()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package ru.soune.nocopy.service.file.impl;
|
||||||
|
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import com.vrt.fileprotection.OperationResult;
|
||||||
|
import com.vrt.fileprotection.image.ImageUniqueCheck;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.dto.file.SimilarFileDTO;
|
||||||
|
import ru.soune.nocopy.service.FileSimilarityService;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ImageUniqueCheckImpl implements ImageUniqueCheck {
|
||||||
|
|
||||||
|
private final FileSimilarityService fileSimilarityService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull OperationResult check(@NotNull FileProtector.FileInfo fileInfo) {
|
||||||
|
String fileId = fileInfo.getId();
|
||||||
|
List<SimilarFileDTO> duplicateByHammingDistance =
|
||||||
|
fileSimilarityService.findDuplicateByHammingDistance(fileId, 3, 3, 4);
|
||||||
|
|
||||||
|
if (duplicateByHammingDistance == null || duplicateByHammingDistance.isEmpty()) {
|
||||||
|
return OperationResult.Companion.success();
|
||||||
|
} else {
|
||||||
|
return OperationResult.Companion.failure("Duplicate file");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package ru.soune.nocopy.service.file.impl;
|
||||||
|
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.entity.file.ProtectionStatus;
|
||||||
|
import ru.soune.nocopy.service.file.FileEntityService;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class NoCopyProcessingListenerImpl implements FileProtector.ProcessingListener {
|
||||||
|
|
||||||
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStartProcessing(FileProtector.FileInfo fileInfo) {
|
||||||
|
fileEntityService.changeStatus(ProtectionStatus.PROCESSING, fileInfo.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onProcessingFailed(FileProtector.FileInfo fileInfo) {
|
||||||
|
fileEntityService.changeStatus(ProtectionStatus.FAILED, fileInfo.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSavingFailed(FileProtector.FileInfo fileInfo) {
|
||||||
|
fileEntityService.changeStatus(ProtectionStatus.FAILED_SAVE, fileInfo.getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onFinish(FileProtector.FileInfo fileInfo) {
|
||||||
|
fileEntityService.changeStatus(ProtectionStatus.PROTECTED, fileInfo.getId());;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
package ru.soune.nocopy.service.file.impl;
|
||||||
|
|
||||||
|
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.service.file.FileEntityService;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ProtectionFileProviderImpl implements FileProtector.FileProvider {
|
||||||
|
|
||||||
|
private static final Path SIGNATURE_FILE_PATH = Paths.get("/data/uploads/signature");
|
||||||
|
|
||||||
|
private final FileEntityService fileEntityService;
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public File getImageFile(@NotNull String id) {
|
||||||
|
return fileEntityService.getFileById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public File getVideoFile(@NotNull String id) {
|
||||||
|
return fileEntityService.getFileById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public File getAudioFile(@NotNull String id) {
|
||||||
|
return fileEntityService.getFileById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @Nullable File getSignature() {
|
||||||
|
File signatureFile = SIGNATURE_FILE_PATH.toFile();
|
||||||
|
|
||||||
|
if (signatureFile.exists() && signatureFile.isFile() && signatureFile.length() > 0) {
|
||||||
|
return signatureFile;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull OperationResult writeSignature(@NotNull byte[] bytes) {
|
||||||
|
try {
|
||||||
|
Path directory = SIGNATURE_FILE_PATH.getParent();
|
||||||
|
|
||||||
|
if (directory != null && !Files.exists(directory)) {
|
||||||
|
Files.createDirectories(directory);
|
||||||
|
}
|
||||||
|
|
||||||
|
Files.write(SIGNATURE_FILE_PATH, bytes);
|
||||||
|
|
||||||
|
return OperationResult.Companion.success();
|
||||||
|
} catch (IOException e) {
|
||||||
|
return OperationResult.Companion.failure("Not saved signature file");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public com.vrt.fileprotection.OperationResult writeAudioFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
|
||||||
|
try {
|
||||||
|
fileEntityService.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 {
|
||||||
|
fileEntityService.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 {
|
||||||
|
fileEntityService.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");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package ru.soune.nocopy.util;
|
||||||
|
|
||||||
|
import com.vrt.fileprotection.FileProtector;
|
||||||
|
import com.vrt.fileprotection.image.ImageLocalSearch;
|
||||||
|
import com.vrt.fileprotection.image.ImageScore;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.dto.file.SimilarFileDTO;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class FileUtil {
|
||||||
|
public ImageLocalSearch.Result convertToResult(SimilarFileDTO response) {
|
||||||
|
FileProtector.FileInfo fileInfo =
|
||||||
|
new FileProtector.FileInfo(FileProtector.Type.IMAGE, response.getFileId(),
|
||||||
|
String.valueOf(response.getOwnerId()));
|
||||||
|
ImageScore imageScore = new ImageScore(ImageScore.Rate.valueOf(response.getSimilarityLevel()),
|
||||||
|
response.getHammingDistance());
|
||||||
|
|
||||||
|
return new ImageLocalSearch.Result(fileInfo, imageScore);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FileProtector.FileInfo createFileInfo(FileEntity fileEntity) {
|
||||||
|
FileProtector.Type type = determineFileType(fileEntity.getMimeType());
|
||||||
|
|
||||||
|
return new FileProtector.FileInfo(type, fileEntity.getId(), String.valueOf(fileEntity.getUserId()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public int hamming64(long aHi, long aLo, long bHi, long bLo) {
|
||||||
|
return Long.bitCount(aHi ^ bHi)
|
||||||
|
+ Long.bitCount(aLo ^ bLo);
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -28,13 +28,12 @@ spring:
|
|||||||
file:
|
file:
|
||||||
storage:
|
storage:
|
||||||
base-path: ${FILE_STORAGE_PATH:/data/uploads}
|
base-path: ${FILE_STORAGE_PATH:/data/uploads}
|
||||||
# chunk-size: ${FILE_CHUNK_SIZE:5242880} # 5MB
|
|
||||||
# chunk-size: ${FILE_CHUNK_SIZE:1048576} # 1MB
|
|
||||||
chunk-size: ${FILE_CHUNK_SIZE:1000000} # 1MB
|
chunk-size: ${FILE_CHUNK_SIZE:1000000} # 1MB
|
||||||
max-file-size: ${MAX_FILE_SIZE:10737418240} # 10GB
|
max-file-size: ${MAX_FILE_SIZE:10737418240} # 10GB
|
||||||
max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
|
max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
|
||||||
chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут
|
chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000} # 5 минут
|
||||||
temp-ttl-hours: ${TEMP_TTL_HOURS:72} # 3 дня
|
temp-ttl-hours: ${TEMP_TTL_HOURS:72} # 3 дня
|
||||||
|
auth-token-life-hours: ${AUTH_TOKEN_LIFE:1} # 1 час
|
||||||
session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
|
session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
|
||||||
|
|
||||||
security:
|
security:
|
||||||
|
|||||||
Reference in New Issue
Block a user