haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-01 15:36:37 +00:00
Code Issues Releases Wiki Activity

Use Authorization header (#675)

Browse Source 
Co-authored-by: 杨赫然 <heran.yang@seafile.com>
This commit is contained in:
feiniks
2024-08-01 11:25:31 +08:00
committed by GitHub
parent 77fa08566b
commit a535c64d13
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/seaf-utils.c
View File

@@ -439,8 +439,10 @@ load_seahub_private_key (SeafileSession *session, const char *conf_dir)
} }
out: out:
g_regex_unref (secret_key_regex); if (secret_key_regex)
g_regex_unref (site_root_regex); g_regex_unref (secret_key_regex);
if (site_root_regex)
g_regex_unref (site_root_regex);
g_free (conf_path); g_free (conf_path);
g_free (data); g_free (data);
} }

11
notification-server/server.go
View File

@@ -282,7 +282,7 @@ func messageCB(rsp http.ResponseWriter, r *http.Request) *appError {
func eventCB(rsp http.ResponseWriter, r *http.Request) *appError { func eventCB(rsp http.ResponseWriter, r *http.Request) *appError {
msg := Message{} msg := Message{}
token := r.Header.Get("Seafile-Repo-Token") token := getAuthorizationToken(r.Header)
if !checkAuthToken(token) { if !checkAuthToken(token) {
return &appError{Error: nil, return &appError{Error: nil,
Message: "Notification token not match", Message: "Notification token not match",
@@ -310,6 +310,15 @@ func eventCB(rsp http.ResponseWriter, r *http.Request) *appError {
return nil return nil
} }
func getAuthorizationToken(h http.Header) string {
auth := h.Get("Authorization")
splitResult := strings.Split(auth, " ")
if len(splitResult) > 1 {
return splitResult[1]
}
return ""
}
func checkAuthToken(tokenString string) bool { func checkAuthToken(tokenString string) bool {
if len(tokenString) == 0 { if len(tokenString) == 0 {
return false return false

2
server/http-tx-mgr.c
View File

@@ -384,7 +384,7 @@ http_post (Connection *conn, const char *url, const char *token,
headers = curl_slist_append (headers, "User-Agent: Seafile/"SEAFILE_CLIENT_VERSION" ("USER_AGENT_OS")"); headers = curl_slist_append (headers, "User-Agent: Seafile/"SEAFILE_CLIENT_VERSION" ("USER_AGENT_OS")");
if (token) { if (token) {
token_header = g_strdup_printf ("Seafile-Repo-Token: %s", token); token_header = g_strdup_printf ("Authorization: Token %s", token);
headers = curl_slist_append (headers, token_header); headers = curl_slist_append (headers, token_header);
g_free (token_header); g_free (token_header);
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);