From ced9830d1e53b87afb633edd4d844d1c2aba0938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=B5=AB=E7=84=B6?= Date: Thu, 5 Sep 2024 17:53:43 +0800 Subject: [PATCH] Modify user agent and add timeout --- fileserver/utils/http.go | 8 +++++--- server/http-tx-mgr.c | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/fileserver/utils/http.go b/fileserver/utils/http.go index b1fe79c1..008d8678 100644 --- a/fileserver/utils/http.go +++ b/fileserver/utils/http.go @@ -6,10 +6,9 @@ import ( "io" "net/http" "strings" + "time" ) -var HttpReqContext, HttpReqCancel = context.WithCancel(context.Background()) - func GetAuthorizationToken(h http.Header) string { auth := h.Get("Authorization") splitResult := strings.Split(auth, " ") @@ -20,7 +19,10 @@ func GetAuthorizationToken(h http.Header) string { } func HttpCommon(method, url string, header map[string][]string, reader io.Reader) (int, []byte, error) { - req, err := http.NewRequestWithContext(HttpReqContext, method, url, reader) + header["Content-Type"] = []string{"application/json"} + ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) + defer cancel() + req, err := http.NewRequestWithContext(ctx, method, url, reader) if err != nil { return -1, nil, err } diff --git a/server/http-tx-mgr.c b/server/http-tx-mgr.c index 7cc6350a..e2de9a4a 100644 --- a/server/http-tx-mgr.c +++ b/server/http-tx-mgr.c @@ -365,7 +365,7 @@ http_post (Connection *conn, const char *url, const char *token, curl = conn->curl; - headers = curl_slist_append (headers, "User-Agent: Seafile/"SEAFILE_CLIENT_VERSION" ("USER_AGENT_OS")"); + headers = curl_slist_append (headers, "User-Agent: Seafile Server/"SEAFILE_CLIENT_VERSION" ("USER_AGENT_OS")"); if (token) { token_header = g_strdup_printf ("Authorization: Token %s", token); @@ -506,7 +506,7 @@ http_tx_manager_get_nickname (const char *modifier) json_decref (content); curl = conn->curl; - headers = curl_slist_append (headers, "User-Agent: Seafile/"SEAFILE_CLIENT_VERSION" ("USER_AGENT_OS")"); + headers = curl_slist_append (headers, "User-Agent: Seafile Server/"SEAFILE_CLIENT_VERSION" ("USER_AGENT_OS")"); token_header = g_strdup_printf ("Authorization: Token %s", jwt_token); headers = curl_slist_append (headers, token_header); headers = curl_slist_append (headers, "Content-Type: application/json"); @@ -608,16 +608,16 @@ http_tx_manager_query_share_link_info (const char *token, const char *cookie, co } curl = conn->curl; - headers = curl_slist_append (headers, "User-Agent: Seafile/"SEAFILE_CLIENT_VERSION" ("USER_AGENT_OS")"); + headers = curl_slist_append (headers, "User-Agent: Seafile Server/"SEAFILE_CLIENT_VERSION" ("USER_AGENT_OS")"); token_header = g_strdup_printf ("Authorization: Token %s", jwt_token); + headers = curl_slist_append (headers, token_header); + g_free (token_header); if (cookie) { cookie_header = g_strdup_printf ("Cookie: %s", cookie); headers = curl_slist_append (headers, cookie_header); g_free (cookie_header); } - headers = curl_slist_append (headers, token_header); headers = curl_slist_append (headers, "Content-Type: application/json"); - g_free (token_header); curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); url = g_strdup_printf("%s/check-share-link-access/?token=%s&type=%s", seaf->seahub_url, token, type);