Add upload link and download link API #683

feiniks · 2024-08-16T02:31:58Z

No description provided.

killing · 2024-08-29T03:05:25Z

server/access-file.c

@@ -1170,13 +1169,13 @@ access_zip_cb (evhtp_request_t *req, void *arg)
    int error_code;

    char **parts = g_strsplit (req->uri->path->full + 1, "/", 0);
-    if (g_strv_length (parts) != 2) {
+    if (g_strv_length (parts) != 4) {


这个 access_zip_cb 不能改的吧，改了就不兼容原有的下载 zip 的方式了。新增的 url 的 cb 应该跟现在的独立，内部可以共用一些代码逻辑。

killing · 2024-08-29T03:33:15Z

server/access-file.c

 int
 access_file_init (evhtp_t *htp)
 {
    evhtp_set_regex_cb (htp, "^/files/.*", access_cb, NULL);
    evhtp_set_regex_cb (htp, "^/blks/.*", access_blks_cb, NULL);
-    evhtp_set_regex_cb (htp, "^/zip/.*", access_zip_cb, NULL);
+    evhtp_set_regex_cb (htp, "^/zip/.*", access_zip_link_cb, NULL);


这个原来的 /zip/{token} URL 应该只想原来的 access_zip_cb。这个不要改。

killing · 2024-08-29T03:36:22Z

server/access-file.c

 int
 access_file_init (evhtp_t *htp)
 {
    evhtp_set_regex_cb (htp, "^/files/.*", access_cb, NULL);
    evhtp_set_regex_cb (htp, "^/blks/.*", access_blks_cb, NULL);
-    evhtp_set_regex_cb (htp, "^/zip/.*", access_zip_cb, NULL);
+    evhtp_set_regex_cb (htp, "^/zip/.*", access_zip_link_cb, NULL);
+    evhtp_set_regex_cb (htp, "^/repos/[\\da-z]{8}-[\\da-z]{4}-[\\da-z]{4}-[\\da-z]{4}-[\\da-z]{12}/zip/.*", access_zip_cb, NULL);


这个属于登录后下载目录的 URL，目前先不用实现，代码先删掉吧。

killing · 2024-08-29T03:37:21Z

server/access-file.c

+    evhtp_set_regex_cb (htp, "^/zip/.*", access_zip_link_cb, NULL);
+    evhtp_set_regex_cb (htp, "^/repos/[\\da-z]{8}-[\\da-z]{4}-[\\da-z]{4}-[\\da-z]{4}-[\\da-z]{12}/zip/.*", access_zip_cb, NULL);
+    evhtp_set_regex_cb (htp, "^/f/.*", access_link_cb, NULL);
+    evhtp_set_regex_cb (htp, "^/d/.*", access_dir_link_cb, NULL);


目前就先实现这文件外链的 URL 就好了。其中 /d/ 的 URL 先注释掉吧，暂时不用对外提供。

killing · 2024-08-29T03:41:17Z

server/access-file.c

+        goto out;
+    }
+
+    info = http_tx_manager_query_access_token (token, "dir");


感觉你应该搞错需求了吧。你现在把原来的 /zip/{token} 的 URL 交给了这个 cb 处理。而实际上应该保持原有的 URL 的处理逻辑不变才对。

killing · 2024-08-29T06:26:00Z

server/pack-dir.h

@@ -10,6 +10,7 @@ typedef struct Progress {
    int zipped;
    int total;
    char *zip_file_path;
+    char *zip_file_name;


这些和 zip 相关的新增改动都先注释掉吧。

killing · 2024-08-29T06:26:26Z

server/upload-file.c

@@ -2641,6 +2647,154 @@ upload_headers_cb (evhtp_request_t *req, evhtp_headers_t *hdr, void *arg)
    return EVHTP_RES_OK;
 }

+static evhtp_res


新的上传外链处理代码也先注释掉吧。

killing · 2024-08-29T06:27:43Z

fileserver/fileserver.go

+	r.Handle("/u/{.*}", appHandler(uploadLinkCB))
+	r.Handle("/f/{.*}", appHandler(accessLinkCB))
+	r.Handle("/d/{.*}", appHandler(accessDirLinkCB))
+	r.Handle("/repos/{repoid:[\\da-z]{8}-[\\da-z]{4}-[\\da-z]{4}-[\\da-z]{4}-[\\da-z]{12}}/zip/{.*}", appHandler(accessZipCB))


go 不分做和 C 部分相同的处理，不用的代码先注释掉。

killing · 2024-08-29T06:35:29Z

fileserver/fileop.go

+	if info.FilePath == "" {
+		msg := "Invalid file_path\n"
+		return &appError{nil, msg, http.StatusBadRequest}
+	}


内部数据格式有问题应该返回 500。

killing · 2024-08-29T06:37:54Z

fileserver/fileop.go

+
+	now := time.Now()
+	rsp.Header().Set("Last-Modified", now.Format("Mon, 2 Jan 2006 15:04:05 GMT"))
+	rsp.Header().Set("Cache-Control", "max-age=3600")


Last-Modified 应该设置为文件的最后修改时间吧。

如果请求设置了 If-Modified-Since 头部或者 If-None-Match 头部，那么需要检查文件是否有被更新。参考 https://developer.mozilla.org/en-US/docs/Web/HTTP/Caching#validation 。同时我们应该设置 Cache-Control: no-cache，让客户端先检查缓存是否已经过期。

这些检查和头部设置应该都在获取到文件元信息之后才能做的吧。C 部分也需要相应改动。

killing · 2024-09-03T08:22:43Z

fileserver/fileop.go

+	if seahubPK == "" {
+		err := fmt.Errorf("no seahub private key is configured")
+		return &appError{err, "", http.StatusNotFound}
+	}


这个改动去掉吧。以后代码提交之后最好自己看一下，有时一些明显不必要的改动就去掉。

killing · 2024-09-03T08:27:13Z

fileserver/fileop.go

+	fileName := filepath.Base(filePath)
+	op := "download-link"
+
+	if _, ok := r.Header["If-Modified-Since"]; ok {


应该不用处理这个头部吧，现在只要设置了这个头部就返回没变动，也是不对的。

killing · 2024-09-03T08:29:22Z

fileserver/fileop.go

+		return &appError{nil, msg, http.StatusBadRequest}
+	}
+
+	etag := r.Header.Get("If-None-Match")


这里应该注释一下缓存相关的逻辑是怎样的。包括通过 If-None-Match 头部来检查文件是否有改动，设置 no-cache 来让客户端在使用缓存之前检查文件是否有变化。

killing · 2024-09-03T08:37:09Z

fileserver/fileop.go

+	}
+
+	rsp.Header().Set("ETag", fileID)
+	rsp.Header().Set("Cache-Control", "no-chche")


no-cache 写错了。这个代码应该没有测试过吧，开发完应该自己先测试一下。

这部分测试了。可能是浏览器使用了默认的Cache-Control。

killing · 2024-09-03T08:38:59Z

server/access-file.c

+        error_code = EVHTP_RES_OK;
+        goto out;
+    }
+    set_etag (req, file_id);


这里没有设置 no-cache。

killing · 2024-09-03T08:42:39Z

server/access-file.c

+    }
+}
+
+static GList *


下面这两个辅助函数也注释一下吧。

杨赫然 added 7 commits August 16, 2024 10:31

Add upload link and download link API

9e5f7b3

Use go 1.22 for ci

3ae9441

Go add upload link API

1c453fb

Add norm UTF8 path

59e2ee5

Go add upload link API

d33cf74

Add seahub_settings.py

dc71575

Add projectDir

8ac8d28

feiniks force-pushed the link_url branch from 727c38f to 8ac8d28 Compare August 20, 2024 03:55

killing reviewed Aug 29, 2024

View reviewed changes

杨赫然 added 2 commits August 29, 2024 16:35

Add download link API

c6b5326

Set and check etag

b50da91

killing reviewed Sep 3, 2024

View reviewed changes

Add comment and set no-cache

99dc7ab

killing merged commit 95bad89 into master Sep 3, 2024
6 checks passed

killing deleted the link_url branch September 3, 2024 10:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add upload link and download link API #683

Add upload link and download link API #683

feiniks commented Aug 16, 2024

killing Aug 29, 2024

killing Aug 29, 2024

killing Aug 29, 2024

killing Aug 29, 2024

killing Aug 29, 2024

killing Aug 29, 2024

killing Aug 29, 2024

killing Aug 29, 2024

killing Aug 29, 2024

killing Aug 29, 2024

killing Sep 3, 2024

killing Sep 3, 2024

killing Sep 3, 2024

killing Sep 3, 2024

feiniks Sep 3, 2024

killing Sep 3, 2024

killing Sep 3, 2024

Add upload link and download link API #683

Add upload link and download link API #683

Conversation

feiniks commented Aug 16, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment