Changes to make things appear to work in opal

Author: janbiedermann

lib/rack/auth/digest.rb

@@ -2,7 +2,7 @@
 
 require_relative 'abstract/handler'
 require_relative 'abstract/request'
-require 'digest/md5'
+# require 'digest/md5'
 require 'base64'
 
 module Rack

lib/rack/deflater.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "zlib"
+# require "zlib"
 require "time"  # for Time.httpdate
 
 require_relative 'constants'

lib/rack/etag.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'digest/sha2'
+# require 'digest/sha2'
 
 require_relative 'constants'
 require_relative 'utils'

lib/rack/lint.rb

@@ -316,9 +316,9 @@ def check_environment(env)
             raise LintError, "env variable #{key} has non-string value #{value.inspect}"
           end
           next if value.encoding == Encoding::ASCII_8BIT
-          unless value.b !~ /[\x80-\xff]/n
-            raise LintError, "env variable #{key} has value containing non-ASCII characters and has non-ASCII-8BIT encoding #{value.inspect} encoding: #{value.encoding}"
-          end
+          # unless value.b !~ /[\x80-\xff]/n
+          #   raise LintError, "env variable #{key} has value containing non-ASCII characters and has non-ASCII-8BIT encoding #{value.inspect} encoding: #{value.encoding}"
+          # end
         }
 
         ## There are the following restrictions:

lib/rack/mock_response.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cgi/cookie'
+# require 'cgi/cookie'
 require 'time'
 
 require_relative 'response'

lib/rack/multipart/parser.rb

@@ -388,7 +388,7 @@ def get_filename(head)
       end
 
       CHARSET = "charset"
-      deprecate_constant :CHARSET
+      # deprecate_constant :CHARSET
 
       def tag_multipart_encoding(filename, content_type, name, body)
         name = name.to_s

lib/rack/multipart/uploaded_file.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'tempfile'
+# require 'tempfile'
 require 'fileutils'
 
 module Rack

lib/rack/request.rb

@@ -45,17 +45,17 @@ class << self
 
     valid_ipv4_octet = /\.(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/
 
-    trusted_proxies = Regexp.union(
+    trusted_proxies = [
       /\A127#{valid_ipv4_octet}{3}\z/,                          # localhost IPv4 range 127.x.x.x, per RFC-3330
       /\A::1\z/,                                                # localhost IPv6 ::1
       /\Af[cd][0-9a-f]{2}(?::[0-9a-f]{0,4}){0,7}\z/i,           # private IPv6 range fc00 .. fdff
       /\A10#{valid_ipv4_octet}{3}\z/,                           # private IPv4 range 10.x.x.x
       /\A172\.(1[6-9]|2[0-9]|3[01])#{valid_ipv4_octet}{2}\z/,   # private IPv4 range 172.16.0.0 .. 172.31.255.255
       /\A192\.168#{valid_ipv4_octet}{2}\z/,                     # private IPv4 range 192.168.x.x
       /\Alocalhost\z|\Aunix(\z|:)/i,                            # localhost hostname, and unix domain sockets
-    )
+    ]
 
-    self.ip_filter = lambda { |ip| trusted_proxies.match?(ip) }
+    self.ip_filter = lambda { |ip| trusted_proxies.select { |tp| tp.match?(ip) }.any? }
 
     ALLOWED_SCHEMES = %w(https http wss ws).freeze
 
@@ -678,34 +678,31 @@ def split_header(value)
 
       # ipv6 extracted from resolv stdlib, simplified
       # to remove numbered match group creation.
-      ipv6 = Regexp.union(
-        /(?:[0-9A-Fa-f]{1,4}:){7}
-         [0-9A-Fa-f]{1,4}/x,
-        /(?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)? ::
-         (?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?/x,
-        /(?:[0-9A-Fa-f]{1,4}:){6,6}
-         \d+\.\d+\.\d+\.\d+/x,
-        /(?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)? ::
-         (?:[0-9A-Fa-f]{1,4}:)*
-         \d+\.\d+\.\d+\.\d+/x,
-        /[Ff][Ee]80
-         (?::[0-9A-Fa-f]{1,4}){7}
-         %[-0-9A-Za-z._~]+/x,
-        /[Ff][Ee]80:
-         (?:
-           (?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)? ::
-           (?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?
-           |
-           :(?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?
-         )?
-         :[0-9A-Fa-f]{1,4}%[-0-9A-Za-z._~]+/x)
+      # ipv6 = Regexp.union(
+      #   /(?:[0-9A-Fa-f]{1,4}:){7}
+      #    [0-9A-Fa-f]{1,4}/x,
+      #   /(?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)? ::
+      #    (?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?/x,
+      #   /(?:[0-9A-Fa-f]{1,4}:){6,6}
+      #    \d+\.\d+\.\d+\.\d+/x,
+      #   /(?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)? ::
+      #    (?:[0-9A-Fa-f]{1,4}:)*
+      #    \d+\.\d+\.\d+\.\d+/x,
+      #   /[Ff][Ee]80
+      #    (?::[0-9A-Fa-f]{1,4}){7}
+      #    %[-0-9A-Za-z._~]+/x,
+      #   /[Ff][Ee]80:
+      #    (?:
+      #      (?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)? ::
+      #      (?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?
+      #      |
+      #      :(?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?
+      #    )?
+      #    :[0-9A-Fa-f]{1,4}%[-0-9A-Za-z._~]+/x)
 
       AUTHORITY = /
         \A
         (?<host>
-          # Match IPv6 as a string of hex digits and colons in square brackets
-          \[(?<address>#{ipv6})\]
-          |
           # Match any other printable string (except square brackets) as a hostname
           (?<address>[[[:graph:]&&[^\[\]]]]*?)
         )

lib/rack/rewindable_input.rb

@@ -1,7 +1,7 @@
 # -*- encoding: binary -*-
 # frozen_string_literal: true
 
-require 'tempfile'
+# require 'tempfile'
 
 require_relative 'constants'
 

lib/rack/utils.rb

@@ -4,7 +4,7 @@
 require 'uri'
 require 'fileutils'
 require 'set'
-require 'tempfile'
+# require 'tempfile'
 require 'time'
 
 require_relative 'query_parser'