[fix] Quickwit panics while attempting to parse index_uri (#3692)

This PR also normalize the protocol. For instance postgres:// becomes postgresql after dserialization + serialization.
quickwit-oss · Jul 28, 2023 · 794eb47 · 794eb47
1 parent 90c59a2
commit 794eb47
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/quickwit/quickwit-common/src/uri.rs b/quickwit/quickwit-common/src/uri.rs
@@ -275,10 +275,10 @@ impl Uri {
             bail!("Failed to parse empty URI.");
         }
         let (protocol, mut path) = match uri_str.split_once(PROTOCOL_SEPARATOR) {
-            None => (Protocol::File.as_str(), uri_str.to_string()),
-            Some((protocol, path)) => (protocol, path.to_string()),
+            None => (Protocol::File, uri_str.to_string()),
+            Some((protocol, path)) => (Protocol::from_str(protocol)?, path.to_string()),
         };
-        if protocol == Protocol::File.as_str() {
+        if protocol == Protocol::File {
             if path.starts_with('~') {
                 // We only accept `~` (alias to the home directory) and `~/path/to/something`.
                 // If there is something following the `~` that is not `/`, we bail.
@@ -306,7 +306,7 @@ impl Uri {
         }
         Ok(Self {
             uri: format!("{protocol}{PROTOCOL_SEPARATOR}{path}"),
-            protocol_idx: protocol.len(),
+            protocol_idx: protocol.as_str().len(),
         })
     }
 }
@@ -486,6 +486,13 @@ mod tests {
             Uri::from_str("azure://account/container/homer/docs/../dognuts").unwrap(),
             "azure://account/container/homer/docs/../dognuts"
         );
+
+        assert_eq!(
+            Uri::from_str("http://localhost:9000/quickwit")
+                .unwrap_err()
+                .to_string(),
+            "Unknown URI protocol `http`."
+        );
     }
 
     #[test]

diff --git a/quickwit/quickwit-config/src/node_config/serialize.rs b/quickwit/quickwit-config/src/node_config/serialize.rs
@@ -455,7 +455,7 @@ mod tests {
         assert_eq!(config.data_dir_path, Path::new("/opt/quickwit/data"));
         assert_eq!(
             config.metastore_uri,
-            "postgres://username:password@host:port/db"
+            "postgresql://username:password@host:port/db"
         );
         assert_eq!(config.default_index_root_uri, "s3://quickwit-indexes");
 
@@ -618,7 +618,7 @@ mod tests {
         env_vars.insert("QW_DATA_DIR".to_string(), "test-data-dir".to_string());
         env_vars.insert(
             "QW_METASTORE_URI".to_string(),
-            "postgres://test-user:test-password@test-host:4321/test-db".to_string(),
+            "postgresql://test-user:test-password@test-host:4321/test-db".to_string(),
         );
         env_vars.insert(
             "QW_DEFAULT_INDEX_ROOT_URI".to_string(),
@@ -672,7 +672,7 @@ mod tests {
         );
         assert_eq!(
             config.metastore_uri,
-            "postgres://test-user:test-password@test-host:4321/test-db"
+            "postgresql://test-user:test-password@test-host:4321/test-db"
         );
         assert_eq!(config.default_index_root_uri, "s3://quickwit-indexes/prod");
     }
@@ -695,7 +695,7 @@ mod tests {
         assert_eq!(config.node_id, "node-1");
         assert_eq!(
             config.metastore_uri,
-            "postgres://username:password@host:port/db"
+            "postgresql://username:password@host:port/db"
         );
     }
 
@@ -715,7 +715,7 @@ mod tests {
         .unwrap();
         assert_eq!(
             config.metastore_uri,
-            "postgres://username:password@host:port/db"
+            "postgresql://username:password@host:port/db"
         );
         assert_eq!(config.indexer_config, IndexerConfig::default());
         assert_eq!(config.searcher_config, SearcherConfig::default());