Remove code related to taint/untaint

Earlopain · eregon · commit d9111a315353 · 2026-06-14T23:10:41.000+02:00
No longer serves any purpose
diff --git a/core/array/fixtures/classes.rb b/core/array/fixtures/classes.rb
@@ -5,7 +5,7 @@ def pack_format(count=nil, repeat=nil)
     format = instance_variable_get(:@method)
     format += count.to_s unless format == 'P' || format == 'p'
     format *= repeat if repeat
-    format.dup # because it may then become tainted
+    format
   end
 end
 
diff --git a/core/array/pack/a_spec.rb b/core/array/pack/a_spec.rb
@@ -3,14 +3,12 @@
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
 require_relative 'shared/string'
-require_relative 'shared/taint'
 
 describe "Array#pack with format 'A'" do
   it_behaves_like :array_pack_basic, 'A'
   it_behaves_like :array_pack_basic_non_float, 'A'
   it_behaves_like :array_pack_no_platform, 'A'
   it_behaves_like :array_pack_string, 'A'
-  it_behaves_like :array_pack_taint, 'A'
 
   it "calls #to_str to convert an Object to a String" do
     obj = mock("pack A string")
@@ -49,7 +47,6 @@
   it_behaves_like :array_pack_basic_non_float, 'a'
   it_behaves_like :array_pack_no_platform, 'a'
   it_behaves_like :array_pack_string, 'a'
-  it_behaves_like :array_pack_taint, 'a'
 
   it "adds all the bytes to the output when passed the '*' modifier" do
     ["abc"].pack("a*").should == "abc"
diff --git a/core/array/pack/b_spec.rb b/core/array/pack/b_spec.rb
@@ -3,14 +3,12 @@
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
 require_relative 'shared/encodings'
-require_relative 'shared/taint'
 
 describe "Array#pack with format 'B'" do
   it_behaves_like :array_pack_basic, 'B'
   it_behaves_like :array_pack_basic_non_float, 'B'
   it_behaves_like :array_pack_arguments, 'B'
   it_behaves_like :array_pack_hex, 'B'
-  it_behaves_like :array_pack_taint, 'B'
 
   it "calls #to_str to convert an Object to a String" do
     obj = mock("pack B string")
@@ -66,7 +64,6 @@
   it_behaves_like :array_pack_basic_non_float, 'b'
   it_behaves_like :array_pack_arguments, 'b'
   it_behaves_like :array_pack_hex, 'b'
-  it_behaves_like :array_pack_taint, 'b'
 
   it "calls #to_str to convert an Object to a String" do
     obj = mock("pack H string")
diff --git a/core/array/pack/h_spec.rb b/core/array/pack/h_spec.rb
@@ -3,14 +3,12 @@
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
 require_relative 'shared/encodings'
-require_relative 'shared/taint'
 
 describe "Array#pack with format 'H'" do
   it_behaves_like :array_pack_basic, 'H'
   it_behaves_like :array_pack_basic_non_float, 'H'
   it_behaves_like :array_pack_arguments, 'H'
   it_behaves_like :array_pack_hex, 'H'
-  it_behaves_like :array_pack_taint, 'H'
 
   it "calls #to_str to convert an Object to a String" do
     obj = mock("pack H string")
@@ -112,7 +110,6 @@
   it_behaves_like :array_pack_basic_non_float, 'h'
   it_behaves_like :array_pack_arguments, 'h'
   it_behaves_like :array_pack_hex, 'h'
-  it_behaves_like :array_pack_taint, 'h'
 
   it "calls #to_str to convert an Object to a String" do
     obj = mock("pack H string")
diff --git a/core/array/pack/m_spec.rb b/core/array/pack/m_spec.rb
@@ -2,13 +2,11 @@
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
-require_relative 'shared/taint'
 
 describe "Array#pack with format 'M'" do
   it_behaves_like :array_pack_basic, 'M'
   it_behaves_like :array_pack_basic_non_float, 'M'
   it_behaves_like :array_pack_arguments, 'M'
-  it_behaves_like :array_pack_taint, 'M'
 
   it "encodes an empty string as an empty string" do
     [""].pack("M").should == ""
@@ -202,7 +200,6 @@
   it_behaves_like :array_pack_basic, 'm'
   it_behaves_like :array_pack_basic_non_float, 'm'
   it_behaves_like :array_pack_arguments, 'm'
-  it_behaves_like :array_pack_taint, 'm'
 
   it "encodes an empty string as an empty string" do
     [""].pack("m").should == ""
diff --git a/core/array/pack/p_spec.rb b/core/array/pack/p_spec.rb
@@ -1,11 +1,9 @@
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
-require_relative 'shared/taint'
 
 describe "Array#pack with format 'P'" do
   it_behaves_like :array_pack_basic_non_float, 'P'
-  it_behaves_like :array_pack_taint, 'P'
 
   it "produces as many bytes as there are in a pointer" do
     ["hello"].pack("P").size.should == [0].pack("J").size
@@ -22,7 +20,6 @@
 
 describe "Array#pack with format 'p'" do
   it_behaves_like :array_pack_basic_non_float, 'p'
-  it_behaves_like :array_pack_taint, 'p'
 
   it "produces as many bytes as there are in a pointer" do
     ["hello"].pack("p").size.should == [0].pack("J").size
diff --git a/core/array/pack/shared/taint.rb b/core/array/pack/shared/taint.rb
diff --git a/core/array/pack/u_spec.rb b/core/array/pack/u_spec.rb
@@ -3,7 +3,6 @@
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
 require_relative 'shared/unicode'
-require_relative 'shared/taint'
 
 describe "Array#pack with format 'U'" do
   it_behaves_like :array_pack_basic, 'U'
@@ -16,7 +15,6 @@
   it_behaves_like :array_pack_basic, 'u'
   it_behaves_like :array_pack_basic_non_float, 'u'
   it_behaves_like :array_pack_arguments, 'u'
-  it_behaves_like :array_pack_taint, 'u'
 
   it "calls #to_str to convert an Object to a String" do
     obj = mock("pack u string")
diff --git a/core/array/pack/z_spec.rb b/core/array/pack/z_spec.rb
@@ -3,14 +3,12 @@
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
 require_relative 'shared/string'
-require_relative 'shared/taint'
 
 describe "Array#pack with format 'Z'" do
   it_behaves_like :array_pack_basic, 'Z'
   it_behaves_like :array_pack_basic_non_float, 'Z'
   it_behaves_like :array_pack_no_platform, 'Z'
   it_behaves_like :array_pack_string, 'Z'
-  it_behaves_like :array_pack_taint, 'Z'
 
   it "calls #to_str to convert an Object to a String" do
     obj = mock("pack Z string")
diff --git a/core/string/fixtures/classes.rb b/core/string/fixtures/classes.rb
@@ -4,7 +4,7 @@ class Object
   def unpack_format(count=nil, repeat=nil)
     format = "#{instance_variable_get(:@method)}#{count}"
     format *= repeat if repeat
-    format.dup # because it may then become tainted
+    format
   end
 end
 
diff --git a/core/string/unpack/a_spec.rb b/core/string/unpack/a_spec.rb
@@ -3,14 +3,12 @@
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
 require_relative 'shared/string'
-require_relative 'shared/taint'
 
 describe "String#unpack with format 'A'" do
   it_behaves_like :string_unpack_basic, 'A'
   it_behaves_like :string_unpack_no_platform, 'A'
   it_behaves_like :string_unpack_string, 'A'
   it_behaves_like :string_unpack_Aa, 'A'
-  it_behaves_like :string_unpack_taint, 'A'
 
   it "removes trailing space and NULL bytes from the decoded string" do
     [ ["a\x00 b \x00",  ["a\x00 b", ""]],
@@ -42,7 +40,6 @@
   it_behaves_like :string_unpack_no_platform, 'a'
   it_behaves_like :string_unpack_string, 'a'
   it_behaves_like :string_unpack_Aa, 'a'
-  it_behaves_like :string_unpack_taint, 'a'
 
   it "does not remove trailing whitespace or NULL bytes from the decoded string" do
     [ ["a\x00 b \x00",  ["a\x00 b \x00"]],
diff --git a/core/string/unpack/b_spec.rb b/core/string/unpack/b_spec.rb
@@ -2,12 +2,10 @@
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
-require_relative 'shared/taint'
 
 describe "String#unpack with format 'B'" do
   it_behaves_like :string_unpack_basic, 'B'
   it_behaves_like :string_unpack_no_platform, 'B'
-  it_behaves_like :string_unpack_taint, 'B'
 
   it "decodes one bit from each byte for each format character starting with the most significant bit" do
     [ ["\x00",     "B",  ["0"]],
@@ -105,7 +103,6 @@
 describe "String#unpack with format 'b'" do
   it_behaves_like :string_unpack_basic, 'b'
   it_behaves_like :string_unpack_no_platform, 'b'
-  it_behaves_like :string_unpack_taint, 'b'
 
   it "decodes one bit from each byte for each format character starting with the least significant bit" do
     [ ["\x00",     "b",  ["0"]],
diff --git a/core/string/unpack/h_spec.rb b/core/string/unpack/h_spec.rb
@@ -2,12 +2,10 @@
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
-require_relative 'shared/taint'
 
 describe "String#unpack with format 'H'" do
   it_behaves_like :string_unpack_basic, 'H'
   it_behaves_like :string_unpack_no_platform, 'H'
-  it_behaves_like :string_unpack_taint, 'H'
 
   it "decodes one nibble from each byte for each format character starting with the most significant bit" do
     [ ["\x8f",     "H",  ["8"]],
@@ -74,7 +72,6 @@
 describe "String#unpack with format 'h'" do
   it_behaves_like :string_unpack_basic, 'h'
   it_behaves_like :string_unpack_no_platform, 'h'
-  it_behaves_like :string_unpack_taint, 'h'
 
   it "decodes one nibble from each byte for each format character starting with the least significant bit" do
     [ ["\x8f",     "h",  ["f"]],
diff --git a/core/string/unpack/m_spec.rb b/core/string/unpack/m_spec.rb
@@ -2,12 +2,10 @@
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
-require_relative 'shared/taint'
 
 describe "String#unpack with format 'M'" do
   it_behaves_like :string_unpack_basic, 'M'
   it_behaves_like :string_unpack_no_platform, 'M'
-  it_behaves_like :string_unpack_taint, 'M'
 
   it "decodes an empty string" do
     "".unpack("M").should == [""]
@@ -107,7 +105,6 @@
 describe "String#unpack with format 'm'" do
   it_behaves_like :string_unpack_basic, 'm'
   it_behaves_like :string_unpack_no_platform, 'm'
-  it_behaves_like :string_unpack_taint, 'm'
 
   it "decodes an empty string" do
     "".unpack("m").should == [""]
diff --git a/core/string/unpack/p_spec.rb b/core/string/unpack/p_spec.rb
@@ -1,11 +1,9 @@
 require_relative '../../../spec_helper'
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
-require_relative 'shared/taint'
 
 describe "String#unpack with format 'P'" do
   it_behaves_like :string_unpack_basic, 'P'
-  it_behaves_like :string_unpack_taint, 'P'
 
   it "round-trips a string through pack and unpack" do
     ["hello"].pack("P").unpack("P5").should == ["hello"]
@@ -29,7 +27,6 @@
 
 describe "String#unpack with format 'p'" do
   it_behaves_like :string_unpack_basic, 'p'
-  it_behaves_like :string_unpack_taint, 'p'
 
   it "round-trips a string through pack and unpack" do
     ["hello"].pack("p").unpack("p").should == ["hello"]
diff --git a/core/string/unpack/shared/taint.rb b/core/string/unpack/shared/taint.rb
diff --git a/core/string/unpack/u_spec.rb b/core/string/unpack/u_spec.rb
@@ -3,13 +3,11 @@
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
 require_relative 'shared/unicode'
-require_relative 'shared/taint'
 
 describe "String#unpack with format 'U'" do
   it_behaves_like :string_unpack_basic, 'U'
   it_behaves_like :string_unpack_no_platform, 'U'
   it_behaves_like :string_unpack_unicode, 'U'
-  it_behaves_like :string_unpack_taint, 'U'
 
   it "raises ArgumentError on a malformed byte sequence" do
     -> { "\xE3".unpack('U') }.should.raise(ArgumentError)
@@ -23,7 +21,6 @@
 describe "String#unpack with format 'u'" do
   it_behaves_like :string_unpack_basic, 'u'
   it_behaves_like :string_unpack_no_platform, 'u'
-  it_behaves_like :string_unpack_taint, 'u'
 
   it "decodes an empty string as an empty string" do
     "".unpack("u").should == [""]
diff --git a/core/string/unpack/z_spec.rb b/core/string/unpack/z_spec.rb
@@ -3,13 +3,11 @@
 require_relative '../fixtures/classes'
 require_relative 'shared/basic'
 require_relative 'shared/string'
-require_relative 'shared/taint'
 
 describe "String#unpack with format 'Z'" do
   it_behaves_like :string_unpack_basic, 'Z'
   it_behaves_like :string_unpack_no_platform, 'Z'
   it_behaves_like :string_unpack_string, 'Z'
-  it_behaves_like :string_unpack_taint, 'Z'
 
   it "stops decoding at NULL bytes when passed the '*' modifier" do
     "a\x00\x00 b \x00c".unpack('Z*Z*Z*Z*').should == ["a", "", " b ", "c"]
diff --git a/library/delegate/delegator/taint_spec.rb b/library/delegate/delegator/taint_spec.rb
diff --git a/library/delegate/delegator/trust_spec.rb b/library/delegate/delegator/trust_spec.rb
diff --git a/library/delegate/delegator/untaint_spec.rb b/library/delegate/delegator/untaint_spec.rb
diff --git a/library/delegate/delegator/untrust_spec.rb b/library/delegate/delegator/untrust_spec.rb
diff --git a/optional/capi/ext/rbasic_spec.c b/optional/capi/ext/rbasic_spec.c
@@ -13,13 +13,8 @@ extern "C" {
 #define RBASIC_SET_FLAGS(obj, flags_to_set) (RBASIC(obj)->flags = flags_to_set)
 #endif
 
-#ifndef FL_SHAREABLE
-static const VALUE VISIBLE_BITS = FL_TAINT | FL_FREEZE;
-static const VALUE DATA_VISIBLE_BITS = FL_TAINT | FL_FREEZE | ~(FL_USER0 - 1);
-#else
 static const VALUE VISIBLE_BITS = FL_FREEZE;
 static const VALUE DATA_VISIBLE_BITS = FL_FREEZE | ~(FL_USER0 - 1);
-#endif
 
 #if SIZEOF_VALUE == SIZEOF_LONG
 #define VALUE2NUM(v) ULONG2NUM(v)
diff --git a/optional/capi/object_spec.rb b/optional/capi/object_spec.rb
@@ -652,15 +652,6 @@ def reach
     end
   end
 
-  describe "OBJ_TAINT" do
-  end
-
-  describe "OBJ_TAINTED" do
-  end
-
-  describe "OBJ_INFECT" do
-  end
-
   describe "rb_obj_freeze" do
     it "freezes the object passed to it" do
       obj = ""
@@ -701,9 +692,6 @@ def reach
     end
   end
 
-  describe "rb_obj_taint" do
-  end
-
   describe "rb_check_frozen" do
     it "raises a FrozenError if the obj is frozen" do
       -> { @o.rb_check_frozen("".freeze) }.should.raise(FrozenError)
diff --git a/security/cve_2018_16396_spec.rb b/security/cve_2018_16396_spec.rb
