Cleaned up code per suggestions in the PR

Author: bwatters-r7

lib/msf/core/post/windows/dotnet.rb

@@ -2,28 +2,12 @@
 require 'msf/core/post/common'
 require 'msf/core/post/windows/registry'
 
-module Msf
-class Post
-module Windows
-
-#
-# This module serves to hold methods related to .NET framework
-#
-module Dotnet
+module Msf::Post::Windows::Dotnet
   include ::Msf::Post::Common
   include ::Msf::Post::Windows::Registry
 
   def initialize(info = {})
     super
-    register_advanced_options(
-      [
-        OptInt.new('Dotnet::Post::timeout', [true, 'Dotnet execution timeout, set < 0 to run async without termination', 15]),
-        OptBool.new('Dotnet::Post::log_output', [true, 'Write output to log file', false]),
-        OptBool.new('Dotnet::Post::dry_run', [true, 'Return encoded output to caller', false]),
-        OptBool.new('Dotnet::Post::force_wow64', [true, 'Force WOW64 execution', false])
-      ], 
-      self.class
-    )
   end
   #
   # Searches the subkey for the value 'Version' which contains the
@@ -35,13 +19,16 @@ def search_for_version(dotnet_subkey)
     dotnet_version = nil
     begin
       subkeys = registry_enumvals(dotnet_subkey)
-    rescue ::Exception => e
+    rescue Rex::Post::Meterpreter::RequestError => e
       print_status("Encountered exception in search_for_version: #{e.class} #{e}")
+      elog("#{e.class} #{e.message}\n#{e.backtrace * "\n"}")
     end
-    subkeys.each do |i|
-      if i == 'Version'
-        dotnet_version = registry_getvaldata(dotnet_subkey, i)
-        break
+    unless subkeys.nil?
+      subkeys.each do |subkey|
+        if subkey == 'Version'
+          dotnet_version = registry_getvaldata(dotnet_subkey, subkey)
+          break
+        end
       end
     end
     return dotnet_version
@@ -55,14 +42,17 @@ def get_versionception(dotnet_vkey)
     exact_version = nil
     begin
       subkeys = registry_enumkeys(dotnet_vkey)
-    rescue ::Exception => e
+    rescue Rex::Post::Meterpreter::RequestError => e
       print_status("Encountered exception in get_versionception: #{e.class} #{e}")
+      elog("#{e.class} #{e.message}\n#{e.backtrace * "\n"}")
     end
-    subkeys.each do |i|
-      exact_version = search_for_version(dotnet_vkey + '\\' + i)
-      unless exact_version.nil?
-        # if we find a version, stop looking
-        break
+    unless subkeys.nil?
+      subkeys.each do |subkey|
+        exact_version = search_for_version(dotnet_vkey + '\\' + subkey)
+        unless exact_version.nil?
+          # if we find a version, stop looking
+          break
+        end
       end
     end
     return exact_version
@@ -77,13 +67,14 @@ def get_dotnet_versions
     key = 'HKLM\\SOFTWARE\\Microsoft\NET Framework Setup\\NDP'
     begin
       dotnet_keys = registry_enumkeys(key)
-    rescue ::Exception => e
+    rescue Rex::Post::Meterpreter::RequestError => e
       print_status("Encountered exception in get_dotnet_version: #{e.class} #{e}")
+      elog("#{e.class} #{e.message}\n#{e.backtrace * "\n"}")
     end
     unless dotnet_keys.nil?
-      dotnet_keys.each do |i|
-        if i[0,1] == 'v'
-          key = 'HKLM\\SOFTWARE\\Microsoft\NET Framework Setup\\NDP\\' + i
+      dotnet_keys.each do |temp_key|
+        if temp_key[0] == 'v'
+          key = 'HKLM\\SOFTWARE\\Microsoft\NET Framework Setup\\NDP\\' + temp_key
           dotnet_version = get_versionception(key)
           unless dotnet_version.nil? 
             ret_val << dotnet_version
@@ -94,6 +85,4 @@ def get_dotnet_versions
     return ret_val
   end
 end
-end
-end
-end
+