[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: only add cors header for we
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: only add cors header for webext |
Date: |
Thu, 11 Jul 2019 17:03:55 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new d773004b4 only add cors header for webext
d773004b4 is described below
commit d773004b48c1c85c75a6298e32c09dec269d703f
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Jul 11 17:02:48 2019 +0200
only add cors header for webext
---
src/rest/gnunet-rest-server.c | 32 +++++++++++++++++++-------------
src/rest/rest.conf | 2 +-
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c
index c0db5430c..8154f33d8 100644
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@ -438,23 +438,27 @@ create_response (void *cls,
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Queueing response from plugin with MHD\n");
- //Handle Preflights
+ //Handle Preflights for extensions
if (GNUNET_YES == echo_origin)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Echoing origin\n");
- GNUNET_CRYPTO_hash ("origin",
- strlen ("origin"),
- &key);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Checking origin\n");
+ GNUNET_CRYPTO_hash ("origin", strlen ("origin"), &key);
origin = GNUNET_CONTAINER_multihashmap_get (con_handle->data_handle
->header_param_map,
&key);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Origin: %s\n", origin);
- if (NULL != origin)
- MHD_add_response_header (con_handle->response,
- MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
- origin);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Origin: %s\n", origin);
+ //Only echo for browser plugins
+ if ((0 ==
+ strcmp ("moz-extension://", origin, strlen ("moz-extension://"))) ||
+ (0 == strcmp ("chrome-extension://",
+ origin,
+ strlen ("chrome-extension://"))))
+ {
+ if (NULL != origin)
+ MHD_add_response_header (con_handle->response,
+ MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
+ origin);
+ }
}
if (NULL != allow_credentials)
{
@@ -868,7 +872,9 @@ run (void *cls,
/* Get CORS data from cfg */
echo_origin =
- GNUNET_CONFIGURATION_get_value_yesno (cfg, "rest", "REST_ECHO_ORIGIN");
+ GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "rest",
+ "REST_ECHO_ORIGIN_WEBEXT");
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
"rest",
diff --git a/src/rest/rest.conf b/src/rest/rest.conf
index 504f82a1b..08f4d2bc3 100644
--- a/src/rest/rest.conf
+++ b/src/rest/rest.conf
@@ -6,5 +6,5 @@ HTTP_PORT=7776
BIND_TO=127.0.0.1
BIND_TO6=::1
REST_ALLOW_HEADERS=Authorization,Accept,Content-Type
-REST_ECHO_ORIGIN=YES
+REST_ECHO_ORIGIN_WEBEXT=YES
REST_ALLOW_CREDENTIALS=true
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: only add cors header for webext,
gnunet <=