fix proxy bug (#659)

Author: MarinPostma

sqld/src/lib.rs

@@ -520,7 +520,8 @@ async fn start_primary(
         config.disable_namespaces,
     );
 
-    let proxy_service = ProxyService::new(namespaces.clone(), Some(auth));
+    let proxy_service =
+        ProxyService::new(namespaces.clone(), Some(auth), config.disable_namespaces);
 
     run_service(
         namespaces.clone(),

sqld/src/rpc/mod.rs

@@ -34,7 +34,7 @@ pub async fn run_rpc_server(
     namespaces: Arc<NamespaceStore<PrimaryNamespaceMaker>>,
     disable_namespaces: bool,
 ) -> anyhow::Result<()> {
-    let proxy_service = ProxyService::new(namespaces.clone(), None);
+    let proxy_service = ProxyService::new(namespaces.clone(), None, disable_namespaces);
     let logger_service = ReplicationLogService::new(
         namespaces.clone(),
         idle_shutdown_layer.clone(),

sqld/src/rpc/proxy.rs

@@ -264,17 +264,20 @@ pub struct ProxyService {
     clients: RwLock<HashMap<Uuid, Arc<TrackedConnection<LibSqlConnection>>>>,
     namespaces: Arc<NamespaceStore<PrimaryNamespaceMaker>>,
     auth: Option<Arc<Auth>>,
+    disable_namespaces: bool,
 }
 
 impl ProxyService {
     pub fn new(
         namespaces: Arc<NamespaceStore<PrimaryNamespaceMaker>>,
         auth: Option<Arc<Auth>>,
+        disable_namespaces: bool,
     ) -> Self {
         Self {
             clients: Default::default(),
             namespaces,
             auth,
+            disable_namespaces,
         }
     }
 }
@@ -445,9 +448,7 @@ impl Proxy for ProxyService {
         } else {
             Authenticated::from_proxy_grpc_request(&req)?
         };
-
-        let namespace = super::extract_namespace(true, &req)?;
-
+        let namespace = super::extract_namespace(self.disable_namespaces, &req)?;
         let req = req.into_inner();
         let pgm = crate::connection::program::Program::try_from(req.pgm.unwrap())
             .map_err(|e| tonic::Status::new(tonic::Code::InvalidArgument, e.to_string()))?;