Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-05 09:35:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow CORS in JsonApiServer

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-09-25 22:33:35 +02:00
parent 8f17270a2a
commit f5158b3a9f
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libretroshare/src/jsonapi/jsonapi.cpp
View File

@ -40,6 +40,26 @@
/*extern*/ JsonApiServer* jsonApiServer = nullptr; /*extern*/ JsonApiServer* jsonApiServer = nullptr;
/*static*/ const std::multimap<std::string, std::string>
JsonApiServer::corsHeaders =
{
{ "Access-Control-Allow-Origin", "*" },
{ "Access-Control-Allow-Methods", "GET, POST, OPTIONS"},
{ "Access-Control-Allow-Headers", "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range" },
{ "Access-Control-Expose-Headers", "Content-Length,Content-Range" }
};
/*static*/ const std::multimap<std::string, std::string>
JsonApiServer::corsOptionsHeaders =
{
{ "Access-Control-Allow-Origin", "*" },
{ "Access-Control-Allow-Methods", "GET, POST, OPTIONS"},
{ "Access-Control-Allow-Headers", "DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range" },
{ "Access-Control-Max-Age", "1728000" }, // 20 days
{ "Content-Type", "text/plain; charset=utf-8" },
{ "Content-Length", "0" }
};
#define INITIALIZE_API_CALL_JSON_CONTEXT \ #define INITIALIZE_API_CALL_JSON_CONTEXT \
RsGenericSerializer::SerializeContext cReq( \ RsGenericSerializer::SerializeContext cReq( \
nullptr, 0, \ nullptr, 0, \
@ -65,15 +85,13 @@
std::stringstream ss; \ std::stringstream ss; \
ss << jAns; \ ss << jAns; \
std::string&& ans(ss.str()); \ std::string&& ans(ss.str()); \
const std::multimap<std::string, std::string> headers \ auto headers = corsHeaders; \
{ \ headers.insert({ "Content-Type", "text/json" }); \
{ "Content-Type", "text/json" }, \ headers.insert({ "Content-Length", std::to_string(ans.length()) }); \
{ "Content-Length", std::to_string(ans.length()) } \
}; \
session->close(RET_CODE, ans, headers) session->close(RET_CODE, ans, headers)
static bool checkRsServicePtrReady( /*static*/ bool JsonApiServer::checkRsServicePtrReady(
void* serviceInstance, const std::string& serviceName, void* serviceInstance, const std::string& serviceName,
RsGenericSerializer::SerializeContext& ctx, RsGenericSerializer::SerializeContext& ctx,
const std::shared_ptr<restbed::Session> session) const std::shared_ptr<restbed::Session> session)
@ -244,6 +262,7 @@ void JsonApiServer::registerHandler(
resource->set_path(path); resource->set_path(path);
resource->set_method_handler("GET", handler); resource->set_method_handler("GET", handler);
resource->set_method_handler("POST", handler); resource->set_method_handler("POST", handler);
resource->set_method_handler("OPTIONS", handleCorsOptions);
if(requiresAutentication) if(requiresAutentication)
resource->set_authentication_handler( resource->set_authentication_handler(
@ -407,3 +426,7 @@ bool JsonApiServer::loadList(std::list<RsItem*>& loadList)
void JsonApiServer::saveDone() { configMutex.unlock(); } void JsonApiServer::saveDone() { configMutex.unlock(); }
void JsonApiServer::handleCorsOptions(
const std::shared_ptr<restbed::Session> session )
{ session->close(rb::NO_CONTENT, corsOptionsHeaders); }

10
libretroshare/src/jsonapi/jsonapi.h
View File

@ -21,6 +21,7 @@
#include <memory> #include <memory>
#include <restbed> #include <restbed>
#include <cstdint> #include <cstdint>
#include <map>
#include "util/rsthreads.h" #include "util/rsthreads.h"
#include "pqi/p3cfgmgr.h" #include "pqi/p3cfgmgr.h"
@ -188,5 +189,14 @@ private:
/// Encrypted persistent storage for authorized JSON API tokens /// Encrypted persistent storage for authorized JSON API tokens
JsonApiServerAuthTokenStorage mAuthTokenStorage; JsonApiServerAuthTokenStorage mAuthTokenStorage;
RsMutex configMutex; RsMutex configMutex;
static const std::multimap<std::string, std::string> corsHeaders;
static const std::multimap<std::string, std::string> corsOptionsHeaders;
static void handleCorsOptions(const std::shared_ptr<rb::Session> session);
static bool checkRsServicePtrReady(
void* serviceInstance, const std::string& serviceName,
RsGenericSerializer::SerializeContext& ctx,
const std::shared_ptr<restbed::Session> session );
}; };