Land #11393, If an option alias is deregistered, also deregister the …

…original option
rapid7 · Feb 20, 2019 · 6f177d8 · 6f177d8
1 parent b56b28a
commit 6f177d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/msf/core/data_store.rb b/lib/msf/core/data_store.rb
@@ -306,8 +306,6 @@ def each(&block)
     list.each(&block)
   end
 
-protected
-
   #
   # Case-insensitive key lookup
   #

diff --git a/lib/msf/core/module/options.rb b/lib/msf/core/module/options.rb
@@ -29,8 +29,12 @@ def validate
   #
   def deregister_options(*names)
     names.each { |name|
-      self.options.remove_option(name)
+      real_name = self.datastore.find_key_case(name)
       self.datastore.delete(name)
+      self.options.remove_option(name)
+      if real_name != name
+        self.options.remove_option(real_name)
+      end
     }
   end
 
@@ -62,4 +66,4 @@ def register_options(options, owner = self.class)
     self.datastore.import_options(self.options, 'self', true)
     import_defaults(false)
   end
-end
+end