Merge remote-tracking branch 'origin/filedownload'

Finished file download endpoint
fisirc · Nov 20, 2024 · 31f648c · 31f648c
2 parents b360805 + fa16054
commit 31f648c
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 24 deletions.
diff --git a/stiller-backend/cmd/serve/main.go b/stiller-backend/cmd/serve/main.go
@@ -13,9 +13,14 @@ func main() {
         log.Fatalln("[ ❌ ] invalid router, exiting...")
     }
 
-    log.Println("[ ✅ ] server started at port", stiller.StillerConfig.Port)
+    log.Println(
+        "[ ✅ ] server started at port",
+        stiller.StillerConfig.Addr,
+    )
 
-    log.Fatalln(http.ListenAndServe(stiller.StillerConfig.Port, new_router))
+    log.Fatalln(
+        http.ListenAndServe(stiller.StillerConfig.Addr, new_router),
+    )
 }
 
 
diff --git a/stiller-backend/config.go b/stiller-backend/config.go
@@ -4,7 +4,7 @@ import "github.com/profclems/go-dotenv"
 
 type ConfigType struct {
     // local directory where to retrieve/store data from/to
-    Port       string
+    Addr       string
     FilesPath  string
     DBPath     string
     Secret     []byte
@@ -15,7 +15,7 @@ func newConfig() *ConfigType {
     dotenv.Load()
 
     return &ConfigType{
-        Port: dotenv.GetString("Port"),
+        Addr: dotenv.GetString("Addr"),
         FilesPath: dotenv.GetString("FilesPath"),
         DBPath: dotenv.GetString("DBPath"),
         Secret: []byte(dotenv.GetString("Secret")),

diff --git a/stiller-backend/db/create.sql b/stiller-backend/db/create.sql
@@ -104,8 +104,3 @@ values
     (1, 'van gogh'),
     (2, 'picasso');
 
-insert into
-    user (tier, displayname, username, mail, bpasswd)
-values
-    (0, 'admin', 'admin', '[email protected]', 'skibidi pana');
-
diff --git a/stiller-backend/internal/handlers/auth/userlogin/handler.go b/stiller-backend/internal/handlers/auth/userlogin/handler.go
@@ -9,6 +9,7 @@ import (
 
 	jsonexp "github.com/go-json-experiment/json"
 	"github.com/julienschmidt/httprouter"
+	"github.com/leporo/sqlf"
 	"golang.org/x/crypto/bcrypt"
 	"zombiezen.com/go/sqlite"
 	"zombiezen.com/go/sqlite/sqlitex"
@@ -37,10 +38,20 @@ func NetHandler(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 
     user_bpwd := string("")
     amount := int(0)
-    query := `select id, bpasswd from user where username=?1;`
 
+    query_stmt := sqlf.
+        Select("id, bpasswd").
+        From("user").
+        Where("username = ?", payload.Username)
+
+    query := query_stmt.String()
     new_dbconn, dbconn_err := dbutils.NewConn()
-    if handleutils.RequestLog(dbconn_err, "", http.StatusInternalServerError, &w) {
+    if handleutils.RequestLog(
+        dbconn_err,
+        "",
+        http.StatusInternalServerError,
+        &w,
+    ) {
         return
     }
 
@@ -53,9 +64,7 @@ func NetHandler(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
             user_bpwd = stmt.GetText("bpasswd")
             return nil
         },
-        Args: []any{
-            payload.Username,
-        },
+        Args: query_stmt.Args(),
     })
 
     if amount == 0 {
@@ -68,7 +77,12 @@ func NetHandler(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
     log.Println("pwd:", user_bpwd)
 
     cmp_err := bcrypt.CompareHashAndPassword([]byte(user_bpwd), []byte(payload.Pwd))
-    if handleutils.RequestLog(cmp_err, "", http.StatusNotFound, &w) {
+    if handleutils.RequestLog(
+        cmp_err,
+        "",
+        http.StatusNotFound,
+        &w,
+    ) {
         return
     }
 

diff --git a/stiller-backend/internal/handlers/file/filedl/handler.go b/stiller-backend/internal/handlers/file/filedl/handler.go
@@ -0,0 +1,100 @@
+package filedl
+
+import (
+	"net/http"
+	"stiller/internal/dbutils"
+	"stiller/internal/fsutils"
+	"stiller/internal/handlers/handleutils"
+	"stiller/internal/jwtutils"
+
+	jsonexp "github.com/go-json-experiment/json"
+	"github.com/julienschmidt/httprouter"
+	"github.com/leporo/sqlf"
+	"zombiezen.com/go/sqlite"
+	"zombiezen.com/go/sqlite/sqlitex"
+)
+
+
+func Nethandler(
+    w http.ResponseWriter,
+    r *http.Request,
+    params httprouter.Params,
+) {
+    if handleutils.CORS(w, r) {
+        return
+    }
+
+    type ReqPayload struct {
+        FileId int `json:"file_id"`
+    }
+
+    req_payload := ReqPayload{}
+    unmarshal_err := jsonexp.UnmarshalRead(
+        r.Body,
+        &req_payload,
+        jsonexp.DefaultOptionsV2(),
+    )
+
+    if handleutils.RequestLog(
+        unmarshal_err,
+        "",
+        http.StatusBadRequest,
+        &w,
+    ) {
+        return
+    }
+
+    user_token := r.Header.Get("token")
+    user_tk, token_decode_err := jwtutils.Decode(user_token)
+    if handleutils.RequestLog(token_decode_err, "", http.StatusUnauthorized, &w) {
+        return
+    }
+
+    new_dbconn, conn_err := dbutils.NewConn()
+    if handleutils.RequestLog(
+        conn_err,
+        "",
+        http.StatusInternalServerError,
+        &w,
+    ) {
+        return
+    }
+
+    user_id := user_tk.UserId
+    getpath_stmt := sqlf.
+    Select("path").
+        From("file").
+        Where("owner = ?", user_id)
+
+    getpath_query := getpath_stmt.String()
+    path := ""
+
+    exec_err := sqlitex.ExecuteTransient(
+        new_dbconn,
+        getpath_query,
+        &sqlitex.ExecOptions{
+            ResultFunc: func(stmt *sqlite.Stmt) error {
+                path = stmt.GetText("path")
+                return nil
+            },
+
+            Args: getpath_stmt.Args(),
+        },
+    )
+
+    if handleutils.RequestLog(exec_err, "", http.StatusNotFound, &w) {
+        return
+    }
+
+    fexists, fexists_err := fsutils.FileExists(path)
+    if handleutils.RequestLog(fexists_err, "", http.StatusInternalServerError, &w) {
+        return
+    }
+
+    if !fexists {
+        handleutils.GenericLog(nil, "path '%s' doesnt exist", path)
+    }
+
+    http.ServeFile(w, r, path)
+}
+
diff --git a/...nal/handlers/file/fileretrieve/handler.go → ...nternal/handlers/file/filetree/handler.go b/...nal/handlers/file/fileretrieve/handler.go → ...nternal/handlers/file/filetree/handler.go
@@ -1,4 +1,4 @@
-package fileretrieve
+package filetree
 
 import (
 	"net/http"

diff --git a/stiller-backend/internal/router/router.go b/stiller-backend/internal/router/router.go
@@ -5,7 +5,8 @@ import (
 	"stiller/internal/handlers/auth/newuser"
 	"stiller/internal/handlers/auth/userlogin"
 	"stiller/internal/handlers/auth/userverify"
-	"stiller/internal/handlers/file/fileretrieve"
+	"stiller/internal/handlers/file/filedl"
+	filetree "stiller/internal/handlers/file/filetree"
 	"stiller/internal/handlers/file/patchfile"
 	"stiller/internal/handlers/file/upload"
 	"stiller/internal/handlers/gallery/addtemplate"
@@ -31,19 +32,24 @@ var routes = [...]individualHandler{
         handlefunc: addtemplate.NetHandler,
     },
     {
-        path: "/file/upload",
-        method: http.MethodPost,
-        handlefunc: upload.NetHandler,
+        path: "/file",
+        method: http.MethodGet,
+        handlefunc: filetree.Nethandler,
     },
     {
-        path: "/file/update",
+        path: "/file",
         method: http.MethodPatch,
         handlefunc: patchfile.NetHandler,
     },
     {
-        path: "/file/retrieveall",
+        path: "/file/new",
+        method: http.MethodPost,
+        handlefunc: upload.NetHandler,
+    },
+    {
+        path: "/file/dl",
         method: http.MethodGet,
-        handlefunc: fileretrieve.Nethandler,
+        handlefunc: filedl.Nethandler,
     },
     {
         path: "/auth/newuser",
@@ -77,7 +83,11 @@ func routerDigest(router *httprouter.Router, ind *individualHandler) {
         fun = router.PUT
     }
 
-    router.OPTIONS(ind.path, ind.handlefunc)
+    _, _, flag := router.Lookup(http.MethodOptions, ind.path)
+    if flag {
+        router.OPTIONS(ind.path, ind.handlefunc)
+    }
+
     fun(ind.path, ind.handlefunc)
 }