Fix ssl backend and cors and more small fixes

Author: Kimiega

backend/config/crypto/ca.cnf

@@ -19,3 +19,18 @@ authorityKeyIdentifier = keyid:always,issuer
 basicConstraints = critical, CA:true
 keyUsage = critical, digitalSignature, cRLSign, keyCertSign
 
+[req_ext]
+subjectAltName = @alt_names
+
+[alt_names]
+DNS.1 = localhost
+DNS.2 = authik-0.dating.se.ifmo.ru
+DNS.3 = authik-1.dating.se.ifmo.ru
+DNS.4 = authik-2.dating.se.ifmo.ru
+DNS.5 = matchmaker-0.dating.se.ifmo.ru
+DNS.6 = matchmaker-1.dating.se.ifmo.ru
+DNS.7 = matchmaker-2.dating.se.ifmo.ru
+DNS.8 = people-0.dating.se.ifmo.ru
+DNS.9 = people-1.dating.se.ifmo.ru
+DNS.10 = people-2.dating.se.ifmo.ru
+DNS.11 = server.dc1.consul

backend/consul/Dockerfile

@@ -12,3 +12,5 @@ RUN chmod -R 755 /consul/config && \
     chmod 644 /consul/config/itmo-dating-backend.crt && \
     chmod 644 /consul/config/itmo-dating-backend-ca.crt && \
     chmod 644 /consul/config/consul.hcl
+
+CMD ["sh", "./consul/run.sh"]

backend/consul/config/consul.hcl

@@ -14,6 +14,10 @@ acl {
   enable_token_persistence = true
 }
 
+limits {
+  http_max_conns_per_client = 400
+}
+
 data_dir = "/opt/consul/data"
 
 ui = true

backend/consul/run.sh

@@ -1,4 +1,3 @@
 #!/bin/sh
 
-consul agent -config-file=/consul/config/consul.hcl -bootstrap-expect=1 \
-  | grep -v "This request used the token query parameter which is deprecated and will be removed"
+consul agent -config-file=/consul/config/consul.hcl -bootstrap-expect=1 | grep -v "This request used the token query parameter which is deprecated and will be removed"

backend/gateway/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
 
     implementation(libs.org.springframework.boot.spring.boot)
     implementation(libs.org.springframework.cloud.spring.cloud.starter.gateway)
-
+    implementation(libs.org.springframework.spring.web)
     implementation(libs.org.springdoc.springdoc.openapi.starter.webflux.ui)
 
     testImplementation(libs.org.springframework.boot.spring.boot.starter.test)

backend/gateway/src/main/kotlin/ru/ifmo/se/dating/gateway/SSLContextConfig.kt backend/gateway/src/main/kotlin/ru/ifmo/se/dating/gateway/ClientSSLContextConfig.kt

@@ -12,17 +12,17 @@ import javax.net.ssl.KeyManagerFactory
 import javax.net.ssl.TrustManagerFactory
 
 @Configuration
-class SSLContextConfig(
-    @Value("\${server.ssl.key-store-type}")
+class ClientSSLContextConfig(
+    @Value("\${client.ssl.key-store-type}")
     private val keyStoreType: String,
 
-    @Value("\${server.ssl.key-store}")
+    @Value("\${client.ssl.key-store}")
     private val keyStore: Resource,
 
-    @Value("\${server.ssl.key-store-password}")
+    @Value("\${client.ssl.key-store-password}")
     private val keyStorePassword: String,
 
-    @Value("\${server.ssl.protocol}")
+    @Value("\${client.ssl.protocol}")
     private val sslProtocol: String,
 ) {
     @Bean

backend/foundation/src/main/kotlin/ru/ifmo/se/dating/spring/api/CorsFilter.kt backend/gateway/src/main/kotlin/ru/ifmo/se/dating/gateway/CorsFilter.kt

@@ -1,4 +1,4 @@
-package ru.ifmo.se.dating.spring.api
+package ru.ifmo.se.dating.gateway
 
 import org.springframework.http.HttpMethod
 import org.springframework.http.HttpStatus

backend/gateway/src/main/resources/application.yml

@@ -95,10 +95,16 @@ server:
   ssl:
     enabled: true
     key-store-type: PKCS12
-    key-store: classpath:keystore/itmo-dating-backend.p12
+    key-store: classpath:keystore/keystore.p12
     key-store-password: ${KEY_STORE_PASSWORD}
     protocol: TLSv1.3
     enabled-protocols: TLSv1.3
+client:
+  ssl:
+    key-store-type: PKCS12
+    key-store: classpath:keystore/itmo-dating-backend.p12
+    key-store-password: ${KEY_STORE_PASSWORD}
+    protocol: TLSv1.3
 springdoc:
   swagger-ui:
     path: /swagger-ui.html

backend/starter-service-discovery/src/main/resources/application-service-discovery.yml

@@ -16,6 +16,8 @@ spring:
         instance-id: instance-${HOSTNAME}
         heartbeat:
           enabled: true
+          ttl: 30
+        catalog-services-watch-delay: 5000
 management:
   health:
     consul:

compose.yml

@@ -85,7 +85,6 @@ services:
     image: ghcr.io/secs-dev/itmo-dating-consul:latest
     build:
       context: ./backend/consul
-    command: sh ./consul/run.sh
     hostname: server.dc1.consul
     ports:
       - "127.0.0.1:8500:8500/tcp"