0
@@ -55,7 +55,31 @@ module ActionController
0
     #       end
0
     #   end
0
     # 
0
-    # 
0
+    # Simple Digest example. Note the block must return the user's password so the framework 
0
+    # can appropriately hash it to check the user's credentials. Returning nil will cause authentication to fail. 
0
+    #  
0
+    #   class PostsController < ApplicationController 
0
+    #     Users = {"dhh" => "secret"} 
0
+    #    
0
+    #     before_filter :authenticate, :except => [ :index ] 
0
+    #    
0
+    #     def index 
0
+    #       render :text => "Everyone can see me!" 
0
+    #     end 
0
+    #    
0
+    #     def edit 
0
+    #       render :text => "I'm only accessible if you know the password" 
0
+    #     end 
0
+    #    
0
+    #     private 
0
+    #       def authenticate 
0
+    #         authenticate_or_request_with_http_digest(realm) do |user_name|  
0
+    #           Users[user_name] 
0
+    #         end 
0
+    #       end 
0
+    #   end
0
+    #
0
+    #
0
     # In your integration tests, you can do something like this:
0
     # 
0
     #   def test_access_granted_from_xml
0
@@ -108,7 +132,10 @@ module ActionController
0
       end
0
     
0
       def decode_credentials(request)
0
-        ActiveSupport::Base64.decode64(authorization(request).split.last || '')
0
+        # Properly decode credentials spanning a new-line
0
+        auth = authorization(request)
0
+        auth.slice!('Basic ')
0
+        ActiveSupport::Base64.decode64(auth || '')
0
       end
0
 
0
       def encode_credentials(user_name, password)
0
@@ -120,5 +147,165 @@ module ActionController
0
         controller.__send__ :render, :text => "HTTP Basic: Access denied.\n", :status => :unauthorized
0
       end
0
     end
0
+    
0
+    module Digest
0
+      extend self
0
+    
0
+      module ControllerMethods
0
+        def authenticate_or_request_with_http_digest(realm = "Application", &password_procedure)
0
+          begin 
0
+            authenticate_with_http_digest!(realm, &password_procedure)
0
+          rescue ActionController::HttpAuthentication::Error => e
0
+            msg = e.message
0
+            msg = "#{msg} expected '#{e.expected}' was '#{e.was}'" unless e.expected.nil?
0
+            raise msg if e.fatal?
0
+            request_http_digest_authentication(realm, msg)
0
+          end
0
+        end
0
+
0
+        # Authenticate using HTTP Digest, throwing ActionController::HttpAuthentication::Error on failure.
0
+        # This allows more detailed analysis of authentication failures
0
+        # to be relayed to the client.
0
+        def authenticate_with_http_digest!(realm = "Application", &login_procedure)
0
+            HttpAuthentication::Digest.authenticate(self, realm, &login_procedure)
0
+        end
0
+
0
+        # Authenticate with HTTP Digest, returns true or false
0
+        def authenticate_with_http_digest(realm = "Application", &login_procedure)
0
+          HttpAuthentication::Digest.authenticate(self, realm, &login_procedure) rescue false
0
+        end
0
+
0
+        # Render output including the HTTP Digest authentication header
0
+        def request_http_digest_authentication(realm = "Application", message = nil)
0
+          HttpAuthentication::Digest.authentication_request(self, realm, message)
0
+        end
0
+        
0
+        # Add HTTP Digest authentication header to result headers
0
+        def http_digest_authentication_header(realm = "Application")
0
+          HttpAuthentication::Digest.authentication_header(self, realm)
0
+        end
0
+      end
0
+
0
+      # Raises error unless authentictaion succeeds, returns true otherwise
0
+      def authenticate(controller, realm, &password_procedure)
0
+        raise Error.new(false), "No authorization header found" unless authorization(controller.request)
0
+        validate_digest_response(controller, realm, &password_procedure)
0
+        true
0
+      end
0
+
0
+      def authorization(request)
0
+        request.env['HTTP_AUTHORIZATION']   ||
0
+        request.env['X-HTTP_AUTHORIZATION'] ||
0
+        request.env['X_HTTP_AUTHORIZATION'] ||
0
+        request.env['REDIRECT_X_HTTP_AUTHORIZATION']
0
+      end
0
+
0
+      # Raises error unless the request credentials response value matches the expected value.
0
+      def validate_digest_response(controller, realm, &password_procedure) 
0
+        credentials = decode_credentials(controller.request) 
0
+
0
+        # Check the nonce, opaque and realm.
0
+        # Ignore nc, as we have no way to validate the number of times this nonce has been used
0
+        validate_nonce(controller.request, credentials[:nonce])
0
+        raise Error.new(false, realm, credentials[:realm]), "Realm doesn't match" unless realm == credentials[:realm]
0
+        raise Error.new(true, opaque(controller.request), credentials[:opaque]),"Opaque doesn't match" unless opaque(controller.request) == credentials[:opaque]
0
+
0
+        password = password_procedure.call(credentials[:username])
0
+        raise Error.new(false), "No password" if password.nil?
0
+        expected = expected_response(controller.request.env['REQUEST_METHOD'], controller.request.url, credentials, password)
0
+        raise Error.new(false, expected, credentials[:response]), "Invalid response" unless expected == credentials[:response]
0
+      end 
0
+
0
+      # Returns the expected response for a request of +http_method+ to +uri+ with the decoded +credentials+ and the expected +password+ 
0
+      def expected_response(http_method, uri, credentials, password) 
0
+        ha1 = ::Digest::MD5.hexdigest([credentials[:username], credentials[:realm], password].join(':')) 
0
+        ha2 = ::Digest::MD5.hexdigest([http_method.to_s.upcase,uri].join(':')) 
0
+        ::Digest::MD5.hexdigest([ha1,credentials[:nonce], credentials[:nc], credentials[:cnonce],credentials[:qop],ha2].join(':')) 
0
+      end  
0
+
0
+      def encode_credentials(http_method, credentials, password) 
0
+        credentials[:response] = expected_response(http_method, credentials[:uri], credentials, password) 
0
+        "Digest " + credentials.sort_by {|x| x[0].to_s }.inject([]) {|a, v| a << "#{v[0]}='#{v[1]}'" }.join(', ') 
0
+      end 
0
+
0
+      def decode_credentials(request) 
0
+        authorization(request).to_s.gsub(/^Digest\s+/,'').split(',').inject({}) do |hash, pair| 
0
+          key, value = pair.split('=', 2) 
0
+          hash[key.strip.to_sym] = value.to_s.gsub(/^"|"$/,'').gsub(/'/, '') 
0
+          hash 
0
+        end 
0
+      end 
0
+
0
+      def authentication_header(controller, realm)
0
+        controller.headers["WWW-Authenticate"] = %(Digest realm="#{realm}", qop="auth", algorithm=MD5, nonce="#{nonce(controller.request)}", opaque="#{opaque(controller.request)}") 
0
+      end
0
+
0
+      def authentication_request(controller, realm, message = "HTTP Digest: Access denied")
0
+        authentication_header(controller, realm)
0
+        controller.send! :render, :text => message, :status => :unauthorized
0
+      end
0
+
0
+      # Uses an MD5 digest based on time to generate a value to be used only once.
0
+      #
0
+      # A server-specified data string which should be uniquely generated each time a 401 response is made.
0
+      # It is recommended that this string be base64 or hexadecimal data.
0
+      # Specifically, since the string is passed in the header lines as a quoted string, the double-quote character is not allowed.
0
+      #
0
+      # The contents of the nonce are implementation dependent.
0
+      # The quality of the implementation depends on a good choice.
0
+      # A nonce might, for example, be constructed as the base 64 encoding of
0
+      #
0
+      # => time-stamp H(time-stamp ":" ETag ":" private-key)
0
+      #
0
+      # where time-stamp is a server-generated time or other non-repeating value,
0
+      # ETag is the value of the HTTP ETag header associated with the requested entity,
0
+      # and private-key is data known only to the server.
0
+      # With a nonce of this form a server would recalculate the hash portion after receiving the client authentication header and
0
+      # reject the request if it did not match the nonce from that header or
0
+      # if the time-stamp value is not recent enough. In this way the server can limit the time of the nonce's validity.
0
+      # The inclusion of the ETag prevents a replay request for an updated version of the resource.
0
+      # (Note: including the IP address of the client in the nonce would appear to offer the server the ability
0
+      # to limit the reuse of the nonce to the same client that originally got it.
0
+      # However, that would break proxy farms, where requests from a single user often go through different proxies in the farm.
0
+      # Also, IP address spoofing is not that hard.)
0
+      #
0
+      # An implementation might choose not to accept a previously used nonce or a previously used digest, in order to
0
+      # protect against a replay attack. Or, an implementation might choose to use one-time nonces or digests for
0
+      # POST or PUT requests and a time-stamp for GET requests. For more details on the issues involved see Section 4
0
+      # of this document.
0
+      #
0
+      # The nonce is opaque to the client.
0
+      def nonce(request, time = Time.now)
0
+        session_id = request.is_a?(String) ? request : request.session.session_id
0
+        t = time.to_i
0
+        hashed = [t, session_id]
0
+        digest = ::Digest::MD5.hexdigest(hashed.join(":"))
0
+        Base64.encode64("#{t}:#{digest}").gsub("\n", '')
0
+      end
0
+
0
+      def validate_nonce(request, value)
0
+        t = Base64.decode64(value).split(":").first.to_i
0
+        raise Error.new(true), "Stale Nonce" if (t - Time.now.to_i).abs > 10 * 60
0
+        n = nonce(request, t)
0
+        raise Error.new(true, value, n), "Bad Nonce" unless n == value
0
+      end
0
+
0
+      # Opaque based on digest of session_id
0
+      def opaque(request)
0
+        session_id = request.is_a?(String) ? request : request.session.session_id
0
+        @opaque ||= Base64.encode64(::Digest::MD5::hexdigest(session_id)).gsub("\n", '')
0
+      end
0
+    end
0
+
0
+    class Error < RuntimeError
0
+      attr_accessor :expected, :was
0
+      def initialize(fatal = false, expected = nil, was = nil)
0
+        @fatal = fatal
0
+        @expected = expected
0
+        @was = was
0
+      end
0
+
0
+      def fatal?; @fatal; end
0
+    end
0
   end
0
 end

0
@@ -68,6 +68,15 @@ module ActionController
0
       # A running counter of the number of requests processed.
0
       attr_accessor :request_count
0
 
0
+      # Nonce value for Digest Authentication, implicitly set on response with WWW-Authentication
0
+      attr_accessor :nonce
0
+
0
+      # Opaque value for Digest Authentication, implicitly set on response with WWW-Authentication
0
+      attr_accessor :opaque
0
+
0
+      # Opaque value for Authentication, implicitly set on response with WWW-Authentication
0
+      attr_accessor :realm
0
+
0
       class MultiPartNeededException < Exception
0
       end
0
 
0
@@ -243,6 +252,53 @@ module ActionController
0
       end
0
       alias xhr :xml_http_request
0
 
0
+      def request_with_noauth(http_method, uri, parameters, headers) 
0
+        process_with_auth http_method, uri, parameters, headers
0
+      end 
0
+
0
+      # Performs a request with the given http_method and parameters, including HTTP Basic authorization headers. 
0
+      # See get() for more details on paramters and headers. 
0
+      # 
0
+      # You can perform GET, POST, PUT, DELETE, and HEAD requests with #get_with_basic, #post_with_basic, 
0
+      # #put_with_basic, #delete_with_basic, and #head_with_basic. 
0
+      def request_with_basic(http_method, uri, parameters, headers, user_name, password) 
0
+        process_with_auth http_method, uri, parameters, headers.merge(:authorization => ActionController::HttpAuthentication::Basic.encode_credentials(user_name, password)) 
0
+      end 
0
+
0
+      # Performs a request with the given http_method and parameters, including HTTP Digest authorization headers. 
0
+      # See get() for more details on paramters and headers. 
0
+      # 
0
+      # You can perform GET, POST, PUT, DELETE, and HEAD requests with #get_with_digest, #post_with_digest, 
0
+      # #put_with_digest, #delete_with_digest, and #head_with_digest. 
0
+      def request_with_digest(http_method, uri, parameters, headers, user_name, password) 
0
+        # Realm, Nonce, and Opaque taken from previoius 401 response
0
+        
0
+        credentials = {
0
+          :username => user_name,
0
+          :realm    => @realm,
0
+          :nonce    => @nonce,
0
+          :qop      => "auth",
0
+          :nc       => "00000001",
0
+          :cnonce   => "0a4f113b",
0
+          :opaque   => @opaque,
0
+          :uri      => uri
0
+        }
0
+        
0
+        raise "Digest request without previous 401 response" if @opaque.nil?
0
+ 
0
+        process_with_auth http_method, uri, parameters, headers.merge(:authorization => ActionController::HttpAuthentication::Digest.encode_credentials(http_method, credentials, password)) 
0
+      end 
0
+
0
+      # def get_with_basic, def post_with_basic, def put_with_basic, def delete_with_basic, def head_with_basic 
0
+      # def get_with_digest, def post_with_digest, def put_with_digest, def delete_with_digest, def head_with_digest 
0
+      [:get, :post, :put, :delete, :head].each do |method| 
0
+        [:noauth, :basic, :digest].each do |auth_type| 
0
+          define_method("#{method}_with_#{auth_type}") do |uri, parameters, headers, *auth| 
0
+            send("request_with_#{auth_type}", method, uri, parameters, headers, *auth) 
0
+          end 
0
+        end 
0
+      end
0
+
0
       # Returns the URL for the given options, according to the rules specified
0
       # in the application's routes.
0
       def url_for(options)
0
@@ -364,6 +420,32 @@ module ActionController
0
           return status
0
         end
0
 
0
+        # Same as process, but handles authentication returns to perform
0
+        # Basic or Digest authentication
0
+        def process_with_auth(method, path, parameters = nil, headers = nil)
0
+          status = process(method, path, parameters, headers)
0
+
0
+          if status == 401
0
+            # Extract authentication information from response
0
+            auth_data = @response.headers['WWW-Authenticate']
0
+            if /^Basic /.match(auth_data)
0
+              # extract realm, to be used in subsequent request
0
+              @realm = auth_header.split(' ')[1]
0
+            elsif /^Digest/.match(auth_data)
0
+              creds = auth_data.to_s.gsub(/^Digest\s+/,'').split(',').inject({}) do |hash, pair| 
0
+                key, value = pair.split('=', 2) 
0
+                hash[key.strip.to_sym] = value.to_s.gsub(/^"|"$/,'').gsub(/'/, '') 
0
+                hash 
0
+              end 
0
+              @realm = creds[:realm]
0
+              @nonce = creds[:nonce]
0
+              @opaque = creds[:opaque]
0
+            end
0
+          end
0
+
0
+          return status
0
+        end
0
+
0
         # Encode the cookies hash in a format suitable for passing to a
0
         # request.
0
         def encode_cookies

0
@@ -8,7 +8,25 @@ class SessionTest < Test::Unit::TestCase
0
   }
0
 
0
   def setup
0
+    @credentials = {
0
+      :username => "username",
0
+      :realm    => "MyApp",
0
+      :nonce    => ActionController::HttpAuthentication::Digest.nonce("session_id"),
0
+      :qop      => "auth",
0
+      :nc       => "00000001",
0
+      :cnonce   => "0a4f113b",
0
+      :opaque   => ActionController::HttpAuthentication::Digest.opaque("session_id"),
0
+      :uri      => "/index"
0
+    }
0
+
0
     @session = ActionController::Integration::Session.new(StubApp)
0
+    @session.nonce = @credentials[:nonce]
0
+    @session.opaque = @credentials[:opaque]
0
+    @session.realm = @credentials[:realm]
0
+  end
0
+
0
+  def encoded_credentials(method)
0
+    ActionController::HttpAuthentication::Digest.encode_credentials(method, @credentials, "password")
0
   end
0
 
0
   def test_https_bang_works_and_sets_truth_by_default
0
@@ -132,6 +150,76 @@ class SessionTest < Test::Unit::TestCase
0
     @session.head(path,params,headers)
0
   end
0
 
0
+  def test_get_with_basic 
0
+    path = "/index"; params = "blah"; headers = {:location => 'blah'} 
0
+    expected_headers = headers.merge(:authorization => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=\n")  
0
+    @session.expects(:process).with(:get,path,params,expected_headers) 
0
+    @session.get_with_basic(path,params,headers,'username','password') 
0
+  end 
0
+ 
0
+  def test_post_with_basic 
0
+    path = "/index"; params = "blah"; headers = {:location => 'blah'} 
0
+    expected_headers = headers.merge(:authorization => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=\n")  
0
+    @session.expects(:process).with(:post,path,params,expected_headers) 
0
+    @session.post_with_basic(path,params,headers,'username','password') 
0
+  end 
0
+ 
0
+  def test_put_with_basic 
0
+    path = "/index"; params = "blah"; headers = {:location => 'blah'} 
0
+    expected_headers = headers.merge(:authorization => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=\n")  
0
+    @session.expects(:process).with(:put,path,params,expected_headers) 
0
+    @session.put_with_basic(path,params,headers,'username','password') 
0
+  end 
0
+ 
0
+  def test_delete_with_basic 
0
+    path = "/index"; params = "blah"; headers = {:location => 'blah'} 
0
+    expected_headers = headers.merge(:authorization => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=\n")  
0
+    @session.expects(:process).with(:delete,path,params,expected_headers) 
0
+    @session.delete_with_basic(path,params,headers,'username','password') 
0
+  end 
0
+ 
0
+  def test_head_with_basic 
0
+    path = "/index"; params = "blah"; headers = {:location => 'blah'} 
0
+    expected_headers = headers.merge(:authorization => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=\n")  
0
+    @session.expects(:process).with(:head,path,params,expected_headers) 
0
+    @session.head_with_basic(path,params,headers,'username','password') 
0
+  end 
0
+ 
0
+  def test_get_with_digest 
0
+    path = "/index"; params = "blah"; headers = {:location => 'blah'} 
0
+    expected_headers = headers.merge(:authorization => encoded_credentials(:get))
0
+    @session.expects(:process).with(:get,path,params,expected_headers) 
0
+    @session.get_with_digest(path,params,headers,'username','password') 
0
+  end 
0
+ 
0
+  def test_post_with_digest 
0
+    path = "/index"; params = "blah"; headers = {:location => 'blah'} 
0
+    expected_headers = headers.merge(:authorization => encoded_credentials(:post))
0
+    @session.expects(:process).with(:post,path,params,expected_headers) 
0
+    @session.post_with_digest(path,params,headers,'username','password') 
0
+  end 
0
+ 
0
+  def test_put_with_digest 
0
+    path = "/index"; params = "blah"; headers = {:location => 'blah'} 
0
+    expected_headers = headers.merge(:authorization => encoded_credentials(:put)) 
0
+    @session.expects(:process).with(:put,path,params,expected_headers) 
0
+    @session.put_with_digest(path,params,headers,'username','password') 
0
+  end 
0
+ 
0
+  def test_delete_with_digest 
0
+    path = "/index"; params = "blah"; headers = {:location => 'blah'} 
0
+    expected_headers = headers.merge(:authorization => encoded_credentials(:delete))
0
+    @session.expects(:process).with(:delete,path,params,expected_headers) 
0
+    @session.delete_with_digest(path,params,headers,'username','password') 
0
+  end 
0
+ 
0
+  def test_head_with_digest 
0
+    path = "/index"; params = "blah"; headers = {:location => 'blah'} 
0
+    expected_headers = headers.merge(:authorization => encoded_credentials(:head)) 
0
+    @session.expects(:process).with(:head,path,params,expected_headers) 
0
+    @session.head_with_digest(path,params,headers,'username','password') 
0
+  end 
0
+
0
   def test_xml_http_request_get
0
     path = "/index"; params = "blah"; headers = {:location => 'blah'}
0
     headers_after_xhr = headers.merge(