Merge commit 'mainstream/master'

10 files changed, 86 insertions, 319 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 8c022e5625..f808bdd910 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -33,6 +33,7 @@ end
 
 gem 'rack', '>= 0.9.0'
 require 'rack'
+require 'action_controller/rack_ext'
 
 module ActionController
   # TODO: Review explicit to see if they will automatically be handled by
@@ -59,16 +60,14 @@ module ActionController
   autoload :MiddlewareStack, 'action_controller/middleware_stack'
   autoload :MimeResponds, 'action_controller/mime_responds'
   autoload :PolymorphicRoutes, 'action_controller/polymorphic_routes'
-  autoload :Request, 'action_controller/request'
-  autoload :RequestParser, 'action_controller/request_parser'
-  autoload :UrlEncodedPairParser, 'action_controller/url_encoded_pair_parser'
-  autoload :UploadedStringIO, 'action_controller/uploaded_file'
-  autoload :UploadedTempfile, 'action_controller/uploaded_file'
   autoload :RecordIdentifier, 'action_controller/record_identifier'
-  autoload :Response, 'action_controller/response'
+  autoload :Request, 'action_controller/request'
   autoload :RequestForgeryProtection, 'action_controller/request_forgery_protection'
+  autoload :RequestParser, 'action_controller/request_parser'
   autoload :Rescue, 'action_controller/rescue'
   autoload :Resources, 'action_controller/resources'
+  autoload :Response, 'action_controller/response'
+  autoload :RewindableInput, 'action_controller/rewindable_input'
   autoload :Routing, 'action_controller/routing'
   autoload :SessionManagement, 'action_controller/session_management'
   autoload :StatusCodes, 'action_controller/status_codes'
@@ -76,9 +75,11 @@ module ActionController
   autoload :TestCase, 'action_controller/test_case'
   autoload :TestProcess, 'action_controller/test_process'
   autoload :Translation, 'action_controller/translation'
+  autoload :UploadedStringIO, 'action_controller/uploaded_file'
+  autoload :UploadedTempfile, 'action_controller/uploaded_file'
+  autoload :UrlEncodedPairParser, 'action_controller/url_encoded_pair_parser'
   autoload :UrlRewriter, 'action_controller/url_rewriter'
   autoload :UrlWriter, 'action_controller/url_rewriter'
-  autoload :VerbPiggybacking, 'action_controller/verb_piggybacking'
   autoload :Verification, 'action_controller/verification'
 
   module Assertions
diff --git a/actionpack/lib/action_controller/http_authentication.rb b/actionpack/lib/action_controller/http_authentication.rb
index 3cb5829eca..2ed810db7d 100644
--- a/actionpack/lib/action_controller/http_authentication.rb
+++ b/actionpack/lib/action_controller/http_authentication.rb
@@ -55,31 +55,7 @@ module ActionController
     #       end
     #   end
     # 
-    # Simple Digest example. Note the block must return the user's password so the framework 
-    # can appropriately hash it to check the user's credentials. Returning nil will cause authentication to fail. 
-    #  
-    #   class PostsController < ApplicationController 
-    #     Users = {"dhh" => "secret"} 
-    #    
-    #     before_filter :authenticate, :except => [ :index ] 
-    #    
-    #     def index 
-    #       render :text => "Everyone can see me!" 
-    #     end 
-    #    
-    #     def edit 
-    #       render :text => "I'm only accessible if you know the password" 
-    #     end 
-    #    
-    #     private 
-    #       def authenticate 
-    #         authenticate_or_request_with_http_digest(realm) do |user_name|  
-    #           Users[user_name] 
-    #         end 
-    #       end 
-    #   end
-    #
-    #
+    # 
     # In your integration tests, you can do something like this:
     # 
     #   def test_access_granted_from_xml
@@ -132,10 +108,7 @@ module ActionController
       end
     
       def decode_credentials(request)
-        # Properly decode credentials spanning a new-line
-        auth = authorization(request)
-        auth.slice!('Basic ')
-        ActiveSupport::Base64.decode64(auth || '')
+        ActiveSupport::Base64.decode64(authorization(request).split.last || '')
       end
 
       def encode_credentials(user_name, password)
@@ -147,165 +120,5 @@ module ActionController
         controller.__send__ :render, :text => "HTTP Basic: Access denied.\n", :status => :unauthorized
       end
     end
-    
-    module Digest
-      extend self
-    
-      module ControllerMethods
-        def authenticate_or_request_with_http_digest(realm = "Application", &password_procedure)
-          begin 
-            authenticate_with_http_digest!(realm, &password_procedure)
-          rescue ActionController::HttpAuthentication::Error => e
-            msg = e.message
-            msg = "#{msg} expected '#{e.expected}' was '#{e.was}'" unless e.expected.nil?
-            raise msg if e.fatal?
-            request_http_digest_authentication(realm, msg)
-          end
-        end
-
-        # Authenticate using HTTP Digest, throwing ActionController::HttpAuthentication::Error on failure.
-        # This allows more detailed analysis of authentication failures
-        # to be relayed to the client.
-        def authenticate_with_http_digest!(realm = "Application", &login_procedure)
-            HttpAuthentication::Digest.authenticate(self, realm, &login_procedure)
-        end
-
-        # Authenticate with HTTP Digest, returns true or false
-        def authenticate_with_http_digest(realm = "Application", &login_procedure)
-          HttpAuthentication::Digest.authenticate(self, realm, &login_procedure) rescue false
-        end
-
-        # Render output including the HTTP Digest authentication header
-        def request_http_digest_authentication(realm = "Application", message = nil)
-          HttpAuthentication::Digest.authentication_request(self, realm, message)
-        end
-        
-        # Add HTTP Digest authentication header to result headers
-        def http_digest_authentication_header(realm = "Application")
-          HttpAuthentication::Digest.authentication_header(self, realm)
-        end
-      end
-
-      # Raises error unless authentictaion succeeds, returns true otherwise
-      def authenticate(controller, realm, &password_procedure)
-        raise Error.new(false), "No authorization header found" unless authorization(controller.request)
-        validate_digest_response(controller, realm, &password_procedure)
-        true
-      end
-
-      def authorization(request)
-        request.env['HTTP_AUTHORIZATION']   ||
-        request.env['X-HTTP_AUTHORIZATION'] ||
-        request.env['X_HTTP_AUTHORIZATION'] ||
-        request.env['REDIRECT_X_HTTP_AUTHORIZATION']
-      end
-
-      # Raises error unless the request credentials response value matches the expected value.
-      def validate_digest_response(controller, realm, &password_procedure) 
-        credentials = decode_credentials(controller.request) 
-
-        # Check the nonce, opaque and realm.
-        # Ignore nc, as we have no way to validate the number of times this nonce has been used
-        validate_nonce(controller.request, credentials[:nonce])
-        raise Error.new(false, realm, credentials[:realm]), "Realm doesn't match" unless realm == credentials[:realm]
-        raise Error.new(true, opaque(controller.request), credentials[:opaque]),"Opaque doesn't match" unless opaque(controller.request) == credentials[:opaque]
-
-        password = password_procedure.call(credentials[:username])
-        raise Error.new(false), "No password" if password.nil?
-        expected = expected_response(controller.request.env['REQUEST_METHOD'], controller.request.url, credentials, password)
-        raise Error.new(false, expected, credentials[:response]), "Invalid response" unless expected == credentials[:response]
-      end 
-
-      # Returns the expected response for a request of +http_method+ to +uri+ with the decoded +credentials+ and the expected +password+ 
-      def expected_response(http_method, uri, credentials, password) 
-        ha1 = ::Digest::MD5.hexdigest([credentials[:username], credentials[:realm], password].join(':')) 
-        ha2 = ::Digest::MD5.hexdigest([http_method.to_s.upcase,uri].join(':')) 
-        ::Digest::MD5.hexdigest([ha1,credentials[:nonce], credentials[:nc], credentials[:cnonce],credentials[:qop],ha2].join(':')) 
-      end  
-
-      def encode_credentials(http_method, credentials, password) 
-        credentials[:response] = expected_response(http_method, credentials[:uri], credentials, password) 
-        "Digest " + credentials.sort_by {|x| x[0].to_s }.inject([]) {|a, v| a << "#{v[0]}='#{v[1]}'" }.join(', ') 
-      end 
-
-      def decode_credentials(request) 
-        authorization(request).to_s.gsub(/^Digest\s+/,'').split(',').inject({}) do |hash, pair| 
-          key, value = pair.split('=', 2) 
-          hash[key.strip.to_sym] = value.to_s.gsub(/^"|"$/,'').gsub(/'/, '') 
-          hash 
-        end 
-      end 
-
-      def authentication_header(controller, realm)
-        controller.headers["WWW-Authenticate"] = %(Digest realm="#{realm}", qop="auth", algorithm=MD5, nonce="#{nonce(controller.request)}", opaque="#{opaque(controller.request)}") 
-      end
-
-      def authentication_request(controller, realm, message = "HTTP Digest: Access denied")
-        authentication_header(controller, realm)
-        controller.send! :render, :text => message, :status => :unauthorized
-      end
-
-      # Uses an MD5 digest based on time to generate a value to be used only once.
-      #
-      # A server-specified data string which should be uniquely generated each time a 401 response is made.
-      # It is recommended that this string be base64 or hexadecimal data.
-      # Specifically, since the string is passed in the header lines as a quoted string, the double-quote character is not allowed.
-      #
-      # The contents of the nonce are implementation dependent.
-      # The quality of the implementation depends on a good choice.
-      # A nonce might, for example, be constructed as the base 64 encoding of
-      #
-      # => time-stamp H(time-stamp ":" ETag ":" private-key)
-      #
-      # where time-stamp is a server-generated time or other non-repeating value,
-      # ETag is the value of the HTTP ETag header associated with the requested entity,
-      # and private-key is data known only to the server.
-      # With a nonce of this form a server would recalculate the hash portion after receiving the client authentication header and
-      # reject the request if it did not match the nonce from that header or
-      # if the time-stamp value is not recent enough. In this way the server can limit the time of the nonce's validity.
-      # The inclusion of the ETag prevents a replay request for an updated version of the resource.
-      # (Note: including the IP address of the client in the nonce would appear to offer the server the ability
-      # to limit the reuse of the nonce to the same client that originally got it.
-      # However, that would break proxy farms, where requests from a single user often go through different proxies in the farm.
-      # Also, IP address spoofing is not that hard.)
-      #
-      # An implementation might choose not to accept a previously used nonce or a previously used digest, in order to
-      # protect against a replay attack. Or, an implementation might choose to use one-time nonces or digests for
-      # POST or PUT requests and a time-stamp for GET requests. For more details on the issues involved see Section 4
-      # of this document.
-      #
-      # The nonce is opaque to the client.
-      def nonce(request, time = Time.now)
-        session_id = request.is_a?(String) ? request : request.session.session_id
-        t = time.to_i
-        hashed = [t, session_id]
-        digest = ::Digest::MD5.hexdigest(hashed.join(":"))
-        Base64.encode64("#{t}:#{digest}").gsub("\n", '')
-      end
-
-      def validate_nonce(request, value)
-        t = Base64.decode64(value).split(":").first.to_i
-        raise Error.new(true), "Stale Nonce" if (t - Time.now.to_i).abs > 10 * 60
-        n = nonce(request, t)
-        raise Error.new(true, value, n), "Bad Nonce" unless n == value
-      end
-
-      # Opaque based on digest of session_id
-      def opaque(request)
-        session_id = request.is_a?(String) ? request : request.session.session_id
-        @opaque ||= Base64.encode64(::Digest::MD5::hexdigest(session_id)).gsub("\n", '')
-      end
-    end
-
-    class Error < RuntimeError
-      attr_accessor :expected, :was
-      def initialize(fatal = false, expected = nil, was = nil)
-        @fatal = fatal
-        @expected = expected
-        @was = was
-      end
-
-      def fatal?; @fatal; end
-    end
   end
 end
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index ded72a71fb..163ba84a3e 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -2,17 +2,6 @@ require 'stringio'
 require 'uri'
 require 'active_support/test_case'
 
-# Monkey patch Rack::Lint to support rewind
-module Rack
-  class Lint
-    class InputWrapper
-      def rewind
-        @input.rewind
-      end
-    end
-  end
-end
-
 module ActionController
   module Integration #:nodoc:
     # An integration Session instance represents a set of requests and responses
@@ -68,15 +57,6 @@ module ActionController
       # A running counter of the number of requests processed.
       attr_accessor :request_count
 
-      # Nonce value for Digest Authentication, implicitly set on response with WWW-Authentication
-      attr_accessor :nonce
-
-      # Opaque value for Digest Authentication, implicitly set on response with WWW-Authentication
-      attr_accessor :opaque
-
-      # Opaque value for Authentication, implicitly set on response with WWW-Authentication
-      attr_accessor :realm
-
       class MultiPartNeededException < Exception
       end
 
@@ -252,53 +232,6 @@ module ActionController
       end
       alias xhr :xml_http_request
 
-      def request_with_noauth(http_method, uri, parameters, headers) 
-        process_with_auth http_method, uri, parameters, headers
-      end 
-
-      # Performs a request with the given http_method and parameters, including HTTP Basic authorization headers. 
-      # See get() for more details on paramters and headers. 
-      # 
-      # You can perform GET, POST, PUT, DELETE, and HEAD requests with #get_with_basic, #post_with_basic, 
-      # #put_with_basic, #delete_with_basic, and #head_with_basic. 
-      def request_with_basic(http_method, uri, parameters, headers, user_name, password) 
-        process_with_auth http_method, uri, parameters, headers.merge(:authorization => ActionController::HttpAuthentication::Basic.encode_credentials(user_name, password)) 
-      end 
-
-      # Performs a request with the given http_method and parameters, including HTTP Digest authorization headers. 
-      # See get() for more details on paramters and headers. 
-      # 
-      # You can perform GET, POST, PUT, DELETE, and HEAD requests with #get_with_digest, #post_with_digest, 
-      # #put_with_digest, #delete_with_digest, and #head_with_digest. 
-      def request_with_digest(http_method, uri, parameters, headers, user_name, password) 
-        # Realm, Nonce, and Opaque taken from previoius 401 response
-        
-        credentials = {
-          :username => user_name,
-          :realm    => @realm,
-          :nonce    => @nonce,
-          :qop      => "auth",
-          :nc       => "00000001",
-          :cnonce   => "0a4f113b",
-          :opaque   => @opaque,
-          :uri      => uri
-        }
-        
-        raise "Digest request without previous 401 response" if @opaque.nil?
- 
-        process_with_auth http_method, uri, parameters, headers.merge(:authorization => ActionController::HttpAuthentication::Digest.encode_credentials(http_method, credentials, password)) 
-      end 
-
-      # def get_with_basic, def post_with_basic, def put_with_basic, def delete_with_basic, def head_with_basic 
-      # def get_with_digest, def post_with_digest, def put_with_digest, def delete_with_digest, def head_with_digest 
-      [:get, :post, :put, :delete, :head].each do |method| 
-        [:noauth, :basic, :digest].each do |auth_type| 
-          define_method("#{method}_with_#{auth_type}") do |uri, parameters, headers, *auth| 
-            send("request_with_#{auth_type}", method, uri, parameters, headers, *auth) 
-          end 
-        end 
-      end
-
       # Returns the URL for the given options, according to the rules specified
       # in the application's routes.
       def url_for(options)
@@ -423,32 +356,6 @@ module ActionController
           return status
         end
 
-        # Same as process, but handles authentication returns to perform
-        # Basic or Digest authentication
-        def process_with_auth(method, path, parameters = nil, headers = nil)
-          status = process(method, path, parameters, headers)
-
-          if status == 401
-            # Extract authentication information from response
-            auth_data = @response.headers['WWW-Authenticate']
-            if /^Basic /.match(auth_data)
-              # extract realm, to be used in subsequent request
-              @realm = auth_header.split(' ')[1]
-            elsif /^Digest/.match(auth_data)
-              creds = auth_data.to_s.gsub(/^Digest\s+/,'').split(',').inject({}) do |hash, pair| 
-                key, value = pair.split('=', 2) 
-                hash[key.strip.to_sym] = value.to_s.gsub(/^"|"$/,'').gsub(/'/, '') 
-                hash 
-              end 
-              @realm = creds[:realm]
-              @nonce = creds[:nonce]
-              @opaque = creds[:opaque]
-            end
-          end
-
-          return status
-        end
-
         # Encode the cookies hash in a format suitable for passing to a
         # request.
         def encode_cookies
@@ -513,7 +420,7 @@ module ActionController
         def multipart_body(params, boundary)
           multipart_requestify(params).map do |key, value|
             if value.respond_to?(:original_filename)
-              File.open(value.path) do |f|
+              File.open(value.path, "rb") do |f|
                 f.set_encoding(Encoding::BINARY) if f.respond_to?(:set_encoding)
 
                 <<-EOF
diff --git a/actionpack/lib/action_controller/middleware_stack.rb b/actionpack/lib/action_controller/middleware_stack.rb
index 2bccba2ba1..b94bf6ec4a 100644
--- a/actionpack/lib/action_controller/middleware_stack.rb
+++ b/actionpack/lib/action_controller/middleware_stack.rb
@@ -32,6 +32,8 @@ module ActionController
         else
           @klass.to_s.constantize
         end
+      rescue NameError
+        @klass
       end
 
       def active?
diff --git a/actionpack/lib/action_controller/middlewares.rb b/actionpack/lib/action_controller/middlewares.rb
index 793739723f..0f038b8856 100644
--- a/actionpack/lib/action_controller/middlewares.rb
+++ b/actionpack/lib/action_controller/middlewares.rb
@@ -18,4 +18,5 @@ use "ActiveRecord::QueryCache", :if => lambda { defined?(ActiveRecord) }
     )
 end
 
-use ActionController::VerbPiggybacking
+use ActionController::RewindableInput
+use Rack::MethodOverride
diff --git a/actionpack/lib/action_controller/rack_ext.rb b/actionpack/lib/action_controller/rack_ext.rb
new file mode 100644
index 0000000000..3b142307e9
--- /dev/null
+++ b/actionpack/lib/action_controller/rack_ext.rb
@@ -0,0 +1,22 @@
+module Rack
+  module Utils
+    module Multipart
+      class << self
+        def parse_multipart_with_rewind(env)
+          result = parse_multipart_without_rewind(env)
+
+          begin
+            env['rack.input'].rewind if env['rack.input'].respond_to?(:rewind)
+          rescue Errno::ESPIPE
+            # Handles exceptions raised by input streams that cannot be rewound
+            # such as when using plain CGI under Apache
+          end
+
+          result
+        end
+
+        alias_method_chain :parse_multipart, :rewind
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/rewindable_input.rb b/actionpack/lib/action_controller/rewindable_input.rb
new file mode 100644
index 0000000000..058453ea68
--- /dev/null
+++ b/actionpack/lib/action_controller/rewindable_input.rb
@@ -0,0 +1,44 @@
+module ActionController
+  class RewindableInput
+    class RewindableIO < ActiveSupport::BasicObject
+      def initialize(io)
+        @io = io
+      end
+
+      def read(*args)
+        read_original_io
+        @io.read(*args)
+      end
+
+      def rewind
+        read_original_io
+        @io.rewind
+      end
+
+      def string
+        @string
+      end
+
+      def method_missing(method, *args, &block)
+        @io.send(method, *args, &block)
+      end
+
+      private
+        def read_original_io
+          unless @string
+            @string = @io.read
+            @io = StringIO.new(@string)
+          end
+        end
+    end
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      env['rack.input'] = RewindableIO.new(env['rack.input'])
+      @app.call(env)
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/session/cookie_store.rb b/actionpack/lib/action_controller/session/cookie_store.rb
index 135bedaf50..e061c4d4a1 100644
--- a/actionpack/lib/action_controller/session/cookie_store.rb
+++ b/actionpack/lib/action_controller/session/cookie_store.rb
@@ -163,9 +163,9 @@ module ActionController
 
         def ensure_session_key(key)
           if key.blank?
-            raise ArgumentError, 'A session_key is required to write a ' +
+            raise ArgumentError, 'A key is required to write a ' +
               'cookie containing the session data. Use ' +
-              'config.action_controller.session = { :session_key => ' +
+              'config.action_controller.session = { :key => ' +
               '"_myapp_session", :secret => "some secret phrase" } in ' +
               'config/environment.rb'
           end
@@ -181,7 +181,7 @@ module ActionController
           if secret.blank?
             raise ArgumentError, "A secret is required to generate an " +
               "integrity hash for cookie session data. Use " +
-              "config.action_controller.session = { :session_key => " +
+              "config.action_controller.session = { :key => " +
               "\"_myapp_session\", :secret => \"some secret phrase of at " +
               "least #{SECRET_MIN_LENGTH} characters\" } " +
               "in config/environment.rb"
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 8180d4ee93..22b97fc157 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -484,7 +484,8 @@ module ActionController #:nodoc:
     #
     #   post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png', :binary)
     def fixture_file_upload(path, mime_type = nil, binary = false)
-      ActionController::TestUploadedFile.new("#{ActionController::TestCase.try(:fixture_path)}#{path}", mime_type, binary)
+      fixture_path = ActionController::TestCase.send(:fixture_path) if ActionController::TestCase.respond_to?(:fixture_path)
+      ActionController::TestUploadedFile.new("#{fixture_path}#{path}", mime_type, binary)
     end
 
     # A helper to make it easier to test different route configurations.
diff --git a/actionpack/lib/action_controller/verb_piggybacking.rb b/actionpack/lib/action_controller/verb_piggybacking.rb
deleted file mode 100644
index 86cde304a0..0000000000
--- a/actionpack/lib/action_controller/verb_piggybacking.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module ActionController
-  # TODO: Use Rack::MethodOverride when it is released
-  class VerbPiggybacking
-    HTTP_METHODS = %w(GET HEAD PUT POST DELETE OPTIONS)
-
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      if env["REQUEST_METHOD"] == "POST"
-        req = Request.new(env)
-        if method = (req.parameters[:_method] || env["HTTP_X_HTTP_METHOD_OVERRIDE"])
-          method = method.to_s.upcase
-          if HTTP_METHODS.include?(method)
-            env["REQUEST_METHOD"] = method
-          end
-        end
-      end
-
-      @app.call(env)
-    end
-  end
-end