From d2b9546f59834ab7ebd4e3f3f213a615b2f6c2ea Mon Sep 17 00:00:00 2001 From: Remco Date: Sun, 26 Oct 2014 21:30:02 +0100 Subject: [PATCH] implementing preview --- transfersh-server/handlers.go | 75 +++++++++++++------- transfersh-server/main.go | 32 +++++---- transfersh-server/static/download.image.html | 7 ++ transfersh-server/utils.go | 13 ++++ transfersh-web/download.image.html | 7 ++ 5 files changed, 94 insertions(+), 40 deletions(-) create mode 100644 transfersh-server/static/download.image.html create mode 100644 transfersh-web/download.image.html diff --git a/transfersh-server/handlers.go b/transfersh-server/handlers.go index f457805..41bb9cd 100644 --- a/transfersh-server/handlers.go +++ b/transfersh-server/handlers.go @@ -35,7 +35,6 @@ import ( "errors" "fmt" "github.com/dutchcoders/go-clamd" - "github.com/golang/gddo/httputil/header" "github.com/gorilla/mux" "github.com/kennygrant/sanitize" html_template "html/template" @@ -57,23 +56,60 @@ func healthHandler(w http.ResponseWriter, r *http.Request) { fmt.Fprintf(w, "Approaching Neutral Zone, all systems normal and functioning.") } -// this handler will output html or text, depending on the -// support of the client (Accept header). +/* The preview handler will show a preview of the content for browsers (accept type text/html), and referer is not transfer.sh */ +func previewHandler(w http.ResponseWriter, r *http.Request) { + log.Printf("preview") -func viewHandler(w http.ResponseWriter, r *http.Request) { - // vars := mux.Vars(r) + vars := mux.Vars(r) - actual := header.ParseAccept(r.Header, "Accept") + token := vars["token"] + filename := vars["filename"] - html := false + reader, contentType, contentLength, err := storage.Get(token, filename) + if err != nil { + } - for _, s := range actual { - if s.Value == "text/html" { - html = true - } + reader.Close() + + templatePath := "static/download.html" + + if strings.HasPrefix(contentType, "image") { + templatePath = "static/download.image.html" + } + + tmpl, err := html_template.ParseFiles(templatePath) + + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + data := struct { + ContentType string + Filename string + Url string + ContentLength uint64 + }{ + contentType, + filename, + r.URL.String(), + contentLength, } - if html { + if err := tmpl.Execute(w, data); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + +} + +// this handler will output html or text, depending on the +// support of the client (Accept header). + +func viewHandler(w http.ResponseWriter, r *http.Request) { + // vars := mux.Vars(r) + + if acceptsHtml(r.Header) { tmpl, err := html_template.ParseFiles("static/index.html") if err != nil { @@ -482,20 +518,7 @@ func getHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", contentType) w.Header().Set("Content-Length", strconv.FormatUint(contentLength, 10)) - - mediaType, _, _ := mime.ParseMediaType(contentType) - - switch { - case mediaType == "text/html": - w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename)) - break - case strings.HasPrefix(mediaType, "text"): - case mediaType == "": - break - default: - w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename)) - } - + w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename)) w.Header().Set("Connection", "close") if _, err = io.Copy(w, reader); err != nil { diff --git a/transfersh-server/main.go b/transfersh-server/main.go index c41f5dd..512f6bb 100644 --- a/transfersh-server/main.go +++ b/transfersh-server/main.go @@ -34,6 +34,7 @@ import ( "log" "math/rand" "net/http" + "net/url" "os" "time" ) @@ -79,23 +80,26 @@ func main() { r.HandleFunc("/({files:.*}).tar.gz", tarGzHandler).Methods("GET") r.HandleFunc("/download/{token}/{filename}", getHandler).Methods("GET") - /*r.HandleFunc("/{token}/{filename}", viewHandler).MatcherFunc(func(r *http.Request, rm *mux.RouteMatch) bool { - u, err := url.Parse(r.Referer()) - if err != nil { - log.Fatal(err) - return true - } + r.HandleFunc("/{token}/{filename}", previewHandler).MatcherFunc(func(r *http.Request, rm *mux.RouteMatch) bool { + if !acceptsHtml(r.Header) { + return false + } + + match := (r.Referer() == "") + + u, err := url.Parse(r.Referer()) + if err != nil { + log.Fatal(err) + return false + } - if u.Host == "transfer.sh" { - return false - } + match = match || (u.Host == "transfer.sh") - if u.Host == "" { - return false - } + match = match || (u.Host == "127.0.0.1") - return true - }).Methods("GET")*/ + log.Printf("%s %s match %s", r.Referer(), u.Host, match) + return match + }).Methods("GET") r.HandleFunc("/{token}/{filename}", getHandler).Methods("GET") r.HandleFunc("/get/{token}/{filename}", getHandler).Methods("GET") diff --git a/transfersh-server/static/download.image.html b/transfersh-server/static/download.image.html new file mode 100644 index 0000000..23211d8 --- /dev/null +++ b/transfersh-server/static/download.image.html @@ -0,0 +1,7 @@ + + +{{.ContentType}} +{{.ContentLength}} +{{.Filename}} +Download + \ No newline at end of file diff --git a/transfersh-server/utils.go b/transfersh-server/utils.go index 9f668f6..3426886 100644 --- a/transfersh-server/utils.go +++ b/transfersh-server/utils.go @@ -27,6 +27,7 @@ package main import ( "github.com/goamz/goamz/aws" "github.com/goamz/goamz/s3" + "github.com/golang/gddo/httputil/header" "net/http" "net/mail" "strings" @@ -78,3 +79,15 @@ func encodeRFC2047(String string) string { addr := mail.Address{String, ""} return strings.Trim(addr.String(), " <>") } + +func acceptsHtml(hdr http.Header) bool { + actual := header.ParseAccept(hdr, "Accept") + + for _, s := range actual { + if s.Value == "text/html" { + return (true) + } + } + + return (false) +} diff --git a/transfersh-web/download.image.html b/transfersh-web/download.image.html new file mode 100644 index 0000000..9c6389f --- /dev/null +++ b/transfersh-web/download.image.html @@ -0,0 +1,7 @@ + + +{{.ContentType}} +{{.ContentLength}} +{{.Filename}} +Download +