不使用var
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
## 代码实现原则
|
||||
- 优先保证业务正确性、可维护性、可读性,再考虑炫技。
|
||||
- Java代码统一使用显式类型声明,不使用var,包括局部变量、循环变量和try-with-resources资源变量。
|
||||
- 修改代码时忽略.sql文件,如果遇到需要改表结构,直接发我sql,要求表字段规范且有中文注释。
|
||||
## 日志规范
|
||||
- 关键业务节点必须补充必要日志,方便线上排查。
|
||||
- 不要打印密码、Token、手机号、身份证、支付密钥等敏感信息。
|
||||
- 异常日志必须包含足够定位问题的信息。
|
||||
## 回复规范
|
||||
- 永远用中文回复。
|
||||
- 永远用中文回复。
|
||||
|
||||
+7
-4
@@ -6,12 +6,15 @@ import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.util.Map;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Qualifier;
|
||||
import org.springframework.core.Ordered;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.filter.OncePerRequestFilter;
|
||||
import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
|
||||
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
|
||||
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
|
||||
import org.springframework.web.method.HandlerMethod;
|
||||
import org.springframework.web.servlet.HandlerMapping;
|
||||
@@ -43,7 +46,7 @@ public class EarlyFailureAuditFilter extends OncePerRequestFilter {
|
||||
&& request.getRequestURI().startsWith(request.getContextPath() + "/admin-api/")) {
|
||||
try {
|
||||
// DispatcherServlet clears its parsed path before returning to filters.
|
||||
var handler = resolveWriteHandler(request);
|
||||
HandlerMethod handler = resolveWriteHandler(request);
|
||||
if (handler != null) {
|
||||
audit.preHandle(request, response, handler);
|
||||
if (request.getAttribute(OperationAuditInterceptor.CONTEXT) instanceof OperationAuditInterceptor.Context context) {
|
||||
@@ -63,10 +66,10 @@ public class EarlyFailureAuditFilter extends OncePerRequestFilter {
|
||||
ServletRequestPathUtils.parseAndCache(request);
|
||||
HandlerMethod best = null;
|
||||
PathPattern bestPattern = null;
|
||||
for (var entry : mappings.getHandlerMethods().entrySet()) {
|
||||
for (Map.Entry<RequestMappingInfo, HandlerMethod> entry : mappings.getHandlerMethods().entrySet()) {
|
||||
if (!entry.getValue().hasMethodAnnotation(AuditOperation.class)
|
||||
|| entry.getKey().getMethodsCondition().getMatchingCondition(request) == null) continue;
|
||||
var paths = entry.getKey().getPathPatternsCondition().getMatchingCondition(request);
|
||||
PathPatternsRequestCondition paths = entry.getKey().getPathPatternsCondition().getMatchingCondition(request);
|
||||
if (paths == null) continue;
|
||||
PathPattern pattern = paths.getFirstPattern();
|
||||
if (bestPattern == null || pattern.compareTo(bestPattern) < 0) {
|
||||
@@ -76,7 +79,7 @@ public class EarlyFailureAuditFilter extends OncePerRequestFilter {
|
||||
}
|
||||
if (bestPattern != null) {
|
||||
request.setAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE, bestPattern);
|
||||
var match = bestPattern.matchAndExtract(ServletRequestPathUtils.getParsedRequestPath(request).pathWithinApplication());
|
||||
PathPattern.PathMatchInfo match = bestPattern.matchAndExtract(ServletRequestPathUtils.getParsedRequestPath(request).pathWithinApplication());
|
||||
if (match != null) request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, match.getUriVariables());
|
||||
}
|
||||
return best;
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ public class OperationAuditInterceptor implements HandlerInterceptor {
|
||||
if (!(request.getAttribute(CONTEXT) instanceof Context context)) return;
|
||||
try {
|
||||
OperationLog event = context.event();
|
||||
var target = OperationTargetHolder.get();
|
||||
OperationTargetHolder.Target target = OperationTargetHolder.get();
|
||||
if (target != null) {
|
||||
event.setTargetType(limit(target.type(), 64));
|
||||
event.setTargetId(limit(target.id(), 128));
|
||||
|
||||
+2
-1
@@ -14,6 +14,7 @@ import org.springframework.core.Ordered;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.filter.OncePerRequestFilter;
|
||||
import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
|
||||
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
|
||||
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
|
||||
import org.springframework.web.util.ServletRequestPathUtils;
|
||||
@@ -105,7 +106,7 @@ public class ApiRequestLoggingFilter extends OncePerRequestFilter {
|
||||
if (endpoint.mapping().getMethodsCondition().getMatchingCondition(request) == null) {
|
||||
continue;
|
||||
}
|
||||
var matchingPaths = endpoint.mapping().getPathPatternsCondition().getMatchingCondition(request);
|
||||
PathPatternsRequestCondition matchingPaths = endpoint.mapping().getPathPatternsCondition().getMatchingCondition(request);
|
||||
if (matchingPaths == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
package com.linkerbot.cadworld;
|
||||
|
||||
import ch.qos.logback.classic.Logger;
|
||||
import ch.qos.logback.classic.spi.ILoggingEvent;
|
||||
import ch.qos.logback.core.read.ListAppender;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.linkerbot.cadworld.common.api.OperationTargetHolder;
|
||||
import com.linkerbot.cadworld.entity.OperationLog;
|
||||
import com.linkerbot.cadworld.logging.ApiRequestLogCapture;
|
||||
import com.linkerbot.cadworld.service.OperationLogService;
|
||||
import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider;
|
||||
import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider.UploadSessionClaims;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -20,6 +25,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import org.springframework.test.web.servlet.MockMvc;
|
||||
import org.springframework.test.web.servlet.MvcResult;
|
||||
import org.springframework.web.method.HandlerMethod;
|
||||
|
||||
import static org.assertj.core.api.Assertions.*;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
|
||||
@@ -256,7 +262,7 @@ class AdminApiTest {
|
||||
@Test
|
||||
void invalidExpiredWrongOwnerAndCrossEnvironmentTokensNeverCreateRows() throws Exception {
|
||||
Map<String,Object> body = uploaded();
|
||||
var original = tokens.parseToken(body.get("uploadSessionToken").toString());
|
||||
UploadSessionClaims original = tokens.parseToken(body.get("uploadSessionToken").toString());
|
||||
for (String token : List.of("forged-token",
|
||||
tokens.generateToken(new ComponentUploadSessionTokenProvider.UploadSessionClaims(99L,null,
|
||||
original.componentCode(),original.batch(),original.stepPrefix(),original.urdfPrefix(),original.expiresAt())),
|
||||
@@ -368,17 +374,17 @@ class AdminApiTest {
|
||||
|
||||
@Test
|
||||
void runtimeLogsHideBodiesTokensAndSqlParametersAndEveryEndpointHasDescription() throws Exception {
|
||||
for (var handler : mappings.getHandlerMethods().values()) {
|
||||
for (HandlerMethod handler : mappings.getHandlerMethods().values()) {
|
||||
if (handler.getBeanType().getPackageName().equals("com.linkerbot.cadworld.controller")) {
|
||||
assertThat(handler.getMethodAnnotation(com.linkerbot.cadworld.logging.ApiRequestLog.class)).isNotNull();
|
||||
}
|
||||
}
|
||||
Map<String,Object> body = uploaded();
|
||||
body.put("basicFields",List.of(Map.of("name","备注","value","PRIVATE_FIELD_VALUE")));
|
||||
var mapperLogger = (ch.qos.logback.classic.Logger) org.slf4j.LoggerFactory.getLogger("com.linkerbot.cadworld.mapper");
|
||||
var capture = new ch.qos.logback.core.read.ListAppender<ch.qos.logback.classic.spi.ILoggingEvent>();
|
||||
Logger mapperLogger = (Logger) org.slf4j.LoggerFactory.getLogger("com.linkerbot.cadworld.mapper");
|
||||
ListAppender<ILoggingEvent> capture = new ListAppender<ILoggingEvent>();
|
||||
capture.start(); mapperLogger.addAppender(capture);
|
||||
try (var runtime = new com.linkerbot.cadworld.logging.ApiRequestLogCapture()) {
|
||||
try (ApiRequestLogCapture runtime = new ApiRequestLogCapture()) {
|
||||
create(body);
|
||||
body.put("uploadSessionToken","PRIVATE_TOKEN");
|
||||
expectCreateError(body,422,"INVALID_COMPONENT_UPLOAD_SESSION");
|
||||
|
||||
@@ -6,12 +6,18 @@ import com.linkerbot.cadworld.common.exception.BizException;
|
||||
import com.linkerbot.cadworld.config.OssClientConfiguration;
|
||||
import com.linkerbot.cadworld.config.OssProperties;
|
||||
import com.linkerbot.cadworld.config.StorageProperties;
|
||||
import com.linkerbot.cadworld.service.client.ObjectStorageClient.UploadAuthorization;
|
||||
import com.linkerbot.cadworld.service.client.OssObjectStorageClient;
|
||||
import com.linkerbot.cadworld.service.support.StorageObjectKeys;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.net.http.HttpClient;
|
||||
import java.net.http.HttpRequest;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -55,13 +61,13 @@ class OssObjectStorageIT {
|
||||
String mesh = prefix + "meshes/base.stl";
|
||||
String oversized = prefix + "oversized.rfs";
|
||||
String outside = keys.underRoot("outside.rfs");
|
||||
var attempted = java.util.List.of(model, mesh, oversized, outside);
|
||||
List<String> attempted = List.of(model, mesh, oversized, outside);
|
||||
Path journal = Path.of("logs", "oss-verification-pending", RUN_ID + ".txt");
|
||||
Files.createDirectories(journal.getParent());
|
||||
Files.write(journal, attempted);
|
||||
Throwable originalFailure = null;
|
||||
var authorization = storage.createUploadAuthorization(prefix, java.time.Instant.now().plusSeconds(300));
|
||||
try (var http = java.net.http.HttpClient.newBuilder().connectTimeout(java.time.Duration.ofSeconds(10)).build()) {
|
||||
UploadAuthorization authorization = storage.createUploadAuthorization(prefix, java.time.Instant.now().plusSeconds(300));
|
||||
try (HttpClient http = HttpClient.newBuilder().connectTimeout(java.time.Duration.ofSeconds(10)).build()) {
|
||||
assertThat(post(http, authorization, model, new byte[]{1,2})).isEqualTo(204);
|
||||
assertThat(post(http, authorization, mesh, new byte[]{3,4})).isEqualTo(204);
|
||||
assertThat(storage.statObject(model).contentLength()).isEqualTo(2);
|
||||
@@ -78,7 +84,7 @@ class OssObjectStorageIT {
|
||||
originalFailure = failure;
|
||||
throw failure;
|
||||
} finally {
|
||||
var pending = new java.util.ArrayList<String>();
|
||||
ArrayList<String> pending = new ArrayList<String>();
|
||||
for (String key : attempted) {
|
||||
try {
|
||||
if (storage.objectExists(key)) storage.deleteObject(key);
|
||||
@@ -91,7 +97,7 @@ class OssObjectStorageIT {
|
||||
if (pending.isEmpty()) Files.deleteIfExists(journal);
|
||||
else {
|
||||
Files.write(journal,pending);
|
||||
var cleanupFailure = new AssertionError("OSS 清理失败,准确 Key 记录在 " + journal);
|
||||
AssertionError cleanupFailure = new AssertionError("OSS 清理失败,准确 Key 记录在 " + journal);
|
||||
if (originalFailure == null) throw cleanupFailure;
|
||||
originalFailure.addSuppressed(cleanupFailure);
|
||||
}
|
||||
@@ -103,7 +109,7 @@ class OssObjectStorageIT {
|
||||
String key, byte[] bytes) throws Exception {
|
||||
String boundary = "cadworld-" + UUID.randomUUID();
|
||||
ByteArrayOutputStream body = new ByteArrayOutputStream();
|
||||
for (var field : authorization.uploadFields().entrySet()) {
|
||||
for (Map.Entry<String, String> field : authorization.uploadFields().entrySet()) {
|
||||
multipartField(body,boundary,field.getKey(),field.getValue());
|
||||
}
|
||||
multipartField(body,boundary,"key",key);
|
||||
@@ -111,7 +117,7 @@ class OssObjectStorageIT {
|
||||
+ "Content-Type: application/octet-stream\r\n\r\n").getBytes(java.nio.charset.StandardCharsets.UTF_8));
|
||||
body.write(bytes);
|
||||
body.write(("\r\n--" + boundary + "--\r\n").getBytes(java.nio.charset.StandardCharsets.UTF_8));
|
||||
var request = java.net.http.HttpRequest.newBuilder(java.net.URI.create(authorization.uploadUrl()))
|
||||
HttpRequest request = HttpRequest.newBuilder(java.net.URI.create(authorization.uploadUrl()))
|
||||
.timeout(java.time.Duration.ofSeconds(30))
|
||||
.header("Content-Type","multipart/form-data; boundary=" + boundary)
|
||||
.POST(java.net.http.HttpRequest.BodyPublishers.ofByteArray(body.toByteArray())).build();
|
||||
|
||||
@@ -5,6 +5,7 @@ import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.boot.test.web.client.TestRestTemplate;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import java.util.List;
|
||||
@@ -31,7 +32,7 @@ class UploadHttpTest {
|
||||
String main = session.path("urdf").path("keyPrefix").asText()+"robot.urdf";
|
||||
storage.simulateDirectUpload(step,"application/octet-stream",new byte[1025]);
|
||||
storage.simulateDirectUpload(main,"application/xml",new byte[]{1});
|
||||
var response = http.postForEntity("/admin-api/components",Map.of(
|
||||
ResponseEntity<String> response = http.postForEntity("/admin-api/components",Map.of(
|
||||
"componentName","超限测试","category","安装板","uploadSessionToken",session.path("uploadSessionToken").asText(),
|
||||
"stepObjectKey",step,"urdfObjectKeys",List.of(main)),String.class);
|
||||
assertThat(response.getStatusCode().value()).isEqualTo(413);
|
||||
|
||||
+15
-11
@@ -1,12 +1,16 @@
|
||||
package com.linkerbot.cadworld.audit;
|
||||
|
||||
import com.linkerbot.cadworld.config.AdminOperatorProperties;
|
||||
import com.linkerbot.cadworld.entity.OperationLog;
|
||||
import com.linkerbot.cadworld.service.AdminOperatorProvider;
|
||||
import com.linkerbot.cadworld.service.OperationLogService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.springframework.mock.web.MockHttpServletRequest;
|
||||
import org.springframework.mock.web.MockHttpServletResponse;
|
||||
import org.springframework.web.method.HandlerMethod;
|
||||
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
|
||||
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
|
||||
|
||||
import static org.assertj.core.api.Assertions.*;
|
||||
import static org.mockito.Mockito.*;
|
||||
@@ -16,18 +20,18 @@ class OperationAuditInterceptorTest {
|
||||
void multipartFailureBeforeMvcIsAuditedOnce() throws Exception {
|
||||
OperationLogService service = mock(OperationLogService.class);
|
||||
OperationAuditInterceptor audit = new OperationAuditInterceptor(service, new AdminOperatorProvider(new AdminOperatorProperties(0, "TEST_OPERATOR")));
|
||||
var mappings = mock(org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping.class);
|
||||
var request = new MockHttpServletRequest("POST", "/admin-api/components");
|
||||
var response = new MockHttpServletResponse();
|
||||
var handler = new HandlerMethod(this, getClass().getDeclaredMethod("operation"));
|
||||
var options = new org.springframework.web.servlet.mvc.method.RequestMappingInfo.BuilderConfiguration();
|
||||
RequestMappingHandlerMapping mappings = mock(RequestMappingHandlerMapping.class);
|
||||
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/admin-api/components");
|
||||
MockHttpServletResponse response = new MockHttpServletResponse();
|
||||
HandlerMethod handler = new HandlerMethod(this, getClass().getDeclaredMethod("operation"));
|
||||
RequestMappingInfo.BuilderConfiguration options = new RequestMappingInfo.BuilderConfiguration();
|
||||
options.setPatternParser(new org.springframework.web.util.pattern.PathPatternParser());
|
||||
var mapping = org.springframework.web.servlet.mvc.method.RequestMappingInfo.paths("/admin-api/components")
|
||||
RequestMappingInfo mapping = RequestMappingInfo.paths("/admin-api/components")
|
||||
.methods(org.springframework.web.bind.annotation.RequestMethod.POST).options(options).build();
|
||||
when(mappings.getHandlerMethods()).thenReturn(java.util.Map.of(mapping, handler));
|
||||
var filter = new EarlyFailureAuditFilter(mappings, audit);
|
||||
EarlyFailureAuditFilter filter = new EarlyFailureAuditFilter(mappings, audit);
|
||||
filter.doFilter(request, response, (req, res) -> ((jakarta.servlet.http.HttpServletResponse) res).setStatus(413));
|
||||
var captured = org.mockito.ArgumentCaptor.forClass(com.linkerbot.cadworld.entity.OperationLog.class);
|
||||
ArgumentCaptor<OperationLog> captured = ArgumentCaptor.forClass(OperationLog.class);
|
||||
verify(service).record(captured.capture());
|
||||
assertThat(captured.getValue().getSuccess()).isFalse();
|
||||
assertThat(captured.getValue().getHttpStatus()).isEqualTo(413);
|
||||
@@ -38,9 +42,9 @@ class OperationAuditInterceptorTest {
|
||||
OperationLogService service = mock(OperationLogService.class);
|
||||
doThrow(new IllegalStateException("database unavailable")).when(service).record(any());
|
||||
OperationAuditInterceptor audit = new OperationAuditInterceptor(service, new AdminOperatorProvider(new AdminOperatorProperties(0, "TEST_OPERATOR")));
|
||||
var request = new MockHttpServletRequest("POST", "/admin-api/components");
|
||||
var response = new MockHttpServletResponse();
|
||||
var handler = new HandlerMethod(this, getClass().getDeclaredMethod("operation"));
|
||||
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/admin-api/components");
|
||||
MockHttpServletResponse response = new MockHttpServletResponse();
|
||||
HandlerMethod handler = new HandlerMethod(this, getClass().getDeclaredMethod("operation"));
|
||||
audit.preHandle(request, response, handler);
|
||||
audit.afterCompletion(request, response, handler, null);
|
||||
verify(service).record(any());
|
||||
|
||||
+12
-12
@@ -20,13 +20,13 @@ import static org.mockito.Mockito.*;
|
||||
class ApiRequestLoggingFilterTest {
|
||||
@Test
|
||||
void binaryDownloadLogs200WithoutReadingParametersOrFileContent() throws Exception {
|
||||
var filter = filter("/admin-api/component-assets/**", RequestMethod.GET);
|
||||
var request = spy(new MockHttpServletRequest("GET", "/admin-api/component-assets/test.urdf"));
|
||||
ApiRequestLoggingFilter filter = filter("/admin-api/component-assets/**", RequestMethod.GET);
|
||||
MockHttpServletRequest request = spy(new MockHttpServletRequest("GET", "/admin-api/component-assets/test.urdf"));
|
||||
request.setQueryString("objectKey=13800000001-secret-token.txt");
|
||||
request.setContent("private file content".getBytes(java.nio.charset.StandardCharsets.UTF_8));
|
||||
request.addHeader("X-Request-Id", "binary-log-test");
|
||||
var response = new MockHttpServletResponse();
|
||||
try (var captured = new ApiRequestLogCapture()) {
|
||||
MockHttpServletResponse response = new MockHttpServletResponse();
|
||||
try (ApiRequestLogCapture captured = new ApiRequestLogCapture()) {
|
||||
new RequestIdFilter().doFilter(request, response, (req, res) ->
|
||||
filter.doFilter(req, res, (innerRequest, innerResponse) -> response.setStatus(200)));
|
||||
|
||||
@@ -44,13 +44,13 @@ class ApiRequestLoggingFilterTest {
|
||||
|
||||
@Test
|
||||
void downloadFailureRetainsOriginalExceptionAndHidesSensitiveMessagesAndFilePath() throws Exception {
|
||||
var filter = filter("/admin-api/component-assets/**", RequestMethod.GET);
|
||||
var request = new MockHttpServletRequest("GET", "/cadworld/admin-api/component-assets/13800000001-private-token.png");
|
||||
ApiRequestLoggingFilter filter = filter("/admin-api/component-assets/**", RequestMethod.GET);
|
||||
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/cadworld/admin-api/component-assets/13800000001-private-token.png");
|
||||
request.setContextPath("/cadworld");
|
||||
request.addHeader("X-Request-Id", "download-log-test");
|
||||
var response = new MockHttpServletResponse();
|
||||
MockHttpServletResponse response = new MockHttpServletResponse();
|
||||
IOException failure = new IOException("password=private-password, phone=13800000001");
|
||||
try (var captured = new ApiRequestLogCapture()) {
|
||||
try (ApiRequestLogCapture captured = new ApiRequestLogCapture()) {
|
||||
assertThatThrownBy(() -> new RequestIdFilter().doFilter(request, response, (req, res) ->
|
||||
filter.doFilter(req, res, (innerRequest, innerResponse) -> { throw failure; })))
|
||||
.isSameAs(failure);
|
||||
@@ -67,11 +67,11 @@ class ApiRequestLoggingFilterTest {
|
||||
}
|
||||
|
||||
private ApiRequestLoggingFilter filter(String path, RequestMethod method) throws Exception {
|
||||
var options = new RequestMappingInfo.BuilderConfiguration();
|
||||
RequestMappingInfo.BuilderConfiguration options = new RequestMappingInfo.BuilderConfiguration();
|
||||
options.setPatternParser(PathPatternParser.defaultInstance);
|
||||
var mapping = RequestMappingInfo.paths(path).methods(method).options(options).build();
|
||||
var handler = new HandlerMethod(this, getClass().getDeclaredMethod("endpoint"));
|
||||
var mappings = mock(RequestMappingHandlerMapping.class);
|
||||
RequestMappingInfo mapping = RequestMappingInfo.paths(path).methods(method).options(options).build();
|
||||
HandlerMethod handler = new HandlerMethod(this, getClass().getDeclaredMethod("endpoint"));
|
||||
RequestMappingHandlerMapping mappings = mock(RequestMappingHandlerMapping.class);
|
||||
when(mappings.getHandlerMethods()).thenReturn(Map.of(mapping, handler));
|
||||
return new ApiRequestLoggingFilter(mappings);
|
||||
}
|
||||
|
||||
+1
-1
@@ -64,7 +64,7 @@ public class GlobalExceptionHandler {
|
||||
public ResponseEntity<ApiResponse<Void>> handleMethodNotAllowed(HttpRequestMethodNotSupportedException exception,
|
||||
HttpServletRequest request) {
|
||||
request.setAttribute("cadworld.operationError", "请求方法不支持");
|
||||
var headers = new HttpHeaders();
|
||||
HttpHeaders headers = new HttpHeaders();
|
||||
if (exception.getSupportedHttpMethods() != null) headers.setAllow(exception.getSupportedHttpMethods());
|
||||
return new ResponseEntity<>(ApiResponse.failure(ApiCode.INVALID_REQUEST, "请求方法不支持"),
|
||||
headers, HttpStatus.METHOD_NOT_ALLOWED);
|
||||
|
||||
+6
-5
@@ -5,6 +5,7 @@ import com.linkerbot.cadworld.common.exception.BizException;
|
||||
import com.linkerbot.cadworld.dto.storage.UploadSignatureRequest;
|
||||
import com.linkerbot.cadworld.dto.storage.UploadSignatureResponse;
|
||||
import com.linkerbot.cadworld.dto.storage.UploadSignatureResponse.UploadAuthorization;
|
||||
import com.linkerbot.cadworld.entity.Component;
|
||||
import com.linkerbot.cadworld.mapper.ComponentMapper;
|
||||
import com.linkerbot.cadworld.service.client.ObjectStorageClient;
|
||||
import com.linkerbot.cadworld.service.impl.ComponentUploadSupport;
|
||||
@@ -39,7 +40,7 @@ public class UploadSignatureService {
|
||||
token = request.uploadSessionToken();
|
||||
session = support.requireUploadSession(userId, token);
|
||||
if (session.componentId() != null) {
|
||||
var component = components.selectById(session.componentId());
|
||||
Component component = components.selectById(session.componentId());
|
||||
if (component == null) throw new BizException(404, "COMPONENT_NOT_FOUND", "组件不存在");
|
||||
support.requireComponent(session, component.getId(), component.getComponentCode());
|
||||
}
|
||||
@@ -48,7 +49,7 @@ public class UploadSignatureService {
|
||||
if (request.componentId() == null) {
|
||||
code = "CW-" + randomId().toUpperCase(Locale.ROOT);
|
||||
} else {
|
||||
var component = components.selectById(request.componentId());
|
||||
Component component = components.selectById(request.componentId());
|
||||
if (component == null) throw new BizException(404, "COMPONENT_NOT_FOUND", "组件不存在");
|
||||
code = component.getComponentCode();
|
||||
}
|
||||
@@ -60,15 +61,15 @@ public class UploadSignatureService {
|
||||
}
|
||||
Instant expiresAt = Instant.now().plus(support.signatureTtl());
|
||||
if (expiresAt.isAfter(session.expiresAt())) expiresAt = session.expiresAt();
|
||||
var step = authorize(session.stepPrefix(), expiresAt);
|
||||
var urdf = authorize(session.urdfPrefix(), expiresAt);
|
||||
UploadAuthorization step = authorize(session.stepPrefix(), expiresAt);
|
||||
UploadAuthorization urdf = authorize(session.urdfPrefix(), expiresAt);
|
||||
log.info("组件上传签名完成 componentCode={} componentId={} renewal={} userId={} requestId={} expiresAt={}",
|
||||
session.componentCode(), session.componentId(), renewal, userId, RequestIdHolder.get(), expiresAt);
|
||||
return new UploadSignatureResponse(session.componentCode(), token, session.expiresAt(), expiresAt, step, urdf);
|
||||
}
|
||||
|
||||
private UploadAuthorization authorize(String prefix, Instant expiresAt) {
|
||||
var authorization = storage.createUploadAuthorization(prefix, expiresAt);
|
||||
ObjectStorageClient.UploadAuthorization authorization = storage.createUploadAuthorization(prefix, expiresAt);
|
||||
return new UploadAuthorization(authorization.uploadUrl(), prefix, authorization.uploadFields(), "POST");
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -70,7 +70,7 @@ public class OssObjectStorageClient implements ObjectStorageClient {
|
||||
UploadLimits.checkLength(0, storageProperties.maxUploadBytes());
|
||||
String date = DateTimeFormatter.ofPattern("yyyyMMdd").withZone(ZoneOffset.UTC).format(signingTime);
|
||||
String timestamp = DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss'Z'").withZone(ZoneOffset.UTC).format(signingTime);
|
||||
var fields = new LinkedHashMap<String, String>();
|
||||
LinkedHashMap<String, String> fields = new LinkedHashMap<String, String>();
|
||||
fields.put("x-oss-signature-version", "OSS4-HMAC-SHA256");
|
||||
fields.put("x-oss-credential", properties.accessKeyId().trim() + "/" + date + "/" + properties.regionId() + "/oss/aliyun_v4_request");
|
||||
fields.put("x-oss-date", timestamp);
|
||||
|
||||
+5
-4
@@ -14,6 +14,7 @@ import com.linkerbot.cadworld.dto.component.*;
|
||||
import com.linkerbot.cadworld.entity.Component;
|
||||
import com.linkerbot.cadworld.mapper.ComponentMapper;
|
||||
import com.linkerbot.cadworld.service.ComponentService;
|
||||
import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider.UploadSessionClaims;
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.HashSet;
|
||||
@@ -41,7 +42,7 @@ public class ComponentServiceImpl implements ComponentService {
|
||||
|
||||
@Override
|
||||
public ComponentResponse createComponent(Long userId, CreateComponentRequest request) {
|
||||
var session = uploads.requireUploadSession(userId, request.uploadSessionToken());
|
||||
UploadSessionClaims session = uploads.requireUploadSession(userId, request.uploadSessionToken());
|
||||
uploads.requireComponent(session, null, session.componentCode());
|
||||
OperationTargetHolder.set("COMPONENT", "", session.componentCode(), text(request.componentName()));
|
||||
Component component = new Component();
|
||||
@@ -80,7 +81,7 @@ public class ComponentServiceImpl implements ComponentService {
|
||||
}
|
||||
boolean replacing = request.stepObjectKey() != null || request.urdfObjectKeys() != null;
|
||||
if (replacing) {
|
||||
var session = uploads.requireUploadSession(userId, request.uploadSessionToken());
|
||||
UploadSessionClaims session = uploads.requireUploadSession(userId, request.uploadSessionToken());
|
||||
uploads.requireComponent(session, id, current.getComponentCode());
|
||||
if (request.stepObjectKey() != null) current.setStepObjectKey(uploads.verifyStep(session, request.stepObjectKey()));
|
||||
if (request.urdfObjectKeys() != null) applyUrdf(current, uploads.verifyUrdf(session, request.urdfObjectKeys()));
|
||||
@@ -120,7 +121,7 @@ public class ComponentServiceImpl implements ComponentService {
|
||||
|
||||
@Override
|
||||
public PageResponse<ComponentListItemResponse> listComponents(long page, long size, String keyword, String category) {
|
||||
var query = new LambdaQueryWrapper<Component>()
|
||||
LambdaQueryWrapper<Component> query = new LambdaQueryWrapper<Component>()
|
||||
.select(Component::getId, Component::getComponentCode, Component::getComponentName,
|
||||
Component::getCategory, Component::getManufacturer, Component::getDescription,
|
||||
Component::getTags, Component::getStepObjectKey, Component::getUrdfMainObjectKey,
|
||||
@@ -132,7 +133,7 @@ public class ComponentServiceImpl implements ComponentService {
|
||||
}
|
||||
Page<Component> result = componentMapper.selectPage(new Page<>(page, size),
|
||||
query.orderByDesc(Component::getUpdatedAt).orderByDesc(Component::getId));
|
||||
var items = result.getRecords().stream().map(c -> new ComponentListItemResponse(c.getId(),
|
||||
List<ComponentListItemResponse> items = result.getRecords().stream().map(c -> new ComponentListItemResponse(c.getId(),
|
||||
c.getComponentCode(), c.getComponentName(), c.getCategory(), c.getManufacturer(),
|
||||
c.getDescription(), read(c.getTags(), TAGS), urls.resolvePublicUrl(c.getStepObjectKey()),
|
||||
urls.resolvePublicUrl(c.getUrdfMainObjectKey()), c.getVersion(),
|
||||
|
||||
+3
-2
@@ -4,6 +4,7 @@ import com.linkerbot.cadworld.common.exception.BizException;
|
||||
import com.linkerbot.cadworld.config.StorageProperties;
|
||||
import com.linkerbot.cadworld.dto.component.UrdfFile;
|
||||
import com.linkerbot.cadworld.service.client.ObjectStorageClient;
|
||||
import com.linkerbot.cadworld.service.client.ObjectStorageClient.StoredObject;
|
||||
import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider;
|
||||
import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider.UploadSessionClaims;
|
||||
import com.linkerbot.cadworld.service.support.StorageObjectKeys;
|
||||
@@ -89,7 +90,7 @@ public class ComponentUploadSupport {
|
||||
if (mains.size() != 1) throw invalidObject("URDF目录必须恰好包含一个 .urdf 主文件");
|
||||
List<UrdfFile> files = new ArrayList<>();
|
||||
for (String key : objectKeys) {
|
||||
var object = stat(key);
|
||||
StoredObject object = stat(key);
|
||||
if (key.equals(mains.getFirst()) && object.contentLength() == 0) throw invalidObject("URDF主文件不能为空");
|
||||
files.add(new UrdfFile(key.substring(session.urdfPrefix().length()), object.contentLength()));
|
||||
}
|
||||
@@ -98,7 +99,7 @@ public class ComponentUploadSupport {
|
||||
|
||||
private ObjectStorageClient.StoredObject stat(String key) {
|
||||
try {
|
||||
var object = storage.statObject(key);
|
||||
StoredObject object = storage.statObject(key);
|
||||
if (object.contentLength() < 0) throw invalidObject("无法确认文件实际大小");
|
||||
UploadLimits.checkLength(object.contentLength(), properties.maxUploadBytes());
|
||||
return object;
|
||||
|
||||
+4
-4
@@ -17,16 +17,16 @@ import static org.mockito.ArgumentMatchers.*;
|
||||
class UploadIntegrityTest {
|
||||
@Test
|
||||
void unknownLengthUploadIsBoundedAndCannotDestroyExistingObject() {
|
||||
var properties = new StorageProperties("cadworld_dev","http://localhost",
|
||||
StorageProperties properties = new StorageProperties("cadworld_dev","http://localhost",
|
||||
Duration.ofMinutes(30),Duration.ofMinutes(5),8);
|
||||
var sdk = mock(OSS.class);
|
||||
var stored = new AtomicReference<byte[]>();
|
||||
OSS sdk = mock(OSS.class);
|
||||
AtomicReference<byte[]> stored = new AtomicReference<byte[]>();
|
||||
when(sdk.putObject(any(PutObjectRequest.class))).thenAnswer(call -> {
|
||||
PutObjectRequest request = call.getArgument(0);
|
||||
stored.set(request.getInputStream().readAllBytes());
|
||||
return null;
|
||||
});
|
||||
var client = new OssObjectStorageClient(sdk,
|
||||
OssObjectStorageClient client = new OssObjectStorageClient(sdk,
|
||||
new OssProperties("test-key","test-secret","oss-cn-beijing","test-bucket"),
|
||||
properties,new StorageObjectKeys(properties));
|
||||
String key = "cadworld_dev/components/CW-TEST/urdf/batch/robot.urdf";
|
||||
|
||||
+3
-3
@@ -18,13 +18,13 @@ class UploadSessionTest {
|
||||
|
||||
@Test
|
||||
void issuerExpiryAndSignatureAreVerifiedAndOneTokenContainsBothDirectories() {
|
||||
var claims = new UploadSessionClaims(0L,123L,"CW-"+"A".repeat(32),"a".repeat(32),
|
||||
UploadSessionClaims claims = new UploadSessionClaims(0L,123L,"CW-"+"A".repeat(32),"a".repeat(32),
|
||||
"cadworld_dev/components/CW/step/batch/","cadworld_dev/components/CW/urdf/batch/",now.plusSeconds(60));
|
||||
String token = tokens.generateToken(claims);
|
||||
assertThat(tokens.parseToken(token)).isEqualTo(claims);
|
||||
var other = new ComponentUploadSessionTokenProvider(new UploadSessionProperties("other",secret),clock);
|
||||
ComponentUploadSessionTokenProvider other = new ComponentUploadSessionTokenProvider(new UploadSessionProperties("other",secret),clock);
|
||||
assertThatThrownBy(() -> other.parseToken(token)).isInstanceOf(io.jsonwebtoken.JwtException.class);
|
||||
var expired = new UploadSessionClaims(0L,null,claims.componentCode(),claims.batch(),
|
||||
UploadSessionClaims expired = new UploadSessionClaims(0L,null,claims.componentCode(),claims.batch(),
|
||||
claims.stepPrefix(),claims.urdfPrefix(),now.minusSeconds(1));
|
||||
assertThatThrownBy(() -> tokens.parseToken(tokens.generateToken(expired)))
|
||||
.isInstanceOf(io.jsonwebtoken.ExpiredJwtException.class);
|
||||
|
||||
+9
-7
@@ -3,11 +3,13 @@ package com.linkerbot.cadworld.service;
|
||||
import com.linkerbot.cadworld.common.exception.BizException;
|
||||
import com.linkerbot.cadworld.config.*;
|
||||
import com.linkerbot.cadworld.dto.storage.UploadSignatureRequest;
|
||||
import com.linkerbot.cadworld.dto.storage.UploadSignatureResponse;
|
||||
import com.linkerbot.cadworld.entity.Component;
|
||||
import com.linkerbot.cadworld.mapper.ComponentMapper;
|
||||
import com.linkerbot.cadworld.service.client.ObjectStorageClient;
|
||||
import com.linkerbot.cadworld.service.impl.ComponentUploadSupport;
|
||||
import com.linkerbot.cadworld.service.support.*;
|
||||
import com.linkerbot.cadworld.service.support.ComponentUploadSessionTokenProvider.UploadSessionClaims;
|
||||
import java.time.*;
|
||||
import java.util.Map;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
@@ -34,10 +36,10 @@ class UploadSignatureServiceTest {
|
||||
|
||||
@Test
|
||||
void firstSignatureAllocatesCodeWithoutInsertingAndReturnsTwoBoundDirectories() {
|
||||
var response = service.sign(7L,new UploadSignatureRequest(null,null));
|
||||
UploadSignatureResponse response = service.sign(7L,new UploadSignatureRequest(null,null));
|
||||
assertThat(response.componentCode()).matches("CW-[A-F0-9]{32}");
|
||||
assertThat(response.urdf().keyPrefix()).isEqualTo(response.step().keyPrefix().replace("/step/","/urdf/"));
|
||||
var session = tokens.parseToken(response.uploadSessionToken());
|
||||
UploadSessionClaims session = tokens.parseToken(response.uploadSessionToken());
|
||||
assertThat(session.userId()).isEqualTo(7L);
|
||||
assertThat(session.componentId()).isNull();
|
||||
assertThat(session.stepPrefix()).isEqualTo(response.step().keyPrefix());
|
||||
@@ -50,12 +52,12 @@ class UploadSignatureServiceTest {
|
||||
|
||||
@Test
|
||||
void renewsWithinRemainingSessionTimeAndRejectsMixedParametersOrWrongOwner() {
|
||||
var first = service.sign(7L,new UploadSignatureRequest(null,null));
|
||||
var session = tokens.parseToken(first.uploadSessionToken());
|
||||
UploadSignatureResponse first = service.sign(7L,new UploadSignatureRequest(null,null));
|
||||
UploadSessionClaims session = tokens.parseToken(first.uploadSessionToken());
|
||||
Instant expiry = Instant.now().plusSeconds(30).truncatedTo(java.time.temporal.ChronoUnit.SECONDS);
|
||||
String token = tokens.generateToken(new ComponentUploadSessionTokenProvider.UploadSessionClaims(7L,null,
|
||||
session.componentCode(),session.batch(),session.stepPrefix(),session.urdfPrefix(),expiry));
|
||||
var renewed = service.sign(7L,new UploadSignatureRequest(null,token));
|
||||
UploadSignatureResponse renewed = service.sign(7L,new UploadSignatureRequest(null,token));
|
||||
assertThat(renewed.expiresAt()).isEqualTo(expiry);
|
||||
assertThat(renewed.sessionExpiresAt()).isEqualTo(expiry);
|
||||
assertThat(renewed.step().keyPrefix()).isEqualTo(first.step().keyPrefix());
|
||||
@@ -72,8 +74,8 @@ class UploadSignatureServiceTest {
|
||||
Component component = new Component();
|
||||
component.setId(123L); component.setComponentCode("CW-"+"B".repeat(32));
|
||||
when(mapper.selectById(123L)).thenReturn(component);
|
||||
var first = service.sign(7L,new UploadSignatureRequest(123L,null));
|
||||
var second = service.sign(7L,new UploadSignatureRequest(123L,null));
|
||||
UploadSignatureResponse first = service.sign(7L,new UploadSignatureRequest(123L,null));
|
||||
UploadSignatureResponse second = service.sign(7L,new UploadSignatureRequest(123L,null));
|
||||
assertThat(first.componentCode()).isEqualTo(component.getComponentCode());
|
||||
assertThat(second.step().keyPrefix()).isNotEqualTo(first.step().keyPrefix());
|
||||
assertThat(tokens.parseToken(first.uploadSessionToken()).componentId()).isEqualTo(123L);
|
||||
|
||||
+21
-14
@@ -13,9 +13,11 @@ import com.aliyun.oss.OSSException;
|
||||
import com.aliyun.oss.model.OSSObject;
|
||||
import com.aliyun.oss.model.ObjectMetadata;
|
||||
import com.aliyun.oss.model.PutObjectRequest;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.linkerbot.cadworld.common.exception.BizException;
|
||||
import com.linkerbot.cadworld.config.OssProperties;
|
||||
import com.linkerbot.cadworld.config.StorageProperties;
|
||||
import com.linkerbot.cadworld.service.client.ObjectStorageClient.UploadAuthorization;
|
||||
import com.linkerbot.cadworld.service.support.StorageObjectKeys;
|
||||
import com.linkerbot.cadworld.service.support.UploadLimits;
|
||||
import java.io.ByteArrayInputStream;
|
||||
@@ -25,8 +27,13 @@ import java.io.StringReader;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
import javax.crypto.Mac;
|
||||
import javax.xml.bind.JAXBContext;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.ValueSource;
|
||||
@@ -43,11 +50,11 @@ class OssObjectStorageClientTest {
|
||||
|
||||
@Test
|
||||
void java21JaxbRuntimeCanParseSdkErrorModels() throws Exception {
|
||||
var context = javax.xml.bind.JAXBContext.newInstance(com.aliyun.oss.internal.model.OSSErrorResult.class);
|
||||
JAXBContext context = JAXBContext.newInstance(com.aliyun.oss.internal.model.OSSErrorResult.class);
|
||||
Object parsed = context.createUnmarshaller().unmarshal(new StringReader(
|
||||
"<Error><Code>NoSuchKey</Code><Message>missing</Message><RequestId>test-id</RequestId><HostId>oss.test</HostId></Error>"));
|
||||
assertThat(parsed).isInstanceOf(com.aliyun.oss.internal.model.OSSErrorResult.class);
|
||||
var sdk = new com.linkerbot.cadworld.config.OssClientConfiguration().ossClient(properties);
|
||||
OSS sdk = new com.linkerbot.cadworld.config.OssClientConfiguration().ossClient(properties);
|
||||
sdk.shutdown();
|
||||
}
|
||||
|
||||
@@ -64,23 +71,23 @@ class OssObjectStorageClientTest {
|
||||
|
||||
@Test
|
||||
void v4PostSignatureUsesUtcDateAndExactDirectoryPolicyWithoutNetwork() throws Exception {
|
||||
var signingTime = java.time.Instant.parse("2026-10-10T23:59:58Z");
|
||||
var expiry = signingTime.plusSeconds(300);
|
||||
Instant signingTime = Instant.parse("2026-10-10T23:59:58Z");
|
||||
Instant expiry = signingTime.plusSeconds(300);
|
||||
OSS localSdk = new com.linkerbot.cadworld.config.OssClientConfiguration().ossClient(properties);
|
||||
try {
|
||||
var signer = new OssObjectStorageClient(localSdk, properties, storage, keys,
|
||||
OssObjectStorageClient signer = new OssObjectStorageClient(localSdk, properties, storage, keys,
|
||||
java.time.Clock.fixed(signingTime,java.time.ZoneOffset.UTC));
|
||||
var result = signer.createUploadAuthorization("cadworld_dev/components/urdf/0/session/", expiry);
|
||||
var fields = result.uploadFields();
|
||||
UploadAuthorization result = signer.createUploadAuthorization("cadworld_dev/components/urdf/0/session/", expiry);
|
||||
Map<String, String> fields = result.uploadFields();
|
||||
assertThat(result.uploadUrl()).isEqualTo("https://test-bucket.oss-cn-beijing.aliyuncs.com/");
|
||||
assertThat(fields.get("x-oss-date")).isEqualTo("20261010T235958Z");
|
||||
assertThat(fields.get("x-oss-credential")).isEqualTo("PRIVATE_ACCESS_KEY/20261010/cn-beijing/oss/aliyun_v4_request");
|
||||
String policy = new String(java.util.Base64.getDecoder().decode(fields.get("policy")),java.nio.charset.StandardCharsets.UTF_8);
|
||||
var json = new com.fasterxml.jackson.databind.ObjectMapper().readTree(policy);
|
||||
JsonNode json = new com.fasterxml.jackson.databind.ObjectMapper().readTree(policy);
|
||||
assertThat(java.time.Instant.parse(json.path("expiration").asText())).isEqualTo(expiry);
|
||||
var conditions = json.path("conditions");
|
||||
JsonNode conditions = json.path("conditions");
|
||||
assertThat(conditions.toString()).contains("[\"starts-with\",\"$key\",\"cadworld_dev/components/urdf/0/session/\"]", "[\"content-length-range\",0,8]");
|
||||
for (var entry : fields.entrySet()) {
|
||||
for (Map.Entry<String, String> entry : fields.entrySet()) {
|
||||
if (!entry.getKey().equals("policy") && !entry.getKey().equals("x-oss-signature")) {
|
||||
assertThat(conditions.toString()).contains(entry.getKey(),entry.getValue());
|
||||
}
|
||||
@@ -98,7 +105,7 @@ class OssObjectStorageClientTest {
|
||||
}
|
||||
|
||||
private byte[] hmac(byte[] key, String data) throws Exception {
|
||||
var mac = javax.crypto.Mac.getInstance("HmacSHA256");
|
||||
Mac mac = Mac.getInstance("HmacSHA256");
|
||||
mac.init(new javax.crypto.spec.SecretKeySpec(key,"HmacSHA256"));
|
||||
return mac.doFinal(data.getBytes(java.nio.charset.StandardCharsets.UTF_8));
|
||||
}
|
||||
@@ -106,8 +113,8 @@ class OssObjectStorageClientTest {
|
||||
@Test
|
||||
void signingFailureReturnsSafeErrorAndNeverLogsPolicyOrSdkExceptionMessage() {
|
||||
when(sdk.generatePostPolicy(any(),any())).thenThrow(new ClientException("PRIVATE_SIGNED_POLICY_AND_SECRET"));
|
||||
var logger = (Logger) LoggerFactory.getLogger(OssObjectStorageClient.class);
|
||||
var captured = new ListAppender<ILoggingEvent>(); captured.start(); logger.addAppender(captured);
|
||||
Logger logger = (Logger) LoggerFactory.getLogger(OssObjectStorageClient.class);
|
||||
ListAppender<ILoggingEvent> captured = new ListAppender<ILoggingEvent>(); captured.start(); logger.addAppender(captured);
|
||||
try {
|
||||
assertThatThrownBy(() -> client.createUploadAuthorization("cadworld_dev/session/",java.time.Instant.now().plusSeconds(60)))
|
||||
.isInstanceOf(BizException.class).extracting("code").isEqualTo("OSS_UPLOAD_SIGN_FAILED");
|
||||
@@ -230,7 +237,7 @@ class OssObjectStorageClientTest {
|
||||
}
|
||||
|
||||
private Set<Path> uploadTemporaryFiles() throws Exception {
|
||||
try (var paths = Files.list(Path.of(System.getProperty("java.io.tmpdir")))) {
|
||||
try (Stream<Path> paths = Files.list(Path.of(System.getProperty("java.io.tmpdir")))) {
|
||||
return paths.filter(path -> path.getFileName().toString().startsWith("cadworld-oss-")).collect(Collectors.toSet());
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -26,11 +26,11 @@ class ComponentServiceImplTest {
|
||||
when(mapper.update(any(Component.class),any(com.baomidou.mybatisplus.core.conditions.Wrapper.class))).thenReturn(0);
|
||||
PlatformTransactionManager manager = mock(PlatformTransactionManager.class);
|
||||
when(manager.getTransaction(any())).thenReturn(new SimpleTransactionStatus());
|
||||
var service = new ComponentServiceImpl(mapper,new ObjectMapper(),
|
||||
ComponentServiceImpl service = new ComponentServiceImpl(mapper,new ObjectMapper(),
|
||||
new ObjectStorageUrlResolver(new StorageProperties("cadworld_dev","http://localhost",
|
||||
Duration.ofMinutes(30),Duration.ofMinutes(5),1024)),
|
||||
mock(ComponentUploadSupport.class),new TransactionTemplate(manager));
|
||||
var request = new UpdateComponentRequest(null,"测试","分类",null,null,null,
|
||||
UpdateComponentRequest request = new UpdateComponentRequest(null,"测试","分类",null,null,null,
|
||||
null,null,null,null,null,null,null,1L,null,null,null);
|
||||
try {
|
||||
assertThatThrownBy(() -> service.updateComponent(0L,1L,request))
|
||||
|
||||
Reference in New Issue
Block a user