feat(backend+chart): allow configuring cors for images

backend/src/main/java/io/papermc/hangarauth/config/WebConfig.java

@@ -1,12 +1,14 @@
 package io.papermc.hangarauth.config;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.ByteArrayHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -18,10 +20,19 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import io.papermc.hangarauth.config.custom.GeneralConfig;
+
 @EnableWebMvc
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
 
+    private final GeneralConfig generalConfig;
+
+    @Autowired
+    public WebConfig(GeneralConfig generalConfig) {
+        this.generalConfig = generalConfig;
+    }
+
     @Bean
     public RestTemplate restTemplate(List<HttpMessageConverter<?>> messageConverters) {
         RestTemplate restTemplate = new RestTemplate();
@@ -59,4 +70,10 @@ private List<MediaType> getSupportedMediaTypes() {
             MediaType.APPLICATION_OCTET_STREAM
         );
     }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/avatar/**").allowedOrigins(generalConfig.allowedOrigins());
+        registry.addMapping("/image/**").allowedOrigins(generalConfig.allowedOrigins());
+    }
 }

backend/src/main/java/io/papermc/hangarauth/config/custom/GeneralConfig.java

@@ -1,15 +1,14 @@
 package io.papermc.hangarauth.config.custom;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
 import org.springframework.boot.context.properties.bind.DefaultValue;
-import org.springframework.context.annotation.Configuration;
 
 @ConfigurationProperties("auth")
 public record GeneralConfig(
     @DefaultValue("http://localhost:3001") String publicHost,
     @DefaultValue("supersecret2") String apiKey,
     @DefaultValue("http://localhost:3333") String hangarFrontendHost,
-    @DefaultValue("http://localhost:3333") String hangarBackendHost
+    @DefaultValue("http://localhost:3333") String hangarBackendHost,
+    @DefaultValue("http://localhost:3000") String[] allowedOrigins
 ) {
 }

backend/src/main/resources/application.yml

@@ -6,6 +6,7 @@ auth:
   api-key: "supersecret"
   hangar-frontend-host: "http://localhost:3333"
   hangar-backend-host: "http://localhost:3333"
+  allowed-origins: "http://localhost:3000, http://localhost:3001"
   kratos:
     public-url: "http://localhost:4433"
     public-backend-url: "http://localhost:4433"

chart/templates/secret-hangarauth-backend.yaml

@@ -39,6 +39,7 @@ stringData:
       public-host: "{{ .Values.base.authHost }}"
       hangar-frontend-host: "{{ .Values.base.hangarHost }}"
       hangar-backend-host: "http://hangar-backend:8080"
+      allowed-origins: "{{ .Values.backend.config.auth.allowedOrigins }}"
       kratos:
         public-url: "{{ .Values.base.authHost }}/kratos"
         public-backend-url: "{{ .Values.backend.config.auth.kratos.publicBackendUrl }}"

chart/values.yaml

@@ -172,6 +172,7 @@ backend:
       database: "hangarauth"
       options: "?currentSchema=auth"
     auth:
+      allowedOrigins: "https://*.hangar.test"
       kratos:
         adminUrl: "http://hangarauth-kratos:4434"
         publicBackendUrl: "http://hangarauth-kratos:4433"