Changeset 8235

Timestamp:

11/29/07 02:08:51 (9 months ago)

Author:

rick

Message:

Raise UnknownHttpMethod exception for unknown HTTP methods. Closes #10303 [tarmo]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/request.rb (modified) (4 diffs)
• trunk/actionpack/test/controller/request_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*2.0.0 [RC2]* (November 28th, 2007)
+
+* Raise UnknownHttpMethod exception for unknown HTTP methods. Closes #10303 [tarmo]
-
-* Update to Prototype -r8232.  [sam]

trunk/actionpack/lib/action_controller/base.rb

@@ -86 +86 @@
-  end
-
+  class UnknownHttpMethod < ActionControllerError #:nodoc:
+  end
-
-  # Action Controllers are the core of a web request in Rails. They are made up of one or more actions that are executed

trunk/actionpack/lib/action_controller/request.rb

@@ -4 +4 @@
-
-module ActionController
+  # HTTP methods which are accepted by default. 
+  ACCEPTED_HTTP_METHODS = Set.new(%w( get head put post delete ))
+
-  # CgiRequest and TestRequest provide concrete implementations.
-  class AbstractRequest
@@ -13 +16 @@
-    attr_reader :env
-
+    # The true HTTP request method as a lowercase symbol, such as :get.
+    # UnknownHttpMethod is raised for invalid methods not listed in ACCEPTED_HTTP_METHODS.
+    def request_method
+      @request_method ||= begin
+        method = ((@env['REQUEST_METHOD'] == 'POST' && !parameters[:_method].blank?) ? parameters[:_method].to_s : @env['REQUEST_METHOD']).downcase
+        if ACCEPTED_HTTP_METHODS.include?(method)
+          method.to_sym
+        else
+          raise UnknownHttpMethod, "#{method}, accepted HTTP methods are #{ACCEPTED_HTTP_METHODS.to_a.to_sentence}"
+        end
+      end
+    end
+
-    # The HTTP request method as a lowercase symbol, such as :get.
-    # Note, HEAD is returned as :get since the two are functionally
-    # equivalent from the application's perspective.
-    def method
-
-
-
-
-
-
-
-
+
-    end
-
@@ -34 +43 @@
-    # Is this a POST request?  Equivalent to request.method == :post
-    def post?
-
+request_
-    end
-
-    # Is this a PUT request?  Equivalent to request.method == :put
-    def put?
-
+request_
-    end
-
-    # Is this a DELETE request?  Equivalent to request.method == :delete
-    def delete?
-
+request_
-    end
-
@@ -50 +59 @@
-    # HTTP method directly.
-    def head?
-@env['REQUEST_METHOD'].downcase.to_sym
+request_method
-    end
-

trunk/actionpack/test/controller/request_test.rb

@@ -307 +307 @@
-  end
-
+  def test_invalid_http_method_raises_exception
+    set_request_method_to :random_method
+    assert_raises(ActionController::UnknownHttpMethod) do
+      @request.method
+    end
+  end
+
-  def test_allow_method_hacking_on_post
-    set_request_method_to :post
-pu
+head, :put, :pos
-      @request.instance_eval { @parameters = { :_method => method } ; @request_method = nil }
-
+
+
+
+
+
+
+
+
+
-    end
-  end