Added embedding functionality + fixed headers

README.md

@@ -26,8 +26,10 @@ $ curl -X PUT --upload-file nhgbhhj https://transfer.sh/test.txt/virustotal
 Create direct download link:
 
 https://transfer.sh/1lDau/test.txt --> https://transfer.sh/get/1lDau/test.txt
-== OR ==
-https://transfer.sh/1lDau/test.txt --> https://transfer.sh/download/1lDau/test.txt
+
+Embed file:
+
+https://transfer.sh/1lDau/test.txt --> https://transfer.sh/embed/1lDau/test.txt
 
 ```
 ## Add alias to .bashrc or .zshrc

server/handlers.go

@@ -818,6 +818,42 @@ func (s *Server) headHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Connection", "close")
 }
 
+func (s *Server) embedHandler(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+
+	token := vars["token"]
+	filename := vars["filename"]
+
+	if err := s.CheckMetadata(token, filename); err != nil {
+		log.Printf("Error metadata: %s", err.Error())
+		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+		return
+	}
+
+	reader, contentType, contentLength, err := s.storage.Get(token, filename)
+	if s.storage.IsNotExist(err) {
+		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+		return
+	} else if err != nil {
+		log.Printf("%s", err.Error())
+		http.Error(w, "Could not retrieve file.", 500)
+		return
+	}
+
+	defer reader.Close()
+
+	w.Header().Set("Content-Type", contentType)
+	w.Header().Set("Content-Length", strconv.FormatUint(contentLength, 10))
+	w.Header().Set("Content-Disposition", fmt.Sprintf("inline; filename=\"%s\"", filename))
+	w.Header().Set("Connection", "keep-alive")
+
+	if _, err = io.Copy(w, reader); err != nil {
+		log.Printf("%s", err.Error())
+		http.Error(w, "Error occurred copying to output stream", 500)
+		return
+	}
+}
+
 func (s *Server) getHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 
@@ -845,7 +881,7 @@ func (s *Server) getHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", contentType)
 	w.Header().Set("Content-Length", strconv.FormatUint(contentLength, 10))
 	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename))
-	w.Header().Set("Connection", "close")
+	w.Header().Set("Connection", "keep-alive")
 
 	if _, err = io.Copy(w, reader); err != nil {
 		log.Printf("%s", err.Error())

server/server.go

@@ -326,8 +326,8 @@ func (s *Server) Run() {
 
 	r.HandleFunc("/{token}/{filename}", s.headHandler).Methods("HEAD")
 	r.HandleFunc("/get/{token}/{filename}", s.headHandler).Methods("HEAD")
-	r.HandleFunc("/download/{token}/{filename}", s.headHandler).Methods("HEAD")
-	
+	r.HandleFunc("/embed/{token}/{filename}", s.headHandler).Methods("HEAD")
+
 	r.HandleFunc("/{token}/{filename}", s.previewHandler).MatcherFunc(func(r *http.Request, rm *mux.RouteMatch) (match bool) {
 		match = false
 
@@ -357,7 +357,7 @@ func (s *Server) Run() {
 
 	r.HandleFunc("/{token}/{filename}", getHandlerFn).Methods("GET")
 	r.HandleFunc("/get/{token}/{filename}", getHandlerFn).Methods("GET")
-	r.HandleFunc("/download/{token}/{filename}", getHandlerFn).Methods("GET")
+	r.HandleFunc("/embed/{token}/{filename}", s.embedHandler).Methods("GET")
 
 	r.HandleFunc("/{filename}/virustotal", s.virusTotalHandler).Methods("PUT")
 	r.HandleFunc("/{filename}/scan", s.scanHandler).Methods("PUT")