From 994b682389faed858390cc977e82dfb093d23406 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 17 Mar 2026 03:12:09 +0100 Subject: [PATCH] fix: cors (again), isRt flag and build in POM --- mpaste/pom.xml | 6 +----- .../mpaste/config/NoSecurityConfig.java | 7 +++++-- .../mpaste/config/WebSocketConfig.java | 2 +- .../miarma/backend/mpaste/dto/PasteDto.java | 20 +++++++++---------- .../backend/mpaste/mapper/PasteMapper.java | 12 +++++------ 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/mpaste/pom.xml b/mpaste/pom.xml index a3a0257..ceaeb3f 100644 --- a/mpaste/pom.xml +++ b/mpaste/pom.xml @@ -83,7 +83,7 @@ org.springframework.boot spring-boot-maven-plugin - 3.2.2 + ${spring.boot.version} @@ -91,10 +91,6 @@ - - net.miarma.backend.mpaste.MpasteApplication - JAR - diff --git a/mpaste/src/main/java/net/miarma/backend/mpaste/config/NoSecurityConfig.java b/mpaste/src/main/java/net/miarma/backend/mpaste/config/NoSecurityConfig.java index 0767efb..a806580 100644 --- a/mpaste/src/main/java/net/miarma/backend/mpaste/config/NoSecurityConfig.java +++ b/mpaste/src/main/java/net/miarma/backend/mpaste/config/NoSecurityConfig.java @@ -3,6 +3,7 @@ package net.miarma.backend.mpaste.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.web.SecurityFilterChain; @Configuration @@ -10,8 +11,10 @@ public class NoSecurityConfig { @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http - .csrf(csrf -> csrf.disable()) - .authorizeHttpRequests(auth -> auth.anyRequest().permitAll()); + .cors(AbstractHttpConfigurer::disable) + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(auth -> auth.anyRequest().permitAll()); + return http.build(); } } \ No newline at end of file diff --git a/mpaste/src/main/java/net/miarma/backend/mpaste/config/WebSocketConfig.java b/mpaste/src/main/java/net/miarma/backend/mpaste/config/WebSocketConfig.java index 8021ab2..05be950 100644 --- a/mpaste/src/main/java/net/miarma/backend/mpaste/config/WebSocketConfig.java +++ b/mpaste/src/main/java/net/miarma/backend/mpaste/config/WebSocketConfig.java @@ -18,7 +18,7 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { @Override public void registerStompEndpoints(StompEndpointRegistry registry) { registry.addEndpoint("/ws") - .setAllowedOriginPatterns("*") + .setAllowedOrigins("https://paste.miarma.net", "http://localhost:3000") .withSockJS(); } } diff --git a/mpaste/src/main/java/net/miarma/backend/mpaste/dto/PasteDto.java b/mpaste/src/main/java/net/miarma/backend/mpaste/dto/PasteDto.java index 4406304..e171ae1 100644 --- a/mpaste/src/main/java/net/miarma/backend/mpaste/dto/PasteDto.java +++ b/mpaste/src/main/java/net/miarma/backend/mpaste/dto/PasteDto.java @@ -51,7 +51,7 @@ public class PasteDto { this.syntax = syntax; } - public Boolean isBurnAfter() { + public Boolean getIsBurnAfter() { return burnAfter; } @@ -59,7 +59,7 @@ public class PasteDto { this.burnAfter = burnAfter; } - public Boolean isPrivate() { + public Boolean getIsPrivate() { return isPrivate; } @@ -67,11 +67,11 @@ public class PasteDto { this.isPrivate = isPrivate; } - public Boolean isRt() { + public Boolean getIsRt() { return isRt; } - public void setRt(Boolean rt) { + public void setIsRt(Boolean rt) { isRt = rt; } @@ -149,27 +149,27 @@ public class PasteDto { this.views = views; } - public Boolean isBurnAfter() { + public Boolean getIsBurnAfter() { return burnAfter; } - public void setBurnAfter(Boolean burnAfter) { + public void setIsBurnAfter(Boolean burnAfter) { this.burnAfter = burnAfter; } - public Boolean isPrivate() { + public Boolean getIsPrivate() { return isPrivate; } - public void setPrivate(Boolean isPrivate) { + public void setIsPrivate(Boolean isPrivate) { this.isPrivate = isPrivate; } - public Boolean isRt() { + public Boolean getIsRt() { return isRt; } - public void setRt(Boolean rt) { + public void setIsRt(Boolean rt) { isRt = rt; } diff --git a/mpaste/src/main/java/net/miarma/backend/mpaste/mapper/PasteMapper.java b/mpaste/src/main/java/net/miarma/backend/mpaste/mapper/PasteMapper.java index 5a503c4..42732a2 100644 --- a/mpaste/src/main/java/net/miarma/backend/mpaste/mapper/PasteMapper.java +++ b/mpaste/src/main/java/net/miarma/backend/mpaste/mapper/PasteMapper.java @@ -18,9 +18,9 @@ public final class PasteMapper { paste.setSyntax(request.getSyntax()); paste.setPasteKey(request.getPasteKey()); - paste.setBurnAfter(Boolean.TRUE.equals(request.isBurnAfter())); - paste.setPrivate(Boolean.TRUE.equals(request.isPrivate())); - paste.setRt(Boolean.TRUE.equals(request.isRt())); + paste.setBurnAfter(Boolean.TRUE.equals(request.getIsBurnAfter())); + paste.setPrivate(Boolean.TRUE.equals(request.getIsPrivate())); + paste.setRt(Boolean.TRUE.equals(request.getIsRt())); paste.setPassword(request.getPassword()); @@ -43,9 +43,9 @@ public final class PasteMapper { response.setViews(paste.getViews()); - response.setBurnAfter(paste.isBurnAfter()); - response.setPrivate(paste.isPrivate()); - response.setRt(paste.isRt()); + response.setIsBurnAfter(paste.isBurnAfter()); + response.setIsPrivate(paste.isPrivate()); + response.setIsRt(paste.isRt()); response.setCreatedAt(paste.getCreatedAt());