support cors

src/librssguard/network-web/apiserver.cpp

@@ -13,47 +13,62 @@ ApiServer::ApiServer(QObject* parent) : HttpServer(parent) {}
 
 void ApiServer::answerClient(QTcpSocket* socket, const HttpRequest& request) {
   QByteArray incoming_data = socket->readAll();
-  QByteArray output_data;
+  QByteArray reply_message;
 
-  QJsonParseError json_err;
+  if (request.m_method == HttpRequest::Method::Options) {
-  QJsonDocument incoming_doc = QJsonDocument::fromJson(incoming_data, &json_err);
+    reply_message = processCorsPreflight();
-
-  if (json_err.error != QJsonParseError::ParseError::NoError) {
-    output_data =
-      ApiResponse(ApiResponse::Result::Error, ApiRequest::Method::Unknown, QJsonValue(json_err.errorString()))
-        .toJson()
-        .toJson();
   }
   else {
-    ApiRequest req(incoming_doc);
+    QJsonParseError json_err;
+    QByteArray json_data;
+    QJsonDocument incoming_doc = QJsonDocument::fromJson(incoming_data, &json_err);
 
-    try {
+    if (json_err.error != QJsonParseError::ParseError::NoError) {
-      ApiResponse resp(processRequest(req));
+      json_data =
-
+        ApiResponse(ApiResponse::Result::Error, ApiRequest::Method::Unknown, QJsonValue(json_err.errorString()))
-      output_data = resp.toJson().toJson();
+          .toJson()
+          .toJson();
     }
-    catch (const ApplicationException& ex) {
+    else {
-      ApiResponse err_resp(ApiResponse::Result::Error, req.m_method, ex.message());
+      ApiRequest req(incoming_doc);
 
-      output_data = err_resp.toJson().toJson();
+      try {
+        ApiResponse resp(processRequest(req));
+
+        json_data = resp.toJson().toJson();
+      }
+      catch (const ApplicationException& ex) {
+        ApiResponse err_resp(ApiResponse::Result::Error, req.m_method, ex.message());
+
+        json_data = err_resp.toJson().toJson();
+      }
     }
+
+    reply_message = QSL("HTTP/1.0 200 OK \r\n"
+                        "Content-Type: application/json; charset=\"utf-8\"\r\n"
+                        "Content-Length: %1"
+                        "\r\n\r\n")
+                      .arg(QString::number(json_data.size()))
+                      .toLocal8Bit();
+
+    reply_message += json_data;
+
+    IOFactory::writeFile("a.out", json_data);
   }
 
-  QByteArray reply_message = QSL("HTTP/1.0 200 OK \r\n"
-                                 "Content-Type: application/json; charset=\"utf-8\"\r\n"
-                                 "Content-Length: %1"
-                                 "\r\n\r\n")
-                               .arg(QString::number(output_data.size()))
-                               .toLocal8Bit();
-
-  reply_message += output_data;
-
-  IOFactory::writeFile("a.out", output_data);
-
   socket->write(reply_message);
   socket->disconnectFromHost();
 }
 
+QByteArray ApiServer::processCorsPreflight() const {
+  QString answer = QSL("HTTP/1.0 204 No Content\r\n"
+                       "Access-Control-Allow-Origin: *\r\n"
+                       "Access-Control-Allow-Methods: POST, GET, OPTIONS, DELETE\r\n"
+                       "Access-Control-Max-Age: 86400");
+
+  return answer.toLocal8Bit();
+}
+
 ApiResponse ApiServer::processRequest(const ApiRequest& req) const {
   switch (req.m_method) {
     case ApiRequest::Method::AppVersion:

src/librssguard/network-web/apiserver.h

@@ -48,6 +48,7 @@ class ApiServer : public HttpServer {
     virtual void answerClient(QTcpSocket* socket, const HttpRequest& request);
 
   private:
+    QByteArray processCorsPreflight() const;
     ApiResponse processRequest(const ApiRequest& req) const;
     ApiResponse processAppVersion() const;
     ApiResponse processArticlesFromFeed(const QJsonValue& req) const;

src/librssguard/network-web/httpserver.cpp

@@ -136,7 +136,7 @@ bool HttpServer::HttpRequest::readMethod(QTcpSocket* socket) {
   while ((socket->bytesAvailable() != 0) && !finished) {
     const auto c = socket->read(1).at(0);
 
-    if ((std::isupper(c) != 0) && m_fragment.size() < 6) {
+    if ((std::isupper(c) != 0) && m_fragment.size() < 7) {
       m_fragment += c;
     }
     else {
@@ -160,6 +160,9 @@ bool HttpServer::HttpRequest::readMethod(QTcpSocket* socket) {
     else if (m_fragment == "DELETE") {
       m_method = Method::Delete;
     }
+    else if (m_fragment == "OPTIONS") {
+      m_method = Method::Options;
+    }
     else {
       qWarningNN << LOGSEC_NETWORK << "Invalid operation:" << QUOTE_W_SPACE_DOT(m_fragment.data());
     }

src/librssguard/network-web/httpserver.h

@@ -57,6 +57,7 @@ class HttpServer : public QObject {
           Put,
           Post,
           Delete,
+          Options
         } m_method = Method::Unknown;
 
         QString m_address;