niklas/s3-share
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

display a text share

Browse Source
This commit is contained in:
Djeeberjr
2022-05-10 22:37:30 +02:00
parent ca2b2c661c
commit b5a326324f
4 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
internal/web/web.go
View File

@@ -7,6 +7,7 @@ import (
"strconv"
"git.kapelle.org/niklas/s3share/internal/client"
"git.kapelle.org/niklas/s3share/internal/types"
"github.com/gorilla/mux"
"github.com/sirupsen/logrus"
)
@@ -27,31 +28,11 @@ func StartWebserver(addr string, client client.Client) error {
})
r.HandleFunc("/s/{slug:[a-zA-Z0-9]{6}}", func(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
share, err := client.GetShare(r.Context(), vars["slug"])
if err != nil {
logrus.Error(err.Error())
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
share := getShareHead(client, w, r)
if share == nil {
http.NotFound(w, r)
return
}
metadata, err := client.GetObjectMetadata(r.Context(), share.Key)
if err != nil {
logrus.Error(err.Error())
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", metadata.ContentType)
w.Header().Set("Content-Length", strconv.FormatInt(metadata.Size, 10))
w.Header().Set("Content-Disposition", "attachment; filename=\""+metadata.Filename+"\"")
obj, err := client.GetObjectFromShare(r.Context(), share)
if err != nil {
logrus.Error(err.Error())
@@ -67,6 +48,10 @@ func StartWebserver(addr string, client client.Client) error {
}
})
r.HandleFunc("/s/{slug:[a-zA-Z0-9]{6}}", func(w http.ResponseWriter, r *http.Request) {
getShareHead(client, w, r)
}).Methods("HEAD")
r.HandleFunc("/api/share", func(w http.ResponseWriter, r *http.Request) {
}).Methods("GET")
@@ -119,3 +104,32 @@ func StartWebserver(addr string, client client.Client) error {
logrus.Info("Starting webserver")
return http.ListenAndServe(addr, r)
}
func getShareHead(client client.Client, w http.ResponseWriter, r *http.Request) *types.Share {
vars := mux.Vars(r)
share, err := client.GetShare(r.Context(), vars["slug"])
if err != nil {
logrus.Error(err.Error())
http.Error(w, err.Error(), http.StatusInternalServerError)
return nil
}
if share == nil {
http.NotFound(w, r)
return nil
}
metadata, err := client.GetObjectMetadata(r.Context(), share.Key)
if err != nil {
logrus.Error(err.Error())
http.Error(w, err.Error(), http.StatusInternalServerError)
return nil
}
w.Header().Set("Content-Type", metadata.ContentType)
w.Header().Set("Content-Length", strconv.FormatInt(metadata.Size, 10))
w.Header().Set("Content-Disposition", "attachment; filename=\""+metadata.Filename+"\"")
return share
}