Merge pull request #1172 from vojtechtrefny/master_lvm-dbus-input-validation

lvm-dbus: Validate device/object ID parameters for NULL and empty string

Author: vojtechtrefny

src/plugins/lvm/lvm-dbus.c

@@ -438,6 +438,12 @@ static gchar* get_object_path (const gchar *obj_id, GError **error) {
     GVariant *ret = NULL;
     gchar *obj_path = NULL;
 
+    if (!obj_id || g_strcmp0 (obj_id, "") == 0) {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_NOEXIST,
+                     "Invalid LVM ID specified");
+        return NULL;
+    }
+
     args = g_variant_new ("(s)", obj_id);
     /* consumes (frees) the 'args' parameter */
     ret = g_dbus_connection_call_sync (bus, LVM_BUS_NAME, MANAGER_OBJ, MANAGER_INTF,
@@ -955,6 +961,12 @@ static GVariant* get_pv_properties (const gchar *pv_name, GError **error) {
     gchar *obj_id = NULL;
     GVariant *ret = NULL;
 
+    if (!pv_name || g_strcmp0 (pv_name, "") == 0) {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_NOEXIST,
+                     "Invalid LVM ID specified");
+        return NULL;
+    }
+
     if (!g_str_has_prefix (pv_name, "/dev/")) {
         obj_id = g_strdup_printf ("/dev/%s", pv_name);
         ret = get_lvm_object_properties (obj_id, PV_INTF, error);
@@ -1523,6 +1535,12 @@ gboolean bd_lvm_pvcreate (const gchar *device, guint64 data_alignment, guint64 m
     GVariant *params = NULL;
     GVariant *extra_params = NULL;
 
+    if (!device || g_strcmp0 (device, "") == 0) {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_NOEXIST,
+                     "Invalid LVM ID specified");
+        return FALSE;
+    }
+
     if (data_alignment != 0 || metadata_size != 0) {
         g_variant_builder_init (&builder, G_VARIANT_TYPE_DICTIONARY);
         if (data_alignment != 0) {
@@ -1586,6 +1604,12 @@ gboolean bd_lvm_pvremove (const gchar *device, const BDExtraArg **extra, GError
     GError *l_error = NULL;
     gboolean ret = FALSE;
 
+    if (!device || g_strcmp0 (device, "") == 0) {
+        g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_NOEXIST,
+                     "Invalid LVM ID specified");
+        return FALSE;
+    }
+
     if (access (device, F_OK) != 0) {
         g_set_error (error, BD_LVM_ERROR, BD_LVM_ERROR_NOEXIST,
                      "The device '%s' doesn't exist", device);

tests/lvm_dbus_tests.py

@@ -46,6 +46,19 @@ def setUpClass(cls):
     def test_plugin_version(self):
         self.assertEqual(BlockDev.get_plugin_soname(BlockDev.Plugin.LVM), "libbd_lvm-dbus.so.3")
 
+    @tag_test(TestTags.NOSTORAGE)
+    def test_empty_device(self):
+        """Verify that passing an empty device string returns a proper error"""
+
+        with self.assertRaisesRegex(GLib.GError, "Invalid LVM ID specified"):
+            BlockDev.lvm_pvcreate("", 0, 0, None)
+
+        with self.assertRaisesRegex(GLib.GError, "Invalid LVM ID specified"):
+            BlockDev.lvm_pvresize("", 0, None)
+
+        with self.assertRaisesRegex(GLib.GError, "Invalid LVM ID specified"):
+            BlockDev.lvm_vgremove("", None)
+
     @tag_test(TestTags.NOSTORAGE)
     def test_tech_available(self):
         """Verify that checking lvm dbus availability by technology works as expected"""