jabuxas/abyss
jabuxas/abyss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: logic on naming url with secret

Browse Source
This commit is contained in:
jabuxas 2024-10-29 19:20:52 -03:00
parent 343af57742
commit 9262f436b6
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
handlers.go
View File

@ -158,11 +158,11 @@ func (app *Application) formHandler(w http.ResponseWriter, r *http.Request) {
} }
defer file.Close() defer file.Close()
filename := app.publicURL(file, ".txt") full := true
if len(r.Form["secret"]) == 0 { if len(r.Form["secret"]) == 0 {
filename = filename[:8] full = false
} }
filename := app.publicURL(file, ".txt", full)
// reopening file because hash consumes it // reopening file because hash consumes it
file, err = os.Open("/tmp/file.txt") file, err = os.Open("/tmp/file.txt")
@ -198,11 +198,11 @@ func (app *Application) curlHandler(w http.ResponseWriter, r *http.Request) {
} }
defer file.Close() defer file.Close()
filename := app.publicURL(file, filepath.Ext(handler.Filename)) full := true
if len(r.Form["secret"]) == 0 { if len(r.Form["secret"]) == 0 {
filename = filename[:8] full = false
} }
filename := app.publicURL(file, filepath.Ext(handler.Filename), full)
// reopen the file for copying, as the hash process consumed the file reader // reopen the file for copying, as the hash process consumed the file reader
file, _, err = r.FormFile("file") file, _, err = r.FormFile("file")
@ -219,8 +219,8 @@ func (app *Application) curlHandler(w http.ResponseWriter, r *http.Request) {
ResponseURLHandler(w, app.url, filename) ResponseURLHandler(w, app.url, filename)
} }
func (app *Application) publicURL(file io.Reader, extension string) string { func (app *Application) publicURL(file io.Reader, extension string, full bool) string {
filename, _ := HashFile(file, extension) filename, _ := HashFile(file, extension, full)
filepath := filepath.Join(app.filesDir, filename) filepath := filepath.Join(app.filesDir, filename)

10
helpers.go
View File

@ -67,17 +67,19 @@ func FormatFileSize(size int64) string {
return fmt.Sprintf("%.2f GB", float64(size)/(1024*1024*1024)) return fmt.Sprintf("%.2f GB", float64(size)/(1024*1024*1024))
} }
func HashFile(file io.Reader, extension string) (string, error) { func HashFile(file io.Reader, extension string, full bool) (string, error) {
hasher := md5.New() hasher := md5.New()
if _, err := io.Copy(hasher, file); err != nil { if _, err := io.Copy(hasher, file); err != nil {
return "", err return "", err
} }
sha1Hash := hex.EncodeToString(hasher.Sum(nil))[:8] sha1Hash := hex.EncodeToString(hasher.Sum(nil))
filename := fmt.Sprintf("%s%s", sha1Hash, extension) filename := fmt.Sprintf("%s%s", sha1Hash, extension)
if full {
return filename, nil return filename, nil
} else {
return fmt.Sprintf("%s%s", sha1Hash[:8], extension), nil
}
} }
func SaveFile(name string, file io.Reader) error { func SaveFile(name string, file io.Reader) error {