feat: discovery_nodes not need auth. (#16392)

databendlabs · Sep 6, 2024 · 390b9c1 · 390b9c1
1 parent db6a305
commit 390b9c1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/query/service/src/auth.rs b/src/query/service/src/auth.rs
@@ -50,6 +50,7 @@ pub enum Credential {
         password: Option<Vec<u8>>,
         client_ip: Option<String>,
     },
+    NoNeed,
 }
 
 impl AuthMgr {
@@ -79,6 +80,7 @@ impl AuthMgr {
     ) -> Result<Option<String>> {
         let user_api = UserApiProvider::instance();
         match credential {
+            Credential::NoNeed => Ok(None),
             Credential::DatabendToken {
                 token,
                 set_user,

diff --git a/src/query/service/src/servers/http/http_services.rs b/src/query/service/src/servers/http/http_services.rs
@@ -142,7 +142,7 @@ impl HttpHandler {
                 "/discovery_nodes",
                 get(discovery_nodes).with(HTTPSessionMiddleware::create(
                     self.kind,
-                    EndpointKind::StartQuery,
+                    EndpointKind::NoAuth,
                 )),
             );
 

diff --git a/src/query/service/src/servers/http/middleware.rs b/src/query/service/src/servers/http/middleware.rs
@@ -75,6 +75,7 @@ pub enum EndpointKind {
     StartQuery,
     PollQuery,
     Clickhouse,
+    NoAuth,
 }
 
 const USER_AGENT: &str = "User-Agent";
@@ -133,6 +134,9 @@ fn get_credential(
     kind: HttpHandlerKind,
     endpoint_kind: EndpointKind,
 ) -> Result<Credential> {
+    if matches!(endpoint_kind, EndpointKind::NoAuth) {
+        return Ok(Credential::NoNeed);
+    }
     let std_auth_headers: Vec<_> = req.headers().get_all(AUTHORIZATION).iter().collect();
     if std_auth_headers.len() > 1 {
         let msg = &format!("Multiple {} headers detected", AUTHORIZATION);
@@ -221,6 +225,9 @@ fn auth_by_header(
                                 "clickhouse handler should not use databend auth",
                             ));
                         }
+                        EndpointKind::NoAuth => {
+                            unreachable!()
+                        }
                     };
                     Ok(Credential::DatabendToken {
                         token,