f More winblowz fixing

Author: tnull

lightning-storage/src/fs_store.rs

@@ -62,6 +62,11 @@ impl KVStore for FilesystemStore {
 		let lock_key = (namespace.to_string(), key.to_string());
 		let inner_lock_ref = Arc::clone(&outer_lock.entry(lock_key).or_default());
 
+		if key.is_empty() {
+			let msg = format!("Failed to read {}/{}: key may not be empty.", namespace, key);
+			return Err(std::io::Error::new(std::io::ErrorKind::Other, msg));
+		}
+
 		let mut dest_file_path = self.data_dir.clone();
 		dest_file_path.push(namespace);
 		dest_file_path.push(key);
@@ -74,6 +79,11 @@ impl KVStore for FilesystemStore {
 		let inner_lock_ref = Arc::clone(&outer_lock.entry(lock_key).or_default());
 		let _guard = inner_lock_ref.write().unwrap();
 
+		if key.is_empty() {
+			let msg = format!("Failed to write {}/{}: key may not be empty.", namespace, key);
+			return Err(std::io::Error::new(std::io::ErrorKind::Other, msg));
+		}
+
 		let mut dest_file_path = self.data_dir.clone();
 		dest_file_path.push(namespace);
 		dest_file_path.push(key);
@@ -148,6 +158,11 @@ impl KVStore for FilesystemStore {
 
 		let _guard = inner_lock_ref.write().unwrap();
 
+		if key.is_empty() {
+			let msg = format!("Failed to remove {}/{}: key may not be empty.", namespace, key);
+			return Err(std::io::Error::new(std::io::ErrorKind::Other, msg));
+		}
+
 		let mut dest_file_path = self.data_dir.clone();
 		dest_file_path.push(namespace);
 		dest_file_path.push(key);

lightning-storage/src/test_utils.rs

@@ -17,6 +17,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStore>(kv_store: &K) {
 
 	// Test empty namespace is allowed, but not empty key.
 	kv_store.write("", key, &data).unwrap();
+	println!("ERR: {:?}", kv_store.write(namespace, "", &data));
 	assert!(kv_store.write(namespace, "", &data).is_err());
 
 	let listed_keys = kv_store.list(namespace).unwrap();