Clean up lib/sicuro/runtime/whitelist.rb.

Author: duckinator

lib/sicuro/runtime/whitelist.rb

@@ -23,25 +23,9 @@ def self.enforce_whitelist!
           (const.methods + const.private_methods - $TRUSTED_METHODS_ALL - trusted).each do |method_name|
             m = method_name.to_sym.inspect
 
-            # FIXME: Make this less horrifyingly gross.
-              begin
-                eval("public #{m}; undef #{m}")
-              rescue NameError => e
-                # Re-raise the error as long as it is not telling us
-                # the method we are trying to remove is undefined.
-                unless e.message.start_with?("undefined method `#{method_name.to_s}' ")
-                  raise
-                end
-              end
-
-
-            #next unless method_defined?('define_method')
-            #define_method(meth) {}
-
-            #remove_method(meth) rescue nil
-            #eval("public #{m}; undef #{m}")
-            #puts "Removing #{constant}.#{meth}"
-            #undef_method meth if respond_to?(meth)
+            next unless method_defined?(method_name) || public_method_defined?(method_name) || private_method_defined?(method_name)
+
+            undef_method method_name
           end
         end
       end