cgi 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ace24be8534275d31cbc0f26323f6240fe2bad4e848a0bf299ab0c7b3ef4f23c
-  data.tar.gz: d2e454f42196b2bda9a5923014d4d067a3429d414c1c9445fed80fc4a7cc0773
+  metadata.gz: c6b7b44043961650520d8b04fb0df56f62e3d34a0f033339272005a61d968000
+  data.tar.gz: ac6cd96b5782920f33d41405fa5a93d91e69327ff97d40498b2d930ca9bf2484
 SHA512:
-  metadata.gz: edaff93f2331fb886bdbd1dd5a03b1a53ae07af4d42136cf8852ab717aa4d458a96fe459ba07869072e0d580aa083ae8ac47fac5aea0cabc2a347afbf38ac4db
-  data.tar.gz: 0fa14edc91fe176241d0efc71bd4dfd834135f093507cb2b2410934f469bd19a4538664651a86aa9fc2ae035e7efd6a159cf1752beffef01d57327cab4d76500
+  metadata.gz: e6b18bbd30338184d2c6ce9a5405d57c1de7b72cf6969a0735ab2dade5138741dc0d427592f02d33be062a30b23936714ab70a911ee668f0aa4c13ca4093ac38
+  data.tar.gz: cc0a96e60bb0dfb4a9876ba284b2d3941548e7d3a3e13583bfd777e7cb56abbc7493f2f691ab30b0f7ef0d6ce97e2fd52ee0f071a61b77e0a2ac71632ab9c6f3

data/.github/workflows/test.yml

@@ -7,18 +7,16 @@ jobs:
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ 2.7, 2.6, 2.5, head ]
+        ruby: [ '3.0', 2.7, 2.6, 2.5, head ]
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
-      run: |
-        gem install bundler --no-document
-        bundle install
+      run: bundle install
     - name: Run test
       run: rake test

data/Rakefile

@@ -10,4 +10,11 @@ end
 require 'rake/extensiontask'
 Rake::ExtensionTask.new("cgi/escape")
 
+task :sync_tool do
+  require 'fileutils'
+  FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
+end
+
 task :default => :test

data/cgi.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
     `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.executables   = []
   spec.require_paths = ["lib"]
 end

data/ext/cgi/escape/escape.c

@@ -36,8 +36,7 @@ static VALUE
 optimized_escape_html(VALUE str)
 {
     VALUE vbuf;
-    typedef char escape_buf[HTML_ESCAPE_MAX_LEN];
-    char *buf = *ALLOCV_N(escape_buf, vbuf, RSTRING_LEN(str));
+    char *buf = ALLOCV_N(char, vbuf, RSTRING_LEN(str) * HTML_ESCAPE_MAX_LEN);
     const char *cstr = RSTRING_PTR(str);
     const char *end = cstr + RSTRING_LEN(str);
 

data/lib/cgi/cookie.rb

@@ -40,10 +40,6 @@ class CGI
   class Cookie < Array
     @@accept_charset="UTF-8" unless defined?(@@accept_charset)
 
-    TOKEN_RE = %r"\A[[!-~]&&[^()<>@,;:\\\"/?=\[\]{}]]+\z"
-    PATH_VALUE_RE = %r"\A[[ -~]&&[^;]]*\z"
-    DOMAIN_VALUE_RE = %r"\A(?<label>(?!-)[-A-Za-z0-9]+(?<!-))(?:\.\g<label>)*\z"
-
     # Create a new CGI::Cookie object.
     #
     # :call-seq:
@@ -76,8 +72,8 @@ class CGI
       @domain = nil
       @expires = nil
       if name.kind_of?(String)
-        self.name = name
-        self.path = (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
+        @name = name
+        @path = (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
         @secure = false
         @httponly = false
         return super(value)
@@ -88,11 +84,11 @@ class CGI
         raise ArgumentError, "`name' required"
       end
 
-      self.name = options["name"]
+      @name = options["name"]
       value = Array(options["value"])
       # simple support for IE
-      self.path = options["path"] || (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
-      self.domain = options["domain"]
+      @path = options["path"] || (%r|\A(.*/)| =~ ENV["SCRIPT_NAME"] ? $1 : "")
+      @domain = options["domain"]
       @expires = options["expires"]
       @secure = options["secure"] == true
       @httponly = options["httponly"] == true
@@ -101,35 +97,11 @@ class CGI
     end
 
     # Name of this cookie, as a +String+
-    attr_reader :name
-    # Set name of this cookie
-    def name=(str)
-      if str and !TOKEN_RE.match?(str)
-        raise ArgumentError, "invalid name: #{str.dump}"
-      end
-      @name = str
-    end
-
+    attr_accessor :name
     # Path for which this cookie applies, as a +String+
-    attr_reader :path
-    # Set path for which this cookie applies
-    def path=(str)
-      if str and !PATH_VALUE_RE.match?(str)
-        raise ArgumentError, "invalid path: #{str.dump}"
-      end
-      @path = str
-    end
-
+    attr_accessor :path
     # Domain for which this cookie applies, as a +String+
-    attr_reader :domain
-    # Set domain for which this cookie applies
-    def domain=(str)
-      if str and ((str = str.b).bytesize > 255 or !DOMAIN_VALUE_RE.match?(str))
-        raise ArgumentError, "invalid domain: #{str.dump}"
-      end
-      @domain = str
-    end
-
+    attr_accessor :domain
     # Time at which this cookie expires, as a +Time+
     attr_accessor :expires
     # True if this cookie is secure; false otherwise
@@ -187,6 +159,7 @@ class CGI
       raw_cookie.split(/;\s?/).each do |pairs|
         name, values = pairs.split('=',2)
         next unless name and values
+        name = CGI.unescape(name)
         values ||= ""
         values = values.split('&').collect{|v| CGI.unescape(v,@@accept_charset) }
         if cookies.has_key?(name)

data/lib/cgi/core.rb

@@ -188,28 +188,17 @@ class CGI
   # Using #header with the HTML5 tag maker will create a <header> element.
   alias :header :http_header
 
-  def _no_crlf_check(str)
-    if str
-      str = str.to_s
-      raise "A HTTP status or header field must not include CR and LF" if str =~ /[\r\n]/
-      str
-    else
-      nil
-    end
-  end
-  private :_no_crlf_check
-
   def _header_for_string(content_type) #:nodoc:
     buf = ''.dup
     if nph?()
-      buf << "#{_no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) || 'HTTP/1.0'} 200 OK#{EOL}"
+      buf << "#{$CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'} 200 OK#{EOL}"
       buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
-      buf << "Server: #{_no_crlf_check($CGI_ENV['SERVER_SOFTWARE'])}#{EOL}"
+      buf << "Server: #{$CGI_ENV['SERVER_SOFTWARE']}#{EOL}"
       buf << "Connection: close#{EOL}"
     end
-    buf << "Content-Type: #{_no_crlf_check(content_type)}#{EOL}"
+    buf << "Content-Type: #{content_type}#{EOL}"
     if @output_cookies
-      @output_cookies.each {|cookie| buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}" }
+      @output_cookies.each {|cookie| buf << "Set-Cookie: #{cookie}#{EOL}" }
     end
     return buf
   end # _header_for_string
@@ -224,9 +213,9 @@ class CGI
     ## NPH
     options.delete('nph') if defined?(MOD_RUBY)
     if options.delete('nph') || nph?()
-      protocol = _no_crlf_check($CGI_ENV['SERVER_PROTOCOL']) || 'HTTP/1.0'
+      protocol = $CGI_ENV['SERVER_PROTOCOL'] || 'HTTP/1.0'
       status = options.delete('status')
-      status = HTTP_STATUS[status] || _no_crlf_check(status) || '200 OK'
+      status = HTTP_STATUS[status] || status || '200 OK'
       buf << "#{protocol} #{status}#{EOL}"
       buf << "Date: #{CGI.rfc1123_date(Time.now)}#{EOL}"
       options['server'] ||= $CGI_ENV['SERVER_SOFTWARE'] || ''
@@ -234,38 +223,38 @@ class CGI
     end
     ## common headers
     status = options.delete('status')
-    buf << "Status: #{HTTP_STATUS[status] || _no_crlf_check(status)}#{EOL}" if status
+    buf << "Status: #{HTTP_STATUS[status] || status}#{EOL}" if status
     server = options.delete('server')
-    buf << "Server: #{_no_crlf_check(server)}#{EOL}" if server
+    buf << "Server: #{server}#{EOL}" if server
     connection = options.delete('connection')
-    buf << "Connection: #{_no_crlf_check(connection)}#{EOL}" if connection
+    buf << "Connection: #{connection}#{EOL}" if connection
     type = options.delete('type')
-    buf << "Content-Type: #{_no_crlf_check(type)}#{EOL}" #if type
+    buf << "Content-Type: #{type}#{EOL}" #if type
     length = options.delete('length')
-    buf << "Content-Length: #{_no_crlf_check(length)}#{EOL}" if length
+    buf << "Content-Length: #{length}#{EOL}" if length
     language = options.delete('language')
-    buf << "Content-Language: #{_no_crlf_check(language)}#{EOL}" if language
+    buf << "Content-Language: #{language}#{EOL}" if language
     expires = options.delete('expires')
     buf << "Expires: #{CGI.rfc1123_date(expires)}#{EOL}" if expires
     ## cookie
     if cookie = options.delete('cookie')
       case cookie
       when String, Cookie
-        buf << "Set-Cookie: #{_no_crlf_check(cookie)}#{EOL}"
+        buf << "Set-Cookie: #{cookie}#{EOL}"
       when Array
         arr = cookie
-        arr.each {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
+        arr.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
       when Hash
         hash = cookie
-        hash.each_value {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
+        hash.each_value {|c| buf << "Set-Cookie: #{c}#{EOL}" }
       end
     end
     if @output_cookies
-      @output_cookies.each {|c| buf << "Set-Cookie: #{_no_crlf_check(c)}#{EOL}" }
+      @output_cookies.each {|c| buf << "Set-Cookie: #{c}#{EOL}" }
     end
     ## other headers
     options.each do |key, value|
-      buf << "#{_no_crlf_check(key)}: #{_no_crlf_check(value)}#{EOL}"
+      buf << "#{key}: #{value}#{EOL}"
     end
     return buf
   end # _header_for_hash

data/lib/cgi/util.rb

@@ -49,9 +49,12 @@ module CGI::Util
       table = Hash[TABLE_FOR_ESCAPE_HTML__.map {|pair|pair.map {|s|s.encode(enc)}}]
       string = string.gsub(/#{"['&\"<>]".encode(enc)}/, table)
       string.encode!(origenc) if origenc
-      return string
+      string
+    else
+      string = string.b
+      string.gsub!(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+      string.force_encoding(enc)
     end
-    string.gsub(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
   end
 
   begin
@@ -90,7 +93,8 @@ module CGI::Util
                 when Encoding::ISO_8859_1; 256
                 else 128
                 end
-    string.gsub(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#[xX][0-9A-Fa-f]+);/) do
+    string = string.b
+    string.gsub!(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#[xX][0-9A-Fa-f]+);/) do
       match = $1.dup
       case match
       when 'apos'                then "'"
@@ -116,6 +120,7 @@ module CGI::Util
         "&#{match};"
       end
     end
+    string.force_encoding enc
   end
 
   # Synonym for CGI.escapeHTML(str)
@@ -174,21 +179,12 @@ module CGI::Util
   # Synonym for CGI.unescapeElement(str)
   alias unescape_element unescapeElement
 
-  # Abbreviated day-of-week names specified by RFC 822
-  RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ]
-
-  # Abbreviated month names specified by RFC 822
-  RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ]
-
   # Format a +Time+ object as a String using the format specified by RFC 1123.
   #
   #   CGI.rfc1123_date(Time.now)
   #     # Sat, 01 Jan 2000 00:00:00 GMT
   def rfc1123_date(time)
-    t = time.clone.gmtime
-    return format("%s, %.2d %s %.4d %.2d:%.2d:%.2d GMT",
-                  RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year,
-                  t.hour, t.min, t.sec)
+    time.getgm.strftime("%a, %d %b %Y %T GMT")
   end
 
   # Prettify (indent) an HTML string.

data/lib/cgi.rb

@@ -288,7 +288,7 @@
 #
 
 class CGI
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end
 
 require 'cgi/core'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cgi
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Yukihiro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies: []
 description: Support for the Common Gateway Interface protocol.
 email:
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: Support for the Common Gateway Interface protocol.