solve CORS problem

Signed-off-by: staylightblow8 <[email protected]>
liudf0716 · Dec 23, 2023 · a492cb1 · a492cb1
1 parent 7e338ee
commit a492cb1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -27,6 +27,7 @@ jobs:
           sudo apt-get install -y libevent-dev
           sudo apt-get install -y lua5.1 lua5.1-dev
           sudo apt-get install -y nftables
+          sudo apt-get install -y libnetfilter-queue-dev
 
     - name: install libubox
       run: |

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -79,7 +79,7 @@ endif()
 
 add_executable(wdctlx ${src_wdctlx})
 if(AW_FW3)
-	add_executable(wifidogx ${src_apfreewifidog} ${src_fw3})
+	add_executable(wifidogx ${src_apfreewifidog} ${src_fw3} ${src_dhcp})
 	target_link_libraries(wifidogx ${libs}  ${fw3_libs} ${CURL_LIBRARIES})
 else()
 	add_executable(wifidogx ${src_apfreewifidog} ${src_fw4} ${src_dhcp})

diff --git a/src/gateway.c b/src/gateway.c
@@ -455,6 +455,11 @@ http_redir_loop(s_config *config)
     http = evhttp_new(base);
     if (!http) termination_handler(0);
 
+	evhttp_set_allowed_methods(http,
+            EVHTTP_REQ_GET |
+            EVHTTP_REQ_POST |
+            EVHTTP_REQ_OPTIONS);
+
 	struct wd_request_context *request_ctx = wd_request_context_new(
         base, ssl, get_auth_server()->authserv_use_ssl);
 	if (!request_ctx) termination_handler(0);
@@ -465,7 +470,7 @@ http_redir_loop(s_config *config)
     //evhttp_set_cb(http, "/wifidog/status", ev_http_callback_status, NULL);
     evhttp_set_cb(http, "/wifidog/auth", ev_http_callback_auth, request_ctx);
     //evhttp_set_cb(http, "/wifidog/disconnect", ev_http_callback_disconnect, request_ctx);
-    //evhttp_set_cb(http, "/wifidog/temporary_pass", ev_http_callback_temporary_pass, NULL);
+    evhttp_set_cb(http, "/wifidog/temporary_pass", ev_http_callback_temporary_pass, NULL);
 
     evhttp_set_gencb(http, ev_http_callback_404, NULL);
 

diff --git a/src/http.c b/src/http.c
@@ -372,6 +372,14 @@ void
 ev_http_callback_auth(struct evhttp_request *req, void *arg)
 {
     struct wd_request_context *context = (struct wd_request_context *)arg;
+
+	evhttp_add_header(evhttp_request_get_output_headers(req), "Access-Control-Allow-Origin", "*");
+    evhttp_add_header(evhttp_request_get_output_headers(req), "Access-Control-Allow-Methods", "GET,POST,OPTIONS,DELETE,PUT");
+    if (evhttp_request_get_command(req) == EVHTTP_REQ_OPTIONS) {
+        evhttp_send_error(req, 204, "options success");
+        return;
+    }
+
     char *token = ev_http_find_query(req, "token");
     if (!token) {
         evhttp_send_error(req, 200, "Invalid token");
@@ -436,6 +444,9 @@ ev_http_callback_disconnect(struct evhttp_request *req, void *arg)
     const char *token = ev_http_find_query(req, "token");
     const char *mac = ev_http_find_query(req, "mac");
 
+	evhttp_add_header(evhttp_request_get_output_headers(req), "Access-Control-Allow-Origin", "*");
+    evhttp_add_header(evhttp_request_get_output_headers(req), "Access-Control-Allow-Methods", "GET,POST,OPTIONS,DELETE,PUT");
+
     if (!token || !mac) {
         debug(LOG_INFO, "Disconnect called without both token and MAC given");
         evhttp_send_error(req, HTTP_OK, "Both the token and MAC need to be specified");
@@ -464,7 +475,10 @@ void
 ev_http_callback_temporary_pass(struct evhttp_request *req, void *arg)
 {
     const char *mac = ev_http_find_query(req, "mac");
-
+
+	evhttp_add_header(evhttp_request_get_output_headers(req), "Access-Control-Allow-Origin", "*");
+    evhttp_add_header(evhttp_request_get_output_headers(req), "Access-Control-Allow-Methods", "GET,POST,OPTIONS,DELETE,PUT");
+
     if (mac) {
         debug(LOG_INFO, "Temporary passed %s", mac);
         fw_set_mac_temporary(mac, 0);	

diff --git a/src/ssl_redir.c b/src/ssl_redir.c
@@ -259,7 +259,11 @@ ssl_redirect_loop (char *gw_ip,  t_https_server *https_server) {
 		debug (LOG_ERR, "couldn't create evhttp. Exiting.\n");
       	exit(EXIT_FAILURE);
     }
-
+ 	evhttp_set_allowed_methods(http,
+            EVHTTP_REQ_GET |
+            EVHTTP_REQ_POST |
+            EVHTTP_REQ_OPTIONS);
+
  	SSL_CTX *ctx = SSL_CTX_new (SSLv23_server_method ());
   	SSL_CTX_set_options (ctx,
                        SSL_OP_SINGLE_DH_USE |