disable cascading writes, fix #3742

ElektraInitiative · Apr 23, 2023 · 11c436a · 11c436a
1 parent 4801797
commit 11c436a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/src/tools/kdb/editor.cpp b/src/tools/kdb/editor.cpp
@@ -86,7 +86,13 @@ int EditorCommand::execute (Cmdline const & cl)
 	{
 		throw invalid_argument ("wrong number of arguments, 1 needed");
 	}
-	Key root = cl.createKey (0, false);
+	Key root = cl.createKey (0);
+
+	if (root.getNamespace () == kdb::ElektraNamespace::CASCADING)
+	{
+		cerr << "Aborting: Specify a namespace for editing a value." << endl;
+		return 12;
+	}
 
 	KeySet ours;
 	KDB kdb;
@@ -140,7 +146,7 @@ int EditorCommand::execute (Cmdline const & cl)
 		if (!runAllEditors (filename))
 		{
 			std::cerr << "Could not run any editor, please change /sw/elektra/kdb/#0/current/editor" << std::endl;
-			return 12;
+			return 15;
 		}
 	}
 

diff --git a/src/tools/kdb/import.cpp b/src/tools/kdb/import.cpp
@@ -43,6 +43,12 @@ int ImportCommand::execute (Cmdline const & cl)
 	{
 		throw invalid_argument ("root key \"" + cl.arguments[0] + "\" is not a valid key name");
 	}
+	if (root.getNamespace () == kdb::ElektraNamespace::CASCADING)
+	{
+		cerr << "Aborting: Specify a namespace for importing." << endl;
+		return 2;
+	}
+
 
 	KeySet originalKeys;
 	kdb.get (originalKeys, root);

diff --git a/src/tools/kdb/mv.cpp b/src/tools/kdb/mv.cpp
@@ -32,9 +32,15 @@ int MvCommand::execute (Cmdline const & cl)
 	}
 
 	KeySet conf;
-	Key sourceKey = cl.createKey (0, false);
+	Key sourceKey = cl.createKey (0);
 
-	Key destKey = cl.createKey (1, false);
+	Key destKey = cl.createKey (1);
+
+	if (sourceKey.getNamespace () == kdb::ElektraNamespace::CASCADING || destKey.getNamespace () == kdb::ElektraNamespace::CASCADING)
+	{
+		cerr << "Aborting: Specify a namespace for destination and source when moving a key." << endl;
+		return 12;
+	}
 	string newDirName = destKey.getName ();
 
 	Key root = tools::helper::commonKeyName (sourceKey, destKey);

diff --git a/src/tools/kdb/rm.cpp b/src/tools/kdb/rm.cpp
@@ -35,6 +35,13 @@ int RemoveCommand::execute (Cmdline const & cl)
 
 	KeySet conf;
 	Key x = cl.createKey (0);
+
+	if (x.getNamespace () == kdb::ElektraNamespace::CASCADING)
+	{
+		cerr << "Aborting: Specify a namespace for deleting a key." << endl;
+		return 12;
+	}
+
 	Key parentKey = cl.getParentKey (x);
 
 	kdb.get (conf, parentKey);