v/transfer.sh
1
0
Fork 0
mirror of https://github.com/dutchcoders/transfer.sh.git synced 2020-11-18 19:53:40 -08:00
Code Issues Releases Wiki Activity

improved error handlig for not existing files

Browse Source
This commit is contained in:
Remco 2016-01-29 16:23:25 +01:00
parent 2ea3f89cee
commit 1b562e1db0
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
transfersh-server/handlers.go
View File

@ -393,7 +393,7 @@ func zipHandler(w http.ResponseWriter, r *http.Request) {
reader, _, _, err := storage.Get(token, filename) reader, _, _, err := storage.Get(token, filename)
if err != nil { if err != nil {
if err.Error() == "The specified key does not exist." { if storage.IsNotExist(err) {
http.Error(w, "File not found", 404) http.Error(w, "File not found", 404)
return return
} else { } else {
@ -463,7 +463,7 @@ func tarGzHandler(w http.ResponseWriter, r *http.Request) {
reader, _, contentLength, err := storage.Get(token, filename) reader, _, contentLength, err := storage.Get(token, filename)
if err != nil { if err != nil {
if err.Error() == "The specified key does not exist." { if storage.IsNotExist(err) {
http.Error(w, "File not found", 404) http.Error(w, "File not found", 404)
return return
} else { } else {
@ -515,7 +515,7 @@ func tarHandler(w http.ResponseWriter, r *http.Request) {
reader, _, contentLength, err := storage.Get(token, filename) reader, _, contentLength, err := storage.Get(token, filename)
if err != nil { if err != nil {
if err.Error() == "The specified key does not exist." { if storage.IsNotExist(err) {
http.Error(w, "File not found", 404) http.Error(w, "File not found", 404)
return return
} else { } else {
@ -555,7 +555,7 @@ func getHandler(w http.ResponseWriter, r *http.Request) {
reader, contentType, contentLength, err := storage.Get(token, filename) reader, contentType, contentLength, err := storage.Get(token, filename)
if err != nil { if err != nil {
if err.Error() == "The specified key does not exist." { if storage.IsNotExist(err) {
http.Error(w, "File not found", 404) http.Error(w, "File not found", 404)
return return
} else { } else {

16
transfersh-server/storage.go
View File

@ -3,7 +3,6 @@ package main
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/goamz/goamz/s3"
"io" "io"
"log" "log"
"mime" "mime"
@ -11,12 +10,15 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"sync" "sync"
"github.com/goamz/goamz/s3"
) )
type Storage interface { type Storage interface {
Get(token string, filename string) (reader io.ReadCloser, contentType string, contentLength uint64, err error) Get(token string, filename string) (reader io.ReadCloser, contentType string, contentLength uint64, err error)
Head(token string, filename string) (contentType string, contentLength uint64, err error) Head(token string, filename string) (contentType string, contentLength uint64, err error)
Put(token string, filename string, reader io.Reader, contentType string, contentLength uint64) error Put(token string, filename string, reader io.Reader, contentType string, contentLength uint64) error
IsNotExist(err error) bool
} }
type LocalStorage struct { type LocalStorage struct {
@ -63,6 +65,10 @@ func (s *LocalStorage) Get(token string, filename string) (reader io.ReadCloser,
return return
} }
func (s *LocalStorage) IsNotExist(err error) bool {
return os.IsNotExist(err)
}
func (s *LocalStorage) Put(token string, filename string, reader io.Reader, contentType string, contentLength uint64) error { func (s *LocalStorage) Put(token string, filename string, reader io.Reader, contentType string, contentLength uint64) error {
var f io.WriteCloser var f io.WriteCloser
var err error var err error
@ -120,6 +126,14 @@ func (s *S3Storage) Head(token string, filename string) (contentType string, con
return return
} }
func (s *S3Storage) IsNotExist(err error) bool {
log.Printf("IsNotExist: %s, %#v", err.Error(), err)
b := (err.Error() == "The specified key does not exist.")
b = b || (err.Error() == "Access Denied")
return b
}
func (s *S3Storage) Get(token string, filename string) (reader io.ReadCloser, contentType string, contentLength uint64, err error) { func (s *S3Storage) Get(token string, filename string) (reader io.ReadCloser, contentType string, contentLength uint64, err error) {
key := fmt.Sprintf("%s/%s", token, filename) key := fmt.Sprintf("%s/%s", token, filename)