@@ -45,7 +44,6 @@
- {% endif %}
diff --git a/templates/paste.html b/templates/paste.html
index b22ca96..84335d1 100644
--- a/templates/paste.html
+++ b/templates/paste.html
@@ -14,15 +14,14 @@
id="extension" class="codebox" name='extension' type='text' value="" placeholder="txt" />
- {% if disable_access_key != true %}
- {% endif %}
+
diff --git a/upload.go b/upload.go
index 0485c22..8526260 100644
--- a/upload.go
+++ b/upload.go
@@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
- "log"
"net/http"
"net/url"
"path"
@@ -16,13 +15,13 @@ import (
"strings"
"time"
- "github.com/andreimarcu/linx-server/auth/apikeys"
"github.com/andreimarcu/linx-server/backends"
"github.com/andreimarcu/linx-server/expiry"
"github.com/dchest/uniuri"
- "github.com/gabriel-vasile/mimetype"
"github.com/zenazn/goji/web"
+ "gopkg.in/h2non/filetype.v1"
)
+
var FileTooLargeError = errors.New("File too large.")
var fileBlacklist = map[string]bool{
"favicon.ico": true,
@@ -42,7 +41,6 @@ type UploadRequest struct {
deleteKey string // Empty string if not defined
randomBarename bool
accessKey string // Empty string if not defined
- srcIp string // Empty string if not defined
}
// Metadata associated with a file as it would actually be stored
@@ -61,6 +59,7 @@ func uploadPostHandler(c web.C, w http.ResponseWriter, r *http.Request) {
uploadHeaderProcess(r, &upReq)
contentType := r.Header.Get("Content-Type")
+
if strings.HasPrefix(contentType, "multipart/form-data") {
file, headers, err := r.FormFile("file")
if err != nil {
@@ -91,10 +90,11 @@ func uploadPostHandler(c web.C, w http.ResponseWriter, r *http.Request) {
upReq.expiry = parseExpiry(r.PostFormValue("expires"))
upReq.accessKey = r.PostFormValue(accessKeyParamName)
+
if r.PostFormValue("randomize") == "true" {
upReq.randomBarename = true
}
- upReq.srcIp = r.Header.Get("X-Forwarded-For")
+
upload, err := processUpload(upReq)
if strings.EqualFold("application/json", r.Header.Get("Accept")) {
@@ -125,11 +125,11 @@ func uploadPostHandler(c web.C, w http.ResponseWriter, r *http.Request) {
func uploadPutHandler(c web.C, w http.ResponseWriter, r *http.Request) {
upReq := UploadRequest{}
uploadHeaderProcess(r, &upReq)
-
+
defer r.Body.Close()
upReq.filename = c.URLParams["name"]
upReq.src = http.MaxBytesReader(w, r.Body, Config.maxSize)
- upReq.srcIp = r.Header.Get("X-Forwarded-For")
+
upload, err := processUpload(upReq)
if strings.EqualFold("application/json", r.Header.Get("Accept")) {
@@ -166,16 +166,13 @@ func uploadRemote(c web.C, w http.ResponseWriter, r *http.Request) {
key = password
}
}
- result, err := apikeys.CheckAuth(remoteAuthKeys, key)
+ result, err := checkAuth(remoteAuthKeys, key)
if err != nil || !result {
if Config.basicAuth {
- rs := ""
- if Config.siteName != "" {
- rs = fmt.Sprintf(` realm="%s"`, Config.siteName)
- }
- w.Header().Set("WWW-Authenticate", `Basic`+rs)
+ badAuthorizationHandler(w, r)
+ } else {
+ unauthorizedHandler(c, w, r)
}
- unauthorizedHandler(c, w, r)
return
}
}
@@ -194,14 +191,14 @@ func uploadRemote(c web.C, w http.ResponseWriter, r *http.Request) {
oopsHandler(c, w, r, RespAUTO, "Could not retrieve URL")
return
}
-
+
upReq.filename = filepath.Base(grabUrl.Path)
upReq.src = http.MaxBytesReader(w, resp.Body, Config.maxSize)
upReq.deleteKey = r.FormValue("deletekey")
upReq.accessKey = r.FormValue(accessKeyParamName)
upReq.randomBarename = r.FormValue("randomize") == "yes"
upReq.expiry = parseExpiry(r.FormValue("expiry"))
- upReq.srcIp = r.Header.Get("X-Forwarded-For")
+
upload, err := processUpload(upReq)
if strings.EqualFold("application/json", r.Header.Get("Accept")) {
@@ -230,11 +227,11 @@ func uploadRemote(c web.C, w http.ResponseWriter, r *http.Request) {
func uploadHeaderProcess(r *http.Request, upReq *UploadRequest) {
if r.Header.Get("Linx-Randomize") == "yes" {
upReq.randomBarename = true
- } else {
- upReq.randomBarename = false
}
+
upReq.deleteKey = r.Header.Get("Linx-Delete-Key")
upReq.accessKey = r.Header.Get(accessKeyHeaderName)
+
// Get seconds until expiry. Non-integer responses never expire.
expStr := r.Header.Get("Linx-Expiry")
upReq.expiry = parseExpiry(expStr)
@@ -266,11 +263,11 @@ func processUpload(upReq UploadRequest) (upload Upload, err error) {
header = header[:n]
// Determine the type of file from header
- kind := mimetype.Detect(header)
- if len(kind.Extension()) < 2 {
+ kind, err := filetype.Match(header)
+ if err != nil || kind.Extension == "unknown" {
extension = "file"
} else {
- extension = kind.Extension()[1:] // remove leading "."
+ extension = kind.Extension
}
}
@@ -321,45 +318,19 @@ func processUpload(upReq UploadRequest) (upload Upload, err error) {
return upload, errors.New("Prohibited filename")
}
- // Lock the upload
- log.Printf("Lock %s", upload.Filename)
- err = storageBackend.Lock(upload.Filename)
- if err != nil {
- return upload, err
- }
-
// Get the rest of the metadata needed for storage
var fileExpiry time.Time
- maxDurationTime := time.Duration(Config.maxDurationTime) * time.Second
if upReq.expiry == 0 {
- if upReq.size > Config.maxDurationSize && maxDurationTime > 0 {
- fileExpiry = time.Now().Add(maxDurationTime)
- } else {
- fileExpiry = expiry.NeverExpire
- }
+ fileExpiry = expiry.NeverExpire
} else {
- if upReq.size > Config.maxDurationSize && upReq.expiry > maxDurationTime {
- fileExpiry = time.Now().Add(maxDurationTime)
- } else {
- fileExpiry = time.Now().Add(upReq.expiry)
- }
+ fileExpiry = time.Now().Add(upReq.expiry)
}
if upReq.deleteKey == "" {
upReq.deleteKey = uniuri.NewLen(30)
}
- if Config.disableAccessKey == true {
- upReq.accessKey = ""
- }
- log.Printf("Write %s", upload.Filename)
- upload.Metadata, err = storageBackend.Put(upload.Filename, io.MultiReader(bytes.NewReader(header), upReq.src), fileExpiry, upReq.deleteKey, upReq.accessKey, upReq.srcIp)
- if err != nil {
- return upload, err
- }
- // Unlock the upload
- log.Printf("Unlock %s", upload.Filename)
- err = storageBackend.Unlock(upload.Filename)
+ upload.Metadata, err = storageBackend.Put(upload.Filename, io.MultiReader(bytes.NewReader(header), upReq.src), fileExpiry, upReq.deleteKey, upReq.accessKey)
if err != nil {
return upload, err
}
@@ -423,11 +394,11 @@ func barePlusExt(filename string) (barename, extension string) {
func parseExpiry(expStr string) time.Duration {
if expStr == "" {
- return time.Duration(Config.defaultExpiry) * time.Second
+ return time.Duration(Config.maxExpiry) * time.Second
} else {
fileExpiry, err := strconv.ParseUint(expStr, 10, 64)
if err != nil {
- return time.Duration(Config.defaultExpiry) * time.Second
+ return time.Duration(Config.maxExpiry) * time.Second
} else {
if Config.maxExpiry > 0 && (fileExpiry > Config.maxExpiry || fileExpiry == 0) {
fileExpiry = Config.maxExpiry