Use HTTP method from x-http-method-override header if present (#71)

Author: inklesspen

endpoints_management/control/service.py

@@ -70,6 +70,9 @@ def _load_from_well_known_env():
         "rules": [{
             "selector": "allow-all.GET",
             "get": "{x}"
+        }, {
+            "selector": "allow-all.PATCH",
+            "patch": "{x}"
         }, {
             "selector": "allow-all.POST",
             "post": "{x}"
@@ -79,6 +82,9 @@ def _load_from_well_known_env():
         "rules": [{
             "selector" : "allow-all.GET",
             "allowUnregisteredCalls" : true
+        }, {
+            "selector" : "allow-all.PATCH",
+            "allowUnregisteredCalls" : true
         }, {
             "selector" : "allow-all.POST",
             "allowUnregisteredCalls" : true

endpoints_management/control/wsgi.py

@@ -140,6 +140,10 @@ def _next_operation_uuid():
     return uuid.uuid4().hex
 
 
+def _request_method(environ):
+    return environ.get(u'HTTP_X_HTTP_METHOD_OVERRIDE', environ[u'REQUEST_METHOD'])
+
+
 class EnvironmentMiddleware(object):
     """A WSGI middleware that sets related variables in the environment.
 
@@ -193,7 +197,7 @@ def __call__(self, environ, start_response):
         environ[self.METHOD_REGISTRY] = self._method_registry
         environ[self.REPORTING_RULES] = self._reporting_rules
         parsed_uri = urlparse.urlparse(wsgiref.util.request_uri(environ))
-        http_method = environ.get(u'REQUEST_METHOD')
+        http_method = _request_method(environ)
         method_info = self._method_registry.lookup(http_method, parsed_uri.path)
         if method_info:
             environ[self.METHOD_INFO] = method_info
@@ -264,7 +268,7 @@ def __call__(self, environ, start_response):
         latency_timer.start()
 
         # Determine if the request can proceed
-        http_method = environ.get(u'REQUEST_METHOD')
+        http_method = _request_method(environ)
         parsed_uri = urlparse.urlparse(wsgiref.util.request_uri(environ))
         app_info = _AppInfo()
         # TODO: determine if any of the more complex ways of getting the request size

test/test_wsgi.py

@@ -59,6 +59,22 @@ def test_should_add_service_et_al_to_environment(self):
         expect(given.get(cls.REPORTING_RULES)).not_to(be_none)
         expect(given.get(cls.METHOD_INFO)).not_to(be_none)
 
+    def test_should_handle_method_override(self):
+        cls = wsgi.EnvironmentMiddleware
+        wrappee = _DummyWsgiApp()
+        wanted_service = service.Loaders.SIMPLE.load()
+        wrapped = cls(wrappee, wanted_service)
+
+        given = {
+            u'wsgi.url_scheme': u'http',
+            u'HTTP_HOST': u'localhost',
+            u'REQUEST_METHOD': u'POST',
+            u'HTTP_X_HTTP_METHOD_OVERRIDE': u'PATCH',
+        }
+
+        wrapped(given, _dummy_start_response)
+        assert given[cls.METHOD_INFO].selector == 'allow-all.PATCH'
+
 
 class TestMiddleware(unittest2.TestCase):
     PROJECT_ID = u'middleware'