Compare commits

..
3 changed files with 27 additions and 12 deletions
@@ -2,11 +2,13 @@ package com.mailserver.config;
import com.mailserver.security.JwtAuthenticationFilter; import com.mailserver.security.JwtAuthenticationFilter;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.http.HttpStatus;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
import org.springframework.security.config.web.server.SecurityWebFiltersOrder; import org.springframework.security.config.web.server.SecurityWebFiltersOrder;
import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.config.web.server.ServerHttpSecurity;
import org.springframework.security.web.server.SecurityWebFilterChain; import org.springframework.security.web.server.SecurityWebFilterChain;
import org.springframework.security.web.server.authentication.HttpStatusServerEntryPoint;
import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.reactive.CorsConfigurationSource; import org.springframework.web.cors.reactive.CorsConfigurationSource;
import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource; import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
@@ -42,6 +44,11 @@ public class SecurityConfig {
public SecurityWebFilterChain filterChain(ServerHttpSecurity http) { public SecurityWebFilterChain filterChain(ServerHttpSecurity http) {
http http
.csrf(ServerHttpSecurity.CsrfSpec::disable) .csrf(ServerHttpSecurity.CsrfSpec::disable)
// JWT only: without this an API call with no token gets 401 + "WWW-Authenticate: Basic",
// and the browser shows its own login popup where our mailbox password does not work
.httpBasic(ServerHttpSecurity.HttpBasicSpec::disable)
.formLogin(ServerHttpSecurity.FormLoginSpec::disable)
.exceptionHandling(e -> e.authenticationEntryPoint(new HttpStatusServerEntryPoint(HttpStatus.UNAUTHORIZED)))
.cors(cors -> cors.configurationSource(corsConfigurationSource())) .cors(cors -> cors.configurationSource(corsConfigurationSource()))
.authorizeExchange(exchange -> exchange .authorizeExchange(exchange -> exchange
.pathMatchers("/api/login", "/api/register", "/actuator/health").permitAll() .pathMatchers("/api/login", "/api/register", "/actuator/health").permitAll()
+3 -1
View File
@@ -23,7 +23,9 @@ services:
- secrets:/secrets - secrets:/secrets
db: db:
image: postgres:17-alpine # Debian, not -alpine: on Jambotron staging VMs (Alpine 3.24, kernel 6.18) the Alpine build of postgres
# dies with "Bus error" even on --version; the Debian build works (2026-11-05)
image: postgres:17
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
secrets-init: secrets-init:
@@ -1,16 +1,22 @@
import { HttpInterceptorFn, HttpRequest, HttpHandlerFn } from '@angular/common/http'; import { HttpErrorResponse, HttpInterceptorFn, HttpRequest, HttpHandlerFn } from '@angular/common/http';
import { inject } from '@angular/core';
import { Router } from '@angular/router';
import { catchError, throwError } from 'rxjs';
export const authInterceptor: HttpInterceptorFn = (req: HttpRequest<unknown>, next: HttpHandlerFn) => { export const authInterceptor: HttpInterceptorFn = (req: HttpRequest<unknown>, next: HttpHandlerFn) => {
const router = inject(Router);
const token = localStorage.getItem('token'); const token = localStorage.getItem('token');
const request = token ? req.clone({ setHeaders: { Authorization: `Bearer ${token}` } }) : req;
if (token) {
const cloned = req.clone({ return next(request).pipe(
setHeaders: { catchError((error: unknown) => {
Authorization: `Bearer ${token}` // not logged in or the token expired → to the login form
if (error instanceof HttpErrorResponse && error.status === 401 && !req.url.endsWith('/login')) {
localStorage.removeItem('token');
localStorage.removeItem('email');
router.navigate(['/login']);
} }
}); return throwError(() => error);
return next(cloned); })
} );
return next(req);
}; };