Merge branch 'hubble2.0-auth-simplified' into hubble2.0

# Conflicts:
#	hugegraph-hubble/hubble-dist/pom.xml
#	hugegraph-hubble/hubble-fe/package-lock.json
#	hugegraph-hubble/hubble-fe/package.json
#	hugegraph-hubble/hubble-fe/yarn.lock

Author: FrostyHec

hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java

@@ -126,6 +126,11 @@ public static HugeClientBuilder builder(String url, String graph) {
         return new HugeClientBuilder(url, HugeClientBuilder.DEFAULT_GRAPHSPACE, graph);
     }
 
+    public static HugeClientBuilder builder(String url, String graphSpace, String graph,
+                                            boolean skipRequiredChecks) {
+        return new HugeClientBuilder(url, graphSpace, graph, skipRequiredChecks);
+    }
+
     public HugeClient assignGraph(String graphSpace, String graph) {
         this.graphSpaceName = graphSpace;
         this.graphName = graph;

hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClientBuilder.java

@@ -50,13 +50,24 @@ public class HugeClientBuilder {
     /** Set them null by default to keep compatibility with 'timeout' */
     private Integer connectTimeout;
     private Integer readTimeout;
+    private final boolean skipRequiredChecks;
 
     public HugeClientBuilder(String url, String graphSpace, String graph) {
-        E.checkArgument(url != null && !url.isEmpty(),
-                        "Expect a string value as the url parameter argument, but got: %s", url);
-        E.checkArgument(graph != null && !graph.isEmpty(),
-                        "Expect a string value as the graph name parameter argument, but got: %s",
-                        graph);
+        this(url, graphSpace, graph, false);
+    }
+
+    public HugeClientBuilder(String url, String graphSpace, String graph,
+                             boolean skipRequiredChecks) {
+        this.skipRequiredChecks = skipRequiredChecks;
+
+        if (!skipRequiredChecks) {
+            E.checkArgument(url != null && !url.isEmpty(),
+                            "Expect a string value as the url parameter argument, but got: %s", url);
+            E.checkArgument(graph != null && !graph.isEmpty(),
+                            "Expect a string value as the graph name parameter argument, but got: %s",
+                            graph);
+        }
+
         this.url = url;
         this.graphSpace = graphSpace;
         this.graph = graph;
@@ -76,8 +87,10 @@ public HugeClientBuilder(String url, String graphSpace, String graph) {
     }
 
     public HugeClient build() {
-        E.checkArgument(this.url != null, "The url parameter can't be null");
-        E.checkArgument(this.graph != null, "The graph parameter can't be null");
+        if (!this.skipRequiredChecks) {
+            E.checkArgument(this.url != null, "The url parameter can't be null");
+            E.checkArgument(this.graph != null, "The graph parameter can't be null");
+        }
         return new HugeClient(this);
     }
 

hugegraph-client/src/test/java/org/apache/hugegraph/api/BaseApiTest.java

@@ -171,8 +171,4 @@ protected static void waitUntilTaskCompleted(long taskId, long timeout) {
     protected RestClient client() {
         return client;
     }
-
-    protected RestClient client() {
-        return client;
-    }
 }

hugegraph-hubble/hubble-be/pom.xml

@@ -328,10 +328,13 @@
             <artifactId>protobuf-java</artifactId>
             <version>3.17.3</version>
         </dependency>
+        <!-- Use 'core' classifier to avoid embedded protobuf-java 2.5.0 conflict
+             with hg-pd-grpc which requires protobuf-java 3.17.x -->
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-exec</artifactId>
             <version>3.1.3</version>
+            <classifier>core</classifier>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -342,6 +345,13 @@
                     <groupId>com.google.protobuf</groupId>
                     <artifactId>protobuf-java</artifactId>
                 </exclusion>
+                <!-- Exclude log4j-slf4j-impl to avoid conflict with
+                     Spring Boot's log4j-to-slf4j from starter-logging.
+                     Both cannot coexist on the classpath. -->
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-slf4j-impl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->

hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/ProxyServletConfiguration.java

@@ -22,6 +22,7 @@
 
 import org.mitre.dsmiley.httpproxy.ProxyServlet;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -31,11 +32,25 @@ public class ProxyServletConfiguration{
     @Autowired
     private HugeConfig config;
 
+    /**
+     * Only register the proxy servlet when proxy.servlet_url is configured.
+     * When not configured, this bean won't be created, preventing the proxy
+     * servlet from intercepting all requests on root path.
+     */
     @Bean
+    @ConditionalOnProperty(name = "proxy.servlet_url", matchIfMissing = false)
     public ServletRegistrationBean servletRegistrationBean(){
+        String servletUrl = config.get(HubbleOptions.PROXY_SERVLET_URL);
+        String targetUrl = config.get(HubbleOptions.PROXY_TARGET_URL);
+        
+        // Additional safety check
+        if (servletUrl == null || servletUrl.isEmpty()) {
+            return null;
+        }
+        
         ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new IngestionProxyServlet(),
-                config.get(HubbleOptions.PROXY_SERVLET_URL));
-        servletRegistrationBean.addInitParameter("targetUri", config.get(HubbleOptions.PROXY_TARGET_URL));
+                servletUrl);
+        servletRegistrationBean.addInitParameter("targetUri", targetUrl);
         servletRegistrationBean.addInitParameter(ProxyServlet.P_LOG, "true");
         return servletRegistrationBean;
     }

hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/WebMvcConfig.java

@@ -21,27 +21,47 @@
 import org.apache.hugegraph.handler.LoginInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.resource.PathResourceResolver;
 
 import org.apache.hugegraph.handler.CustomInterceptor;
 
+import java.io.IOException;
+
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
 
     @Override
-    public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/{spring:[\\w-]+}")
-                .setViewName("forward:/");
-        registry.addViewController("/**/{spring:[\\w-]+}")
-                .setViewName("forward:/");
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/**")
+                .addResourceLocations("classpath:/ui/")
+                .resourceChain(true)
+                .addResolver(new PathResourceResolver() {
+                    @Override
+                    protected Resource getResource(String resourcePath,
+                                                   Resource location)
+                            throws IOException {
+                        Resource requested = location.createRelative(
+                                resourcePath);
+                        // If the requested resource exists and is readable,
+                        // serve it; otherwise fall back to index.html
+                        // for SPA routing
+                        if (requested.exists() && requested.isReadable()) {
+                            return requested;
+                        }
+                        return new ClassPathResource("/ui/index.html");
+                    }
+                });
     }
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(this.customInterceptor())
-                .addPathPatterns("/**");
+                .addPathPatterns("/api/**");
         registry.addInterceptor(this.loginInterceptor())
                 .addPathPatterns("/api/**")
                 .excludePathPatterns("/api/**/auth/login")

hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/BaseController.java

@@ -153,6 +153,19 @@ protected HugeClient unauthClient() {
         return client;
     }
 
+    protected HugeClient tempTokenClient() {
+        HttpServletRequest request = getRequest();
+        if (request.getAttribute("hugeClient") != null) {
+            HugeClient client = (HugeClient) request.getAttribute("hugeClient");
+            client.setAuthContext("Basic "+this.getToken());
+            return client;
+        }
+        HugeClient client = this.hugeClientPoolService.createTempTokenClient(this.getToken());
+        request.setAttribute("hugeClient", client);
+        return client;
+    }
+
+
     protected void clearRequestHugeClient() {
         HttpServletRequest request = getRequest();
         if (request.getAttribute("hugeClient") != null) {

hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/auth/LoginController.java

@@ -34,6 +34,8 @@
 import org.apache.hugegraph.controller.BaseController;
 import org.apache.hugegraph.structure.auth.LoginResult;
 
+import java.util.Base64;
+
 @RestController
 @RequestMapping(Constant.API_VERSION + "auth")
 public class LoginController extends BaseController {
@@ -45,8 +47,8 @@ public class LoginController extends BaseController {
     public Object login(@RequestBody Login login) {
         // Set Expire: 1 Month
         login.expire(60 * 60 * 24 * 30);
-
-        HugeClient client = unauthClient();
+        this.setToken(encodeCredentials(login));
+        HugeClient client = tempTokenClient();
         LoginResult result = client.auth().login(login);
         this.setUser(login.name());
         this.setSession("password", login.password());
@@ -62,6 +64,11 @@ public Object login(@RequestBody Login login) {
         return u;
     }
 
+    private String encodeCredentials(Login login) {
+        String combined = login.name() + ":" + login.password();
+        return Base64.getEncoder().encodeToString(combined.getBytes());
+    }
+
     @GetMapping("/status")
     public Object status() {
 

hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/HugeClientPoolService.java

@@ -87,6 +87,10 @@ public HugeClient createUnauthClient() {
         return getOrCreate(null, null, null, null);
     }
 
+    public HugeClient createTempTokenClient(String token){
+        return getOrCreate(null,null,null,token);
+    }
+
     public HugeClient createAuthClient(String graphSpace,
                                        String graph, String token) {
         return getOrCreate(null, graphSpace, graph, token);

hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/space/VermeerService.java

@@ -63,7 +63,8 @@ public Map<String, Object> getVermeer(String username, String password,
         }
         HugeClientBuilder builder = HugeClient.builder(protocol + "://" + dashboard,
                                                        null,
-                                                       null)
+                                                       null,
+                                                       true)
                                               .configUser(username, password);
         RestClient client = new RestClient(builder.url(), builder.token(),
                                            builder.timeout(),