Fix CORS for new HTTP PATCH method (#477)

* Fix CORS for new HTTP PATCH method, also fix HttpRequestImpl::appendToBuffer, to be able to send PATCH requests * Fix simple_example_test to work with updated CORS
drogonframework · Jun 15, 2020 · 2607f35 · 2607f35
1 parent fda6a44
commit 2607f35
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/examples/simple_example_test/main.cc b/examples/simple_example_test/main.cc
@@ -437,7 +437,7 @@ void doTest(const HttpClientPtr &client,
                                 // LOG_DEBUG << resp->getBody();
                                 auto allow = resp->getHeader("allow");
                                 if (resp->statusCode() == k200OK &&
-                                    allow == "GET,HEAD,POST,PUT,DELETE,OPTIONS")
+                                    allow == "GET,HEAD,POST,PUT,DELETE,OPTIONS,PATCH")
                                 {
                                     outputGood(req, isHttps);
                                 }

diff --git a/lib/src/HttpAppFrameworkImpl.cc b/lib/src/HttpAppFrameworkImpl.cc
@@ -739,7 +739,7 @@ void HttpAppFrameworkImpl::onAsyncRequest(
     {
         auto resp = HttpResponse::newHttpResponse();
         resp->setContentTypeCode(ContentType::CT_TEXT_PLAIN);
-        resp->addHeader("ALLOW", "GET,HEAD,POST,PUT,DELETE,OPTIONS");
+        resp->addHeader("ALLOW", "GET,HEAD,POST,PUT,DELETE,OPTIONS,PATCH");
         resp->setExpiredTime(0);
         callback(resp);
         return;

diff --git a/lib/src/HttpControllersRouter.cc b/lib/src/HttpControllersRouter.cc
@@ -644,6 +644,10 @@ void HttpControllersRouter::doPreHandlingAdvices(
         {
             methods.append("DELETE,");
         }
+        if (routerItem.binders_[Patch] && routerItem.binders_[Patch]->isCORS_)
+        {
+            methods.append("PATCH,");
+        }
         methods.resize(methods.length() - 1);
         resp->addHeader("ALLOW", methods);
         auto &origin = req->getHeader("Origin");

diff --git a/lib/src/HttpRequestImpl.cc b/lib/src/HttpRequestImpl.cc
@@ -177,6 +177,9 @@ void HttpRequestImpl::appendToBuffer(trantor::MsgBuffer *output) const
         case Options:
             output->append("OPTIONS ");
             break;
+        case Patch:
+            output->append("PATCH ");
+            break;
         default:
             return;
     }

diff --git a/lib/src/HttpSimpleControllersRouter.cc b/lib/src/HttpSimpleControllersRouter.cc
@@ -320,6 +320,10 @@ void HttpSimpleControllersRouter::doPreHandlingAdvices(
         {
             methods.append("DELETE,");
         }
+        if (routerItem.binders_[Patch] && routerItem.binders_[Patch]->isCORS_)
+        {
+            methods.append("PATCH,");
+        }
         methods.resize(methods.length() - 1);
         resp->addHeader("ALLOW", methods);
 

diff --git a/lib/src/WebsocketControllersRouter.cc b/lib/src/WebsocketControllersRouter.cc
@@ -265,6 +265,10 @@ void WebsocketControllersRouter::doControllerHandler(
         {
             methods.append("DELETE,");
         }
+        if (routerItem.binders_[Patch] && routerItem.binders_[Patch]->isCORS_)
+        {
+            methods.append("PATCH,");
+        }
         methods.resize(methods.length() - 1);
         resp->addHeader("ALLOW", methods);