diff options
author | clsr <clsr@clsr.net> | 2016-06-17 17:54:56 +0200 |
---|---|---|
committer | clsr <clsr@clsr.net> | 2016-06-17 17:54:56 +0200 |
commit | 66767ded4f006ba7b4dde16fdaf204332b1d4490 (patch) | |
tree | acb6a52a30e0d3e095cb5b99c008e131ef2d08e7 | |
parent | 3a2230d50bbb3a8471c4e7063ab45b619fbe4b6a (diff) | |
download | gomf-66767ded4f006ba7b4dde16fdaf204332b1d4490.tar.gz gomf-66767ded4f006ba7b4dde16fdaf204332b1d4490.zip |
Rename --forbid-* to --filter-*
-rw-r--r-- | USAGE | 8 | ||||
-rw-r--r-- | main.go | 8 | ||||
-rw-r--r-- | storage.go | 10 |
3 files changed, 13 insertions, 13 deletions
@@ -68,13 +68,13 @@ Running example (10 MiB): --bytes 10485760 equivalent bash example: --bytes $((1024 * 1024 * 10)) - --forbid-ext EXTS + --filter-ext EXTS forbids file extensions contained in the comma-separated list EXTS - example: --forbid-ext exe,dll,scr + example: --filter-ext exe,dll,scr - --forbid-mime TYPES + --filter-mime TYPES forbids MIME types contained in the comma-separated list TYPES - example: --forbid-mime application/x-dosexec + example: --filters-mime application/x-dosexec --contact EMAIL sets the contact email address to EMAIL @@ -68,8 +68,8 @@ func main() { cert := flag.String("cert", "", "path to TLS certificate (for HTTPS)") key := flag.String("key", "", "path to TLS key (for HTTPS)") maxSize := flag.Int64("max-size", 50*1024*1024, "max filesize in bytes") - forbidMime := flag.String("forbid-mime", "application/x-dosexec,application/x-msdos-program", "comma-separated list of forbidden MIME types") - forbidExt := flag.String("forbid-ext", "exe,dll,msi,scr,com,pif", "comma-separated list of forbidden file extensions") + filterMime := flag.String("filter-mime", "application/x-dosexec,application/x-msdos-program", "comma-separated list of filtered MIME types") + filterExt := flag.String("filter-ext", "exe,dll,msi,scr,com,pif", "comma-separated list of filtered file extensions") grill := flag.Bool("grill", false, "enable grills") idLength := flag.Int("id-length", 6, "length of uploaded file IDs") idCharset := flag.String("id-charset", "", "charset for uploaded file IDs (default lowercase letters a-z)") @@ -81,8 +81,8 @@ func main() { initWebsite() storage = NewStorage("upload", *maxSize) - storage.ForbiddenExt = strings.Split(*forbidExt, ",") - storage.ForbiddenMime = strings.Split(*forbidMime, ",") + storage.FilterExt = strings.Split(*filterExt, ",") + storage.FilterMime = strings.Split(*filterMime, ",") storage.IdLength = *idLength if *idCharset != "" { storage.IdCharset = *idCharset @@ -30,8 +30,8 @@ type Storage struct { IdCharset string IdLength int MaxSize int64 - ForbiddenMime []string - ForbiddenExt []string + FilterMime []string + FilterExt []string } type ErrForbidden struct{ Type string } @@ -201,17 +201,17 @@ func (s *Storage) getMimeExt(fpath string, name string) (mimetype, ext string, e } } - // reject forbidden MIME types and file extensions + // reject filtered MIME types and file extensions if mimetype != "application/octet-stream" { for _, e := range exts { - for _, fe := range s.ForbiddenExt { + for _, fe := range s.FilterExt { if e == fe { err = ErrForbidden{fe} return } } } - for _, fm := range s.ForbiddenMime { + for _, fm := range s.FilterMime { if mimetype == fm { err = ErrForbidden{fm} return |