Polish

Haarolean · Haarolean · commit 3cfd73804e81 · 2024-12-23T23:11:49.000+08:00
diff --git a/api/src/main/java/io/kafbat/ui/config/auth/AbstractAuthSecurityConfig.java b/api/src/main/java/io/kafbat/ui/config/auth/AbstractAuthSecurityConfig.java
@@ -6,24 +6,29 @@ protected AbstractAuthSecurityConfig() {
 
   }
 
+  public static final String INDEX_HTML = "/static/index.html";
+
   protected static final String[] AUTH_WHITELIST = {
-      "/css/**",
-      "/js/**",
-      "/media/**",
+      /* STATIC */
+      "/index.html",
+      "/assets/**",
+      "/manifest.json",
+      "/favicon.svg",
+      "/favicon/**",
+
+      "/static/**",
       "/resources/**",
+
+      /* ACTUATOR */
       "/actuator/health/**",
       "/actuator/info",
       "/actuator/prometheus",
-      "/auth",
+
+      /* AUTH */
       "/login",
       "/logout",
       "/oauth2/**",
-      "/static/**",
       "/api/config/authentication",
-      "/index.html",
-      "/assets/**",
-      "/manifest.json",
-      "/favicon/**",
       "/api/authorization"
   };
 
diff --git a/api/src/main/java/io/kafbat/ui/config/auth/OAuthSecurityConfig.java b/api/src/main/java/io/kafbat/ui/config/auth/OAuthSecurityConfig.java
@@ -53,7 +53,7 @@ public class OAuthSecurityConfig extends AbstractAuthSecurityConfig {
   public SecurityWebFilterChain configure(ServerHttpSecurity http, OAuthLogoutSuccessHandler logoutHandler) {
     log.info("Configuring OAUTH2 authentication.");
 
-    ServerHttpSecurity builder = http.authorizeExchange(spec -> spec
+    var builder = http.authorizeExchange(spec -> spec
             .pathMatchers(AUTH_WHITELIST)
             .permitAll()
             .anyExchange()
@@ -64,9 +64,8 @@ public SecurityWebFilterChain configure(ServerHttpSecurity http, OAuthLogoutSucc
         .csrf(ServerHttpSecurity.CsrfSpec::disable);
 
 
-    builder.addFilterAt(new StaticFileWebFilter(
-        "/login", new ClassPathResource("/static/index.html")
-    ), SecurityWebFiltersOrder.LOGIN_PAGE_GENERATING);
+    builder.addFilterAt(new StaticFileWebFilter("/login", new ClassPathResource(INDEX_HTML)),
+        SecurityWebFiltersOrder.LOGIN_PAGE_GENERATING);
 
     return builder.build();
   }
diff --git a/api/src/main/java/io/kafbat/ui/controller/AuthenticationController.java b/api/src/main/java/io/kafbat/ui/controller/AuthenticationController.java
@@ -1,105 +1,22 @@
 package io.kafbat.ui.controller;
 
-import java.nio.charset.Charset;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.security.web.server.csrf.CsrfToken;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 @RestController
 @RequiredArgsConstructor
 @Slf4j
 public class AuthenticationController {
 
-  @GetMapping(value = "/login", produces = {"text/html"})
-  public Mono<ClassPathResource> getLoginPage(ServerWebExchange exchange) {
-    return Mono.just(new ClassPathResource("static/index.html"));
-  }
-
-  @GetMapping(value = "/auth", produces = {"text/html"})
-  public Mono<byte[]> getAuth(ServerWebExchange exchange) {
-    Mono<CsrfToken> token = exchange.getAttributeOrDefault(CsrfToken.class.getName(), Mono.empty());
-    return token
-        .map(AuthenticationController::csrfToken)
-        .defaultIfEmpty("")
-        .map(csrfTokenHtmlInput -> createPage(exchange, csrfTokenHtmlInput));
-  }
-
-  private byte[] createPage(ServerWebExchange exchange, String csrfTokenHtmlInput) {
-    MultiValueMap<String, String> queryParams = exchange.getRequest()
-        .getQueryParams();
-    String contextPath = exchange.getRequest().getPath().contextPath().value();
-    String page =
-        "<!DOCTYPE html>\n" + "<html lang=\"en\">\n" + "  <head>\n"
-        + "    <meta charset=\"utf-8\">\n"
-        + "    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1, "
-        + "shrink-to-fit=no\">\n"
-        + "    <meta name=\"description\" content=\"\">\n"
-        + "    <meta name=\"author\" content=\"\">\n"
-        + "    <title>Please sign in</title>\n"
-        + "    <link href=\"" + contextPath + "/static/css/bootstrap.min.css\" rel=\"stylesheet\" "
-        + "integrity=\"sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M\" "
-        + "crossorigin=\"anonymous\">\n"
-        + "    <link href=\"" + contextPath + "/static/css/signin.css\" "
-        + "rel=\"stylesheet\" crossorigin=\"anonymous\"/>\n"
-        + "  </head>\n"
-        + "  <body>\n"
-        + "     <div class=\"container\">\n"
-        + formLogin(queryParams, contextPath, csrfTokenHtmlInput)
-        + "    </div>\n"
-        + "  </body>\n"
-        + "</html>";
-
-    return page.getBytes(Charset.defaultCharset());
-  }
+  private static final String INDEX_HTML = "/static/index.html";
 
-  private String formLogin(
-      MultiValueMap<String, String> queryParams,
-      String contextPath, String csrfTokenHtmlInput) {
-
-    boolean isError = queryParams.containsKey("error");
-    boolean isLogoutSuccess = queryParams.containsKey("logout");
-    return
-        "      <form class=\"form-signin\" method=\"post\" action=\"" + contextPath + "/auth\">\n"
-        + "        <h2 class=\"form-signin-heading\">Please sign in</h2>\n"
-        + createError(isError)
-        + createLogoutSuccess(isLogoutSuccess)
-        + "        <p>\n"
-        + "          <label for=\"username\" class=\"sr-only\">Username</label>\n"
-        + "          <input type=\"text\" id=\"username\" name=\"username\" class=\"form-control\" "
-        + "placeholder=\"Username\" required autofocus>\n"
-        + "        </p>\n" + "        <p>\n"
-        + "          <label for=\"password\" class=\"sr-only\">Password</label>\n"
-        + "          <input type=\"password\" id=\"password\" name=\"password\" "
-        + "class=\"form-control\" placeholder=\"Password\" required>\n"
-        + "        </p>\n" + csrfTokenHtmlInput
-        + "        <button class=\"btn btn-lg btn-primary btn-block\" "
-        + "type=\"submit\">Sign in</button>\n"
-        + "      </form>\n";
-  }
-
-  private static String csrfToken(CsrfToken token) {
-    return "          <input type=\"hidden\" name=\""
-        + token.getParameterName()
-        + "\" value=\""
-        + token.getToken()
-        + "\">\n";
-  }
-
-  private static String createError(boolean isError) {
-    return isError
-        ? "<div class=\"alert alert-danger\" role=\"alert\">Invalid credentials</div>"
-        : "";
+  @GetMapping(value = "/login", produces = {"text/html"})
+  public Mono<ClassPathResource> getLoginPage() {
+    return Mono.just(new ClassPathResource(INDEX_HTML));
   }
 
-  private static String createLogoutSuccess(boolean isLogoutSuccess) {
-    return isLogoutSuccess
-        ? "<div class=\"alert alert-success\" role=\"alert\">You have been signed out</div>"
-        : "";
-  }
 }
diff --git a/api/src/main/java/io/kafbat/ui/util/StaticFileWebFilter.java b/api/src/main/java/io/kafbat/ui/util/StaticFileWebFilter.java
@@ -1,7 +1,7 @@
 package io.kafbat.ui.util;
 
 import java.io.IOException;
-import java.io.InputStream;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.http.HttpMethod;
@@ -16,20 +16,22 @@
 import reactor.core.publisher.Mono;
 
 public class StaticFileWebFilter implements WebFilter {
-  private ServerWebExchangeMatcher matcher;
-  private String contents;
+
+  private final ServerWebExchangeMatcher matcher;
+  private final String contents;
 
   public StaticFileWebFilter(String path, ClassPathResource resource) {
     this.matcher = ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, path);
-    try (InputStream inputStream = resource.getInputStream())  {
-      this.contents =  ResourceUtil.readAsString(resource);
+
+    try {
+      this.contents = ResourceUtil.readAsString(resource);
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
   }
 
   @Override
-  public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
+  public @NotNull Mono<Void> filter(@NotNull ServerWebExchange exchange, WebFilterChain chain) {
     return this.matcher.matches(exchange)
         .filter(ServerWebExchangeMatcher.MatchResult::isMatch)
         .switchIfEmpty(chain.filter(exchange).then(Mono.empty()))
@@ -38,6 +40,7 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
 
   private Mono<Void> render(ServerWebExchange exchange) {
     String contextPath = exchange.getRequest().getPath().contextPath().value();
+
     String contentBody = contents
         .replace("\"assets/", "\"" + contextPath + "/assets/")
         .replace("PUBLIC-PATH-VARIABLE", contextPath);
