diff options
| author | clsr <clsr@clsr.net> | 2016-06-18 18:41:34 +0200 |
|---|---|---|
| committer | clsr <clsr@clsr.net> | 2016-06-18 18:41:34 +0200 |
| commit | 92784c2d68acbe65ee6289fb99d345f117bd888e (patch) | |
| tree | 26f11e9425aae340488babaa9e98712b4e1954d2 | |
| parent | c11e3df0cca9239c07d2738038065860e8d942a0 (diff) | |
| download | gomf-92784c2d68acbe65ee6289fb99d345f117bd888e.tar.gz gomf-92784c2d68acbe65ee6289fb99d345f117bd888e.zip | |
Refactor storage.go, move string array searches into a function
| -rw-r--r-- | storage.go | 44 |
1 files changed, 15 insertions, 29 deletions
@@ -186,19 +186,10 @@ func (s *Storage) getMimeExt(fpath string, name string) (mimetype, ext string, e // choose file extension, prefer the user-provided one ext = path.Ext(name) exts, err := mime.ExtensionsByType(mimetype) - valid := false if err != nil { return } - if ext != "" { - for _, e := range exts { - if e == ext { - valid = true - break - } - } - } - if !valid { + if ext != "" && find(exts, ext) == "" { ext = "" if len(exts) > 0 { ext = exts[0] @@ -209,18 +200,8 @@ func (s *Storage) getMimeExt(fpath string, name string) (mimetype, ext string, e if !ok && s.Whitelist { // whitelist: reject if not on filters err = ErrForbidden{mimetype} } else if ok && !s.Whitelist { // blacklist: reject if filtered - forbid := true // only block application/octet-stream if explicitly requested - if mimetype == "application/octet-stream" { - forbid = false - for _, fm := range s.FilterMime { - if mimetype == fm { - forbid = true - break - } - } - } - if forbid { + if mimetype != "application/octet-stream" || find(s.FilterMime, mimetype) != "" { err = ErrForbidden{filtered} } } @@ -229,16 +210,12 @@ func (s *Storage) getMimeExt(fpath string, name string) (mimetype, ext string, e } func (s *Storage) findFilter(exts []string, mimetype string) (match string, ok bool) { - for _, fm := range s.FilterMime { - if mimetype == fm { - return mimetype, true - } + if m := find(s.FilterMime, mimetype); m == mimetype { + return m, true } for _, ext := range exts { - for _, fe := range s.FilterExt { - if ext == "."+fe { - return ext, true - } + if e := find(s.FilterExt, ext); e == ext { + return e, true } } return "", false @@ -291,3 +268,12 @@ func (s *Storage) storeFile(file *os.File, hash, ext string) (id string, err err } return } + +func find(ss []string, search string) string { + for _, s := range ss { + if s == search { + return s + } + } + return "" +} |