rack 1.2.8 → 1.3.0.beta

data/lib/rack/multipart/parser.rb

@@ -0,0 +1,164 @@
+require 'rack/utils'
+
+module Rack
+  module Multipart
+    class Parser
+      BUFSIZE = 16384
+
+      def initialize(env)
+        @env = env
+      end
+
+      def parse
+        return nil unless setup_parse
+
+        fast_forward_to_first_boundary
+
+        loop do
+          head, filename, content_type, name, body = 
+            get_current_head_and_filename_and_content_type_and_name_and_body
+
+          # Save the rest.
+          if i = @buf.index(rx)
+            body << @buf.slice!(0, i)
+            @buf.slice!(0, @boundary_size+2)
+
+            @content_length = -1  if $1 == "--"
+          end
+
+          filename, data = get_data(filename, body, content_type, name, head)
+
+          Utils.normalize_params(@params, name, data) unless data.nil?
+
+          # break if we're at the end of a buffer, but not if it is the end of a field
+          break if (@buf.empty? && $1 != EOL) || @content_length == -1
+        end
+
+        @io.rewind
+
+        @params
+      end
+
+      private
+      def setup_parse
+        return false unless @env['CONTENT_TYPE'] =~ MULTIPART
+
+        @boundary = "--#{$1}"
+
+        @buf = ""
+        @params = {}
+
+        @content_length = @env['CONTENT_LENGTH'].to_i
+        @io = @env['rack.input']
+        @io.rewind
+
+        @boundary_size = Utils.bytesize(@boundary) + EOL.size
+
+        @content_length -= @boundary_size
+        true
+      end
+
+      def full_boundary
+        @boundary + EOL
+      end
+
+      def rx
+        @rx ||= /(?:#{EOL})?#{Regexp.quote(@boundary)}(#{EOL}|--)/n
+      end
+
+      def fast_forward_to_first_boundary
+        loop do
+          read_buffer = @io.gets
+          break if read_buffer == full_boundary
+          raise EOFError, "bad content body" if read_buffer.nil?
+        end
+      end
+
+      def get_current_head_and_filename_and_content_type_and_name_and_body
+        head = nil
+        body = ''
+        filename = content_type = name = nil
+        content = nil
+
+        until head && @buf =~ rx
+          if !head && i = @buf.index(EOL+EOL)
+            head = @buf.slice!(0, i+2) # First \r\n
+
+            @buf.slice!(0, 2)          # Second \r\n
+
+            content_type = head[MULTIPART_CONTENT_TYPE, 1]
+            name = head[MULTIPART_CONTENT_DISPOSITION, 1] || head[MULTIPART_CONTENT_ID, 1]
+
+            filename = get_filename(head)
+
+            if filename
+              body = Tempfile.new("RackMultipart")
+              body.binmode  if body.respond_to?(:binmode)
+            end
+
+            next
+          end
+
+          # Save the read body part.
+          if head && (@boundary_size+4 < @buf.size)
+            body << @buf.slice!(0, @buf.size - (@boundary_size+4))
+          end
+
+          content = @io.read(BUFSIZE < @content_length ? BUFSIZE : @content_length)
+          raise EOFError, "bad content body"  if content.nil? || content.empty?
+
+          @buf << content
+          @content_length -= content.size
+        end
+
+        [head, filename, content_type, name, body]
+      end
+
+      def get_filename(head)
+        filename = nil
+        if head =~ RFC2183
+          filename = Hash[head.scan(DISPPARM)]['filename']
+          filename = $1 if filename and filename =~ /^"(.*)"$/
+        elsif head =~ BROKEN_QUOTED
+          filename = $1
+        elsif head =~ BROKEN_UNQUOTED
+          filename = $1
+        end
+
+        if filename && filename !~ /\\[^\\"]/
+          filename = Utils.unescape(filename).gsub(/\\(.)/, '\1')
+        end
+        filename
+      end
+
+      def get_data(filename, body, content_type, name, head)
+        data = nil
+        if filename == ""
+          # filename is blank which means no file has been selected
+          return data
+        elsif filename
+          body.rewind
+
+          # Take the basename of the upload's original filename.
+          # This handles the full Windows paths given by Internet Explorer
+          # (and perhaps other broken user agents) without affecting
+          # those which give the lone filename.
+          filename = filename.split(/[\/\\]/).last
+
+          data = {:filename => filename, :type => content_type,
+                  :name => name, :tempfile => body, :head => head}
+        elsif !filename && content_type && body.is_a?(IO)
+          body.rewind
+
+          # Generic multipart cases, not coming from a form
+          data = {:type => content_type,
+                  :name => name, :tempfile => body, :head => head}
+        else
+          data = body
+        end
+
+        [filename, data]
+      end
+    end
+  end
+end

data/lib/rack/multipart/uploaded_file.rb

@@ -0,0 +1,30 @@
+module Rack
+  module Multipart
+    class UploadedFile
+      # The filename, *not* including the path, of the "uploaded" file
+      attr_reader :original_filename
+
+      # The content type of the "uploaded" file
+      attr_accessor :content_type
+
+      def initialize(path, content_type = "text/plain", binary = false)
+        raise "#{path} file does not exist" unless ::File.exist?(path)
+        @content_type = content_type
+        @original_filename = ::File.basename(path)
+        @tempfile = Tempfile.new(@original_filename)
+        @tempfile.set_encoding(Encoding::BINARY) if @tempfile.respond_to?(:set_encoding)
+        @tempfile.binmode if binary
+        FileUtils.copy_file(path, @tempfile.path)
+      end
+
+      def path
+        @tempfile.path
+      end
+      alias_method :local_path, :path
+
+      def method_missing(method_name, *args, &block) #:nodoc:
+        @tempfile.__send__(method_name, *args, &block)
+      end
+    end
+  end
+end

data/lib/rack/request.rb

@@ -22,14 +22,17 @@ module Rack
     end
 
     def body;            @env["rack.input"]                       end
-    def scheme;          @env["rack.url_scheme"]                  end
     def script_name;     @env["SCRIPT_NAME"].to_s                 end
     def path_info;       @env["PATH_INFO"].to_s                   end
-    def port;            @env["SERVER_PORT"].to_i                 end
     def request_method;  @env["REQUEST_METHOD"]                   end
     def query_string;    @env["QUERY_STRING"].to_s                end
     def content_length;  @env['CONTENT_LENGTH']                   end
-    def content_type;    @env['CONTENT_TYPE']                     end
+
+    def content_type
+      content_type = @env['CONTENT_TYPE']
+      content_type.nil? || content_type.empty? ? nil : content_type
+    end
+
     def session;         @env['rack.session'] ||= {}              end
     def session_options; @env['rack.session.options'] ||= {}      end
     def logger;          @env['rack.logger']                      end
@@ -51,9 +54,9 @@ module Rack
     #   { 'charset' => 'utf-8' }
     def media_type_params
       return {} if content_type.nil?
-      content_type.split(/\s*[;,]\s*/)[1..-1].
+      Hash[*content_type.split(/\s*[;,]\s*/)[1..-1].
         collect { |s| s.split('=', 2) }.
-        inject({}) { |hash,(k,v)| hash[k.downcase] = v ; hash }
+        map { |k,v| [k.downcase, v] }.flatten]
     end
 
     # The character set of the request body if a "charset" media type
@@ -64,6 +67,22 @@ module Rack
       media_type_params['charset']
     end
 
+    def scheme
+      if @env['HTTPS'] == 'on'
+        'https'
+      elsif @env['HTTP_X_FORWARDED_SSL'] == 'on'
+        'https'
+      elsif @env['HTTP_X_FORWARDED_PROTO']
+        @env['HTTP_X_FORWARDED_PROTO'].split(',')[0]
+      else
+        @env["rack.url_scheme"]
+      end
+    end
+
+    def ssl?
+      scheme == 'https'
+    end
+
     def host_with_port
       if forwarded = @env["HTTP_X_FORWARDED_HOST"]
         forwarded.split(/,\s?/).last
@@ -72,6 +91,20 @@ module Rack
       end
     end
 
+    def port
+      if port = host_with_port.split(/:/)[1]
+        port.to_i
+      elsif port = @env['HTTP_X_FORWARDED_PORT']
+        port.to_i
+      elsif ssl?
+        443
+      elsif @env.has_key?("HTTP_X_FORWARDED_HOST")
+        80
+      else
+        @env["SERVER_PORT"].to_i
+      end
+    end
+
     def host
       # Remove port number.
       host_with_port.to_s.gsub(/:\d+\z/, '')
@@ -84,6 +117,7 @@ module Rack
     def get?;     request_method == "GET"     end
     def head?;    request_method == "HEAD"    end
     def options?; request_method == "OPTIONS" end
+    def patch?;   request_method == "PATCH"   end
     def post?;    request_method == "POST"    end
     def put?;     request_method == "PUT"     end
     def trace?;   request_method == "TRACE"   end
@@ -149,7 +183,8 @@ module Rack
           form_vars = @env["rack.input"].read
 
           # Fix for Safari Ajax postings that always append \0
-          form_vars.sub!(/\0\z/, '')
+          # form_vars.sub!(/\0\z/, '') # performance replacement:
+          form_vars.slice!(-1) if form_vars[-1] == ?\0
 
           @env["rack.request.form_vars"] = form_vars
           @env["rack.request.form_hash"] = parse_query(form_vars)
@@ -164,8 +199,8 @@ module Rack
 
     # The union of GET and POST data.
     def params
-      self.GET.update(self.POST)
-    rescue EOFError => e
+      @params ||= self.GET.merge(self.POST)
+    rescue EOFError
       self.GET
     end
 
@@ -184,9 +219,9 @@ module Rack
       keys.map{|key| params[key] }
     end
 
-    # the referer of the client or '/'
+    # the referer of the client
     def referer
-      @env['HTTP_REFERER'] || '/'
+      @env['HTTP_REFERER']
     end
     alias referrer referer
 
@@ -207,10 +242,9 @@ module Rack
         #   precede those with less specific.  Ordering with respect to other
         #   attributes (e.g., Domain) is unspecified.
         @env["rack.request.cookie_hash"] =
-          Utils.parse_query(@env["rack.request.cookie_string"], ';,').inject({}) {|h,(k,v)|
-            h[k] = Array === v ? v.first : v
-            h
-          }
+          Hash[*Utils.parse_query(@env["rack.request.cookie_string"], ';,').map {|k,v|
+            [k, Array === v ? v.first : v]
+          }.flatten]
       end
     end
 
@@ -218,8 +252,7 @@ module Rack
       @env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest"
     end
 
-    # Tries to return a remake of the original request URL as a string.
-    def url
+    def base_url
       url = scheme + "://"
       url << host
 
@@ -228,11 +261,14 @@ module Rack
         url << ":#{port}"
       end
 
-      url << fullpath
-
       url
     end
 
+    # Tries to return a remake of the original request URL as a string.
+    def url
+      base_url + fullpath
+    end
+
     def path
       script_name + path_info
     end
@@ -267,7 +303,7 @@ module Rack
       end
 
       def parse_multipart(env)
-        Utils::Multipart.parse_multipart(env)
+        Rack::Multipart.parse_multipart(env)
       end
   end
 end

data/lib/rack/response.rb

@@ -21,12 +21,13 @@ module Rack
 
     def initialize(body=[], status=200, header={}, &block)
       @status = status.to_i
-      @header = Utils::HeaderHash.new({"Content-Type" => "text/html"}.
-                                      merge(header))
+      @header = Utils::HeaderHash.new("Content-Type" => "text/html").
+                                      merge(header)
 
-      @writer = lambda { |x| @body << x }
-      @block = nil
-      @length = 0
+      @chunked = "chunked" == @header['Transfer-Encoding']
+      @writer  = lambda { |x| @body << x }
+      @block   = nil
+      @length  = 0
 
       @body = []
 
@@ -72,12 +73,14 @@ module Rack
 
       if [204, 304].include?(status.to_i)
         header.delete "Content-Type"
+        header.delete "Content-Length"
         [status.to_i, header, []]
       else
         [status.to_i, header, self]
       end
     end
     alias to_a finish           # For *response
+    alias to_ary finish         # For implicit-splat on Ruby 1.9.2
 
     def each(&callback)
       @body.each(&callback)
@@ -91,10 +94,10 @@ module Rack
     #
     def write(str)
       s = str.to_s
-      @length += Rack::Utils.bytesize(s)
+      @length += Rack::Utils.bytesize(s) unless @chunked
       @writer.call s
 
-      header["Content-Length"] = @length.to_s
+      header["Content-Length"] = @length.to_s unless @chunked
       str
     end
 
@@ -122,7 +125,6 @@ module Rack
       def not_found?;     @status == 404;                        end
 
       def redirect?;      [301, 302, 303, 307].include? @status; end
-      def empty?;         [201, 204, 304].include?      @status; end
 
       # Headers
       attr_reader :headers, :original_headers

data/lib/rack/sendfile.rb

@@ -1,11 +1,6 @@
 require 'rack/file'
 
 module Rack
-  class File #:nodoc:
-    unless instance_methods(false).include?('to_path')
-      alias :to_path :path
-    end
-  end
 
   # = Sendfile
   #
@@ -52,9 +47,10 @@ module Rack
   #   }
   #
   # Note that the X-Sendfile-Type header must be set exactly as shown above. The
-  # X-Accel-Mapping header should specify the internal URI path, followed by an
-  # equals sign (=), followed name of the location in the file system that it maps
-  # to. The middleware performs a simple substitution on the resulting path.
+  # X-Accel-Mapping header should specify the by the location on the file system,
+  # followed by an equals sign (=), followed name of the private URL pattern
+  # that it maps to. The middleware performs a simple substitution on the
+  # resulting path.
   #
   # See Also: http://wiki.codemongers.com/NginxXSendfile
   #
@@ -128,17 +124,17 @@ module Rack
     end
 
     private
-      def variation(env)
-        @variation ||
-          env['sendfile.type'] ||
-          env['HTTP_X_SENDFILE_TYPE']
-      end
+    def variation(env)
+      @variation ||
+        env['sendfile.type'] ||
+        env['HTTP_X_SENDFILE_TYPE']
+    end
 
-      def map_accel_path(env, file)
-        if mapping = env['HTTP_X_ACCEL_MAPPING']
-          internal, external = mapping.split('=', 2).map{ |p| p.strip }
-          file.sub(/^#{internal}/i, external)
-        end
+    def map_accel_path(env, file)
+      if mapping = env['HTTP_X_ACCEL_MAPPING']
+        internal, external = mapping.split('=', 2).map{ |p| p.strip }
+        file.sub(/^#{internal}/i, external)
       end
+    end
   end
 end