Deprecate taint/trust and related methods, and make the methods no-ops

This removes the related tests, and puts the related specs behind
version guards.  This affects all code in lib, including some
libraries that may want to support older versions of Ruby.

3 files changed, 1 insertions, 16 deletions

diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 0063e20144..5673fa3880 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -233,7 +233,7 @@ require_relative 'eq'
 #       def get_logger(name)
 #           if !@loggers.has_key? name
 #               # make the filename safe, then declare it to be so
-#               fname = name.gsub(/[.\/\\\:]/, "_").untaint
+#               fname = name.gsub(/[.\/\\\:]/, "_")
 #               @loggers[name] = Logger.new(name, @basedir + "/" + fname)
 #           end
 #           return @loggers[name]
@@ -594,16 +594,9 @@ module DRb
       raise(DRbConnError, 'premature marshal format(can\'t read)') if str.size < sz
       DRb.mutex.synchronize do
         begin
-          save = Thread.current[:drb_untaint]
-          Thread.current[:drb_untaint] = []
           Marshal::load(str)
         rescue NameError, ArgumentError
           DRbUnknown.new($!, str)
-        ensure
-          Thread.current[:drb_untaint].each do |x|
-            x.untaint
-          end
-          Thread.current[:drb_untaint] = save
         end
       end
     end
@@ -843,8 +836,6 @@ module DRb
     # URI protocols.
     def self.open(uri, config)
       host, port, = parse_uri(uri)
-      host.untaint
-      port.untaint
       soc = TCPSocket.open(host, port)
       self.new(uri, soc, config)
     end
@@ -1061,9 +1052,6 @@ module DRb
 
       if DRb.here?(uri)
         obj = DRb.to_obj(ref)
-        if ((! obj.tainted?) && Thread.current[:drb_untaint])
-          Thread.current[:drb_untaint].push(obj)
-        end
         return obj
       end
 
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index 48ba35ace7..3d528c6172 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -248,8 +248,6 @@ module DRb
     # configuration.  Either a Hash or DRb::DRbSSLSocket::SSLConfig
     def self.open(uri, config)
       host, port, = parse_uri(uri)
-      host.untaint
-      port.untaint
       soc = TCPSocket.open(host, port)
       ssl_conf = SSLConfig::new(config)
       ssl_conf.setup_ssl_context
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index 89957c9e7b..1629ad3bcd 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -27,7 +27,6 @@ module DRb
 
     def self.open(uri, config)
       filename, = parse_uri(uri)
-      filename.untaint
       soc = UNIXSocket.open(filename)
       self.new(uri, soc, config)
     end