decode x-namespace-bin

tursodatabase · May 22, 2024 · df6a55c · df6a55c
1 parent b640749
commit df6a55c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/libsql-server/src/error.rs b/libsql-server/src/error.rs
@@ -1,5 +1,5 @@
 use axum::response::IntoResponse;
-use hyper::{header::ToStrError, StatusCode};
+use hyper::StatusCode;
 use tonic::metadata::errors::InvalidMetadataValueBytes;
 
 use crate::{
@@ -69,7 +69,7 @@ pub enum Error {
     #[error("Invalid namespace")]
     InvalidNamespace,
     #[error("Invalid namespace bytes: `{0}`")]
-    InvalidNamespaceBytes(#[from] ToStrError),
+    InvalidNamespaceBytes(Box<dyn std::error::Error + Sync + Send + 'static>),
     #[error("Replica meta error: {0}")]
     ReplicaMetaError(#[from] libsql_replication::meta::Error),
     #[error("Replicator error: {0}")]

diff --git a/libsql-server/src/http/user/db_factory.rs b/libsql-server/src/http/user/db_factory.rs
@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use axum::extract::{FromRequestParts, Path};
+use base64::prelude::*;
 use hyper::http::request::Parts;
 use hyper::HeaderMap;
 use libsql_replication::rpc::replication::NAMESPACE_METADATA_KEY;
@@ -73,8 +74,13 @@ fn try_namespace_from_host(
 fn try_namespace_from_metadata(metadata: &axum::http::HeaderValue) -> Result<NamespaceName, Error> {
     metadata
         .to_str()
-        .map_err(|s| Error::InvalidNamespaceBytes(s))
-        .and_then(|ns| NamespaceName::from_string(ns.into()))
+        .map_err(|s| Error::InvalidNamespaceBytes(Box::new(s)))
+        .and_then(|encoded| {
+            BASE64_STANDARD_NO_PAD
+                .decode(encoded)
+                .map_err(|e| Error::InvalidNamespaceBytes(Box::new(e)))
+        })
+        .and_then(|ns| NamespaceName::from_bytes(ns.into()))
 }
 
 pub struct MakeConnectionExtractorPath(pub Arc<dyn MakeConnection<Connection = Connection>>);