chore: version 1.7.0

Former-commit-id: fad547009e94abcf390a7a9a5fbda912890f5558 [formerly 38266b3eac1f5b6f45d12fdfa83afcf7daa98e60] [formerly e36ec6f4c2b25002be967b4a5dc9566749ac8d42 [formerly 97d26e2348]]
Former-commit-id: 59730ce4eac5932e9d52ffd5dbe810f52f69f548 [formerly 327efa168ad4669b585228fd6b7ced76b261e1f7]
Former-commit-id: d325631f00a18d8fc6009f571b66192809cb8875

.circleci/config.yml

@@ -2,20 +2,23 @@ version: 2
 jobs:
   linting:
     docker:
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.10
     working_directory: /go/src/github.com/filebrowser/filebrowser
     steps:
       - checkout
       - run:
           name: Install Dependencies
           command: |
-            cd cmd/filebrowser && go get ./... && cd ../..
+            curl -sL -o $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64
+            chmod +x $GOPATH/bin/dep
+            dep ensure -v
             go get github.com/alecthomas/gometalinter
             gometalinter --install
       - run:
           name: Run linting
           command: |
             gometalinter --exclude="rice-box.go" \
+              --deadline=300s \
               -D goconst \
               -D gocyclo \
               -D vetshadow \
@@ -24,30 +27,31 @@ jobs:
               -D gas
   build:
     docker:
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.10
     working_directory: /go/src/github.com/filebrowser/filebrowser
     steps:
       - checkout
       - run:
           name: Install Dependencies
           command: |
-            cd cmd/filebrowser
-            go get ./...
+            curl -sL -o $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64
+            chmod +x $GOPATH/bin/dep
+            dep ensure -v
       - run:
           name: Building
-          command: go build
+          command: go build github.com/filebrowser/filebrowser/cmd/filebrowser
   deploy:
     docker:
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.10
     working_directory: /go/src/github.com/filebrowser/filebrowser
     steps:
       - checkout
       - run:
           name: Install Dependencies
           command: |
-            cd cmd/filebrowser
-            go get ./...
-            cd ../..
+            curl -sL -o $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64
+            chmod +x $GOPATH/bin/dep
+            dep ensure -v
       - run:
           name: Deploy
           command: curl -sL https://git.io/goreleaser | bash

.gitignore

@@ -9,4 +9,5 @@ yarn-error.log*
 .idea
 .vscode
 package-lock.json
-yarn.lock
+yarn.lock
+vendor

.goreleaser.yml

@@ -15,10 +15,6 @@ build:
     - 386
     - arm
     - arm64
-    - mips
-    - mips64
-    - mipsle
-    - mips64le
   ignore:
     - goos: openbsd
       goarch: arm

Dockerfile

@@ -1,24 +1,25 @@
-
-FROM golang:alpine
-
-COPY . /go/src/github.com/filebrowser/filebrowser
-
-WORKDIR /go/src/github.com/filebrowser/filebrowser
-RUN apk add --no-cache git
-RUN go get ./...
-
-WORKDIR /go/src/github.com/filebrowser/filebrowser/cmd/filebrowser
-RUN CGO_ENABLED=0 go build -a
-RUN mv filebrowser /go/bin/filebrowser
-
-FROM scratch
-COPY --from=0 /go/bin/filebrowser /filebrowser
-
-VOLUME /tmp
-VOLUME /srv
-EXPOSE 80
-
-COPY Docker.json /config.json
-
-ENTRYPOINT ["/filebrowser"]
-CMD ["--config", "/config.json"]
+FROM golang:alpine
+
+COPY . /go/src/github.com/filebrowser/filebrowser
+
+WORKDIR /go/src/github.com/filebrowser/filebrowser
+RUN apk add --no-cache git curl && \
+  curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 && \
+  chmod +x /usr/local/bin/dep
+RUN dep ensure -vendor-only
+
+WORKDIR /go/src/github.com/filebrowser/filebrowser/cmd/filebrowser
+RUN CGO_ENABLED=0 go build -a
+RUN mv filebrowser /go/bin/filebrowser
+
+FROM scratch
+COPY --from=0 /go/bin/filebrowser /filebrowser
+
+VOLUME /tmp
+VOLUME /srv
+EXPOSE 80
+
+COPY Docker.json /config.json
+
+ENTRYPOINT ["/filebrowser"]
+CMD ["--config", "/config.json"]

Gopkg.lock

@@ -0,0 +1,423 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "github.com/BurntSushi/toml"
+  packages = ["."]
+  revision = "a368813c5e648fee92e5f6c30e3944ff9d5e8895"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/GeertJohan/go.rice"
+  packages = [
+    ".",
+    "embedded"
+  ]
+  revision = "c02ca9a983da5807ddf7d796784928f5be4afd09"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/aead/chacha20"
+  packages = [
+    ".",
+    "chacha"
+  ]
+  revision = "c8d29375923a8e1d2a0f0dc0fc1d8a0aba5b97ba"
+
+[[projects]]
+  name = "github.com/asdine/storm"
+  packages = [
+    ".",
+    "codec",
+    "codec/json",
+    "index",
+    "internal",
+    "q"
+  ]
+  revision = "68fc73b635f890fe7ba2f3b15ce80c85b28a744f"
+  version = "v2.0.2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/bifurcation/mint"
+  packages = [
+    ".",
+    "syntax"
+  ]
+  revision = "340be3ae8c0ff8edce24cf59e7acdb1432bd5ce5"
+
+[[projects]]
+  name = "github.com/chaseadamsio/goorgeous"
+  packages = ["."]
+  revision = "dcf1ef873b8987bf12596fe6951c48347986eb2f"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/codahale/aesnicheck"
+  packages = ["."]
+  revision = "349fcc471aaccc29cd074e1275f1a494323826cd"
+
+[[projects]]
+  name = "github.com/coreos/bbolt"
+  packages = ["."]
+  revision = "583e8937c61f1af6513608ccc75c97b6abdf4ff9"
+  version = "v1.3.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/daaku/go.zipexe"
+  packages = ["."]
+  revision = "a5fe2436ffcb3236e175e5149162b41cd28bd27d"
+
+[[projects]]
+  name = "github.com/dgrijalva/jwt-go"
+  packages = [
+    ".",
+    "request"
+  ]
+  revision = "dbeaa9332f19a944acb5736b4456cfcc02140e29"
+  version = "v3.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/dsnet/compress"
+  packages = [
+    ".",
+    "bzip2",
+    "bzip2/internal/sais",
+    "internal",
+    "internal/errors",
+    "internal/prefix"
+  ]
+  revision = "cc9eb1d7ad760af14e8f918698f745e80377af4f"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/flynn/go-shlex"
+  packages = ["."]
+  revision = "3f9db97f856818214da2e1057f8ad84803971cff"
+
+[[projects]]
+  name = "github.com/fsnotify/fsnotify"
+  packages = ["."]
+  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
+  version = "v1.4.7"
+
+[[projects]]
+  name = "github.com/gohugoio/hugo"
+  packages = ["parser"]
+  revision = "25e88ccabe9b04c42ffb43528c86743f623fac46"
+  version = "v0.36.1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golang/snappy"
+  packages = ["."]
+  revision = "553a641470496b2327abcac10b36396bd98e45c9"
+
+[[projects]]
+  name = "github.com/gorilla/websocket"
+  packages = ["."]
+  revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
+  version = "v1.2.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hacdias/fileutils"
+  packages = ["."]
+  revision = "76b1c6ab906773727a1ce2f7fb22830685166f85"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hacdias/varutils"
+  packages = ["."]
+  revision = "82d3b57f667a756cfc4b1535951b46878881f3e1"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/go-syslog"
+  packages = ["."]
+  revision = "326bf4a7f709d263f964a6a96558676b103f3534"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/golang-lru"
+  packages = [
+    ".",
+    "simplelru"
+  ]
+  revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/hcl"
+  packages = [
+    ".",
+    "hcl/ast",
+    "hcl/parser",
+    "hcl/scanner",
+    "hcl/strconv",
+    "hcl/token",
+    "json/parser",
+    "json/scanner",
+    "json/token"
+  ]
+  revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kardianos/osext"
+  packages = ["."]
+  revision = "ae77be60afb1dcacde03767a8c37337fad28ac14"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/lucas-clemente/aes12"
+  packages = ["."]
+  revision = "cd47fb39b79f867c6e4e5cd39cf7abd799f71670"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/lucas-clemente/fnv128a"
+  packages = ["."]
+  revision = "393af48d391698c6ae4219566bfbdfef67269997"
+
+[[projects]]
+  name = "github.com/lucas-clemente/quic-go"
+  packages = [
+    ".",
+    "h2quic",
+    "internal/ackhandler",
+    "internal/congestion",
+    "internal/crypto",
+    "internal/flowcontrol",
+    "internal/handshake",
+    "internal/protocol",
+    "internal/utils",
+    "internal/wire",
+    "qerr"
+  ]
+  revision = "30851b9a3b4e958490b476fe72adafa67641361a"
+  version = "v0.7.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/lucas-clemente/quic-go-certificates"
+  packages = ["."]
+  revision = "d2f86524cced5186554df90d92529757d22c1cb6"
+
+[[projects]]
+  name = "github.com/magiconair/properties"
+  packages = ["."]
+  revision = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6"
+  version = "v1.7.6"
+
+[[projects]]
+  name = "github.com/mholt/archiver"
+  packages = ["."]
+  revision = "26cf5bb32d07aa4e8d0de15f56ce516f4641d7df"
+
+[[projects]]
+  name = "github.com/mholt/caddy"
+  packages = [
+    ".",
+    "caddyfile",
+    "caddyhttp/httpserver",
+    "caddyhttp/staticfiles",
+    "caddytls"
+  ]
+  revision = "d3f338ddab9ee24b376b5c9c51e202581e2d43ba"
+  version = "v0.10.11"
+
+[[projects]]
+  name = "github.com/miekg/dns"
+  packages = ["."]
+  revision = "5364553f1ee9cddc7ac8b62dce148309c386695b"
+  version = "v1.0.4"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mitchellh/mapstructure"
+  packages = ["."]
+  revision = "00c29f56e2386353d58c599509e8dc3801b0d716"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/nwaples/rardecode"
+  packages = ["."]
+  revision = "e06696f847aeda6f39a8f0b7cdff193b7690aef6"
+
+[[projects]]
+  name = "github.com/pelletier/go-toml"
+  packages = ["."]
+  revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/pierrec/lz4"
+  packages = ["."]
+  revision = "2fcda4cb7018ce05a25959d2fe08c83e3329f169"
+  version = "v1.1"
+
+[[projects]]
+  name = "github.com/pierrec/xxHash"
+  packages = ["xxHash32"]
+  revision = "f051bb7f1d1aaf1b5a665d74fb6b0217712c69f7"
+  version = "v0.1.1"
+
+[[projects]]
+  name = "github.com/robfig/cron"
+  packages = ["."]
+  revision = "b024fc5ea0e34bc3f83d9941c8d60b0622bfaca4"
+  version = "v1"
+
+[[projects]]
+  name = "github.com/russross/blackfriday"
+  packages = ["."]
+  revision = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"
+  version = "v1.5"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/shurcooL/sanitized_anchor_name"
+  packages = ["."]
+  revision = "86672fcb3f950f35f2e675df2240550f2a50762f"
+
+[[projects]]
+  name = "github.com/spf13/afero"
+  packages = [
+    ".",
+    "mem"
+  ]
+  revision = "bb8f1927f2a9d3ab41c9340aa034f6b803f4359c"
+  version = "v1.0.2"
+
+[[projects]]
+  name = "github.com/spf13/cast"
+  packages = ["."]
+  revision = "8965335b8c7107321228e3e3702cab9832751bac"
+  version = "v1.2.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/spf13/jwalterweatherman"
+  packages = ["."]
+  revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
+
+[[projects]]
+  name = "github.com/spf13/pflag"
+  packages = ["."]
+  revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/spf13/viper"
+  packages = ["."]
+  revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/ulikunitz/xz"
+  packages = [
+    ".",
+    "internal/hash",
+    "internal/xlog",
+    "lzma"
+  ]
+  revision = "0c6b41e72360850ca4f98dc341fd999726ea007f"
+  version = "v0.5.4"
+
+[[projects]]
+  name = "github.com/xenolf/lego"
+  packages = ["acme"]
+  revision = "67c86d860a797ce2483f50d9174d4ed24984bef2"
+  version = "v0.4.1"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = [
+    "bcrypt",
+    "blowfish",
+    "curve25519",
+    "ed25519",
+    "ed25519/internal/edwards25519",
+    "hkdf",
+    "ocsp"
+  ]
+  revision = "49796115aa4b964c318aad4f3084fdb41e9aa067"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = [
+    "bpf",
+    "http2",
+    "http2/hpack",
+    "idna",
+    "internal/iana",
+    "internal/socket",
+    "ipv4",
+    "ipv6",
+    "lex/httplex",
+    "publicsuffix"
+  ]
+  revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix"]
+  revision = "88d2dcc510266da9f7f8c7f34e1940716cab5f5c"
+
+[[projects]]
+  name = "golang.org/x/text"
+  packages = [
+    "collate",
+    "collate/build",
+    "internal/colltab",
+    "internal/gen",
+    "internal/tag",
+    "internal/triegen",
+    "internal/ucd",
+    "language",
+    "secure/bidirule",
+    "transform",
+    "unicode/bidi",
+    "unicode/cldr",
+    "unicode/norm",
+    "unicode/rangetable"
+  ]
+  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "gopkg.in/natefinch/lumberjack.v2"
+  packages = ["."]
+  revision = "a96e63847dc3c67d17befa69c303767e2f84e54f"
+  version = "v2.1"
+
+[[projects]]
+  name = "gopkg.in/square/go-jose.v1"
+  packages = [
+    ".",
+    "cipher",
+    "json"
+  ]
+  revision = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5"
+  version = "v2.1.1"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "1f68bed4490068370884abaa296aa651c27b3f2e0d0451a1ab567f059d44f820"
+  solver-name = "gps-cdcl"
+  solver-version = 1

Gopkg.toml

@@ -0,0 +1,70 @@
+[[constraint]]
+  branch = "master"
+  name = "github.com/GeertJohan/go.rice"
+
+[[constraint]]
+  name = "github.com/asdine/storm"
+  version = "2.0.2"
+
+[[constraint]]
+  name = "github.com/dgrijalva/jwt-go"
+  version = "3.1.0"
+
+[[constraint]]
+  name = "github.com/gohugoio/hugo"
+  version = "0.36.1"
+
+[[constraint]]
+  name = "github.com/gorilla/websocket"
+  version = "1.2.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/hacdias/fileutils"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/hacdias/varutils"
+
+[[constraint]]
+  name = "github.com/mholt/archiver"
+# TODO: switch to version when it's available
+# this is for Archiver.Write() which was introduced in 548c791
+  revision = "26cf5bb32d07aa4e8d0de15f56ce516f4641d7df"
+# version = "2.0.0"
+
+[[constraint]]
+  name = "github.com/mholt/caddy"
+  version = "0.10.11"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/mitchellh/mapstructure"
+
+[[constraint]]
+  name = "github.com/robfig/cron"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/spf13/pflag"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/spf13/viper"
+  version = "1.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+
+[[constraint]]
+  name = "gopkg.in/natefinch/lumberjack.v2"
+  version = "2.1.0"
+
+[[override]]
+  name = "github.com/russross/blackfriday"
+  version = "^1.0.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true

caddy/filemanager/filemanager.go

@@ -0,0 +1,52 @@
+package filemanager
+
+import (
+	"net/http"
+
+	"github.com/filebrowser/filebrowser"
+	"github.com/filebrowser/filebrowser/caddy/parser"
+	h "github.com/filebrowser/filebrowser/http"
+	"github.com/mholt/caddy"
+	"github.com/mholt/caddy/caddyhttp/httpserver"
+)
+
+func init() {
+	caddy.RegisterPlugin("filemanager", caddy.Plugin{
+		ServerType: "http",
+		Action:     setup,
+	})
+}
+
+type plugin struct {
+	Next    httpserver.Handler
+	Configs []*filebrowser.FileBrowser
+}
+
+// ServeHTTP determines if the request is for this plugin, and if all prerequisites are met.
+func (f plugin) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
+	for i := range f.Configs {
+		// Checks if this Path should be handled by File Manager.
+		if !httpserver.Path(r.URL.Path).Matches(f.Configs[i].BaseURL) {
+			continue
+		}
+
+		h.Handler(f.Configs[i]).ServeHTTP(w, r)
+		return 0, nil
+	}
+
+	return f.Next.ServeHTTP(w, r)
+}
+
+// setup configures a new FileManager middleware instance.
+func setup(c *caddy.Controller) error {
+	configs, err := parser.Parse(c, "")
+	if err != nil {
+		return err
+	}
+
+	httpserver.GetConfig(c).AddMiddleware(func(next httpserver.Handler) httpserver.Handler {
+		return plugin{Configs: configs, Next: next}
+	})
+
+	return nil
+}

caddy/hugo/hugo.go

@@ -0,0 +1,52 @@
+package hugo
+
+import (
+	"net/http"
+
+	"github.com/filebrowser/filebrowser"
+	"github.com/filebrowser/filebrowser/caddy/parser"
+	h "github.com/filebrowser/filebrowser/http"
+	"github.com/mholt/caddy"
+	"github.com/mholt/caddy/caddyhttp/httpserver"
+)
+
+func init() {
+	caddy.RegisterPlugin("hugo", caddy.Plugin{
+		ServerType: "http",
+		Action:     setup,
+	})
+}
+
+type plugin struct {
+	Next    httpserver.Handler
+	Configs []*filebrowser.FileBrowser
+}
+
+// ServeHTTP determines if the request is for this plugin, and if all prerequisites are met.
+func (f plugin) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
+	for i := range f.Configs {
+		// Checks if this Path should be handled by File Manager.
+		if !httpserver.Path(r.URL.Path).Matches(f.Configs[i].BaseURL) {
+			continue
+		}
+
+		h.Handler(f.Configs[i]).ServeHTTP(w, r)
+		return 0, nil
+	}
+
+	return f.Next.ServeHTTP(w, r)
+}
+
+// setup configures a new FileManager middleware instance.
+func setup(c *caddy.Controller) error {
+	configs, err := parser.Parse(c, "hugo")
+	if err != nil {
+		return err
+	}
+
+	httpserver.GetConfig(c).AddMiddleware(func(next httpserver.Handler) httpserver.Handler {
+		return plugin{Configs: configs, Next: next}
+	})
+
+	return nil
+}

caddy/jekyll/jekyll.go

@@ -0,0 +1,52 @@
+package jekyll
+
+import (
+	"net/http"
+
+	"github.com/filebrowser/filebrowser"
+	"github.com/filebrowser/filebrowser/caddy/parser"
+	h "github.com/filebrowser/filebrowser/http"
+	"github.com/mholt/caddy"
+	"github.com/mholt/caddy/caddyhttp/httpserver"
+)
+
+func init() {
+	caddy.RegisterPlugin("jekyll", caddy.Plugin{
+		ServerType: "http",
+		Action:     setup,
+	})
+}
+
+type plugin struct {
+	Next    httpserver.Handler
+	Configs []*filebrowser.FileBrowser
+}
+
+// ServeHTTP determines if the request is for this plugin, and if all prerequisites are met.
+func (f plugin) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
+	for i := range f.Configs {
+		// Checks if this Path should be handled by File Manager.
+		if !httpserver.Path(r.URL.Path).Matches(f.Configs[i].BaseURL) {
+			continue
+		}
+
+		h.Handler(f.Configs[i]).ServeHTTP(w, r)
+		return 0, nil
+	}
+
+	return f.Next.ServeHTTP(w, r)
+}
+
+// setup configures a new FileManager middleware instance.
+func setup(c *caddy.Controller) error {
+	configs, err := parser.Parse(c, "jekyll")
+	if err != nil {
+		return err
+	}
+
+	httpserver.GetConfig(c).AddMiddleware(func(next httpserver.Handler) httpserver.Handler {
+		return plugin{Configs: configs, Next: next}
+	})
+
+	return nil
+}

caddy/parser/parser.go

@@ -0,0 +1,312 @@
+package parser
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"github.com/asdine/storm"
+	"github.com/filebrowser/filebrowser"
+	"github.com/filebrowser/filebrowser/bolt"
+	"github.com/filebrowser/filebrowser/staticgen"
+	"github.com/hacdias/fileutils"
+	"github.com/mholt/caddy"
+	"github.com/mholt/caddy/caddyhttp/httpserver"
+)
+
+var databases = map[string]*storm.DB{}
+
+// Parse ...
+func Parse(c *caddy.Controller, plugin string) ([]*filebrowser.FileBrowser, error) {
+	var (
+		configs []*filebrowser.FileBrowser
+		err     error
+	)
+
+	for c.Next() {
+		u := &filebrowser.User{
+			Locale:        "en",
+			AllowCommands: true,
+			AllowEdit:     true,
+			AllowNew:      true,
+			AllowPublish:  true,
+			Commands:      []string{"git", "svn", "hg"},
+			CSS:           "",
+			ViewMode:      "mosaic",
+			Rules: []*filebrowser.Rule{{
+				Regex:  true,
+				Allow:  false,
+				Regexp: &filebrowser.Regexp{Raw: "\\/\\..+"},
+			}},
+		}
+
+		baseURL := "/"
+		scope := "."
+		database := ""
+		noAuth := false
+		alterRecaptcha := false
+		reCaptchaKey := ""
+		reCaptchaSecret := ""
+
+		if plugin != "" {
+			baseURL = "/admin"
+		}
+
+		// Get the baseURL and scope
+		args := c.RemainingArgs()
+
+		if plugin == "" {
+			if len(args) >= 1 {
+				baseURL = args[0]
+			}
+
+			if len(args) > 1 {
+				scope = args[1]
+			}
+		} else {
+			if len(args) >= 1 {
+				scope = args[0]
+			}
+
+			if len(args) > 1 {
+				baseURL = args[1]
+			}
+		}
+
+		for c.NextBlock() {
+			switch c.Val() {
+			case "database":
+				if !c.NextArg() {
+					return nil, c.ArgErr()
+				}
+
+				database = c.Val()
+			case "locale":
+				if !c.NextArg() {
+					return nil, c.ArgErr()
+				}
+
+				u.Locale = c.Val()
+			case "allow_commands":
+				if !c.NextArg() {
+					u.AllowCommands = true
+					continue
+				}
+
+				u.AllowCommands, err = strconv.ParseBool(c.Val())
+				if err != nil {
+					return nil, err
+				}
+			case "allow_edit":
+				if !c.NextArg() {
+					u.AllowEdit = true
+					continue
+				}
+
+				u.AllowEdit, err = strconv.ParseBool(c.Val())
+				if err != nil {
+					return nil, err
+				}
+			case "allow_new":
+				if !c.NextArg() {
+					u.AllowNew = true
+					continue
+				}
+
+				u.AllowNew, err = strconv.ParseBool(c.Val())
+				if err != nil {
+					return nil, err
+				}
+			case "allow_publish":
+				if !c.NextArg() {
+					u.AllowPublish = true
+					continue
+				}
+
+				u.AllowPublish, err = strconv.ParseBool(c.Val())
+				if err != nil {
+					return nil, err
+				}
+			case "commands":
+				if !c.NextArg() {
+					return nil, c.ArgErr()
+				}
+
+				u.Commands = strings.Split(c.Val(), " ")
+			case "css":
+				if !c.NextArg() {
+					return nil, c.ArgErr()
+				}
+
+				file := c.Val()
+				css, err := ioutil.ReadFile(file)
+				if err != nil {
+					return nil, err
+				}
+
+				u.CSS = string(css)
+			case "view_mode":
+				if !c.NextArg() {
+					return nil, c.ArgErr()
+				}
+
+				u.ViewMode = c.Val()
+				if u.ViewMode != filebrowser.MosaicViewMode && u.ViewMode != filebrowser.ListViewMode {
+					return nil, c.ArgErr()
+				}
+			case "alternative_recaptcha":
+				if !c.NextArg() {
+					alterRecaptcha = true
+					continue
+				}
+
+				alterRecaptcha, err = strconv.ParseBool(c.Val())
+				if err != nil {
+					return nil, err
+				}
+			case "recaptcha_key":
+				if !c.NextArg() {
+					return nil, c.ArgErr()
+				}
+
+				reCaptchaKey = c.Val()
+			case "recaptcha_secret":
+				if !c.NextArg() {
+					return nil, c.ArgErr()
+				}
+
+				reCaptchaSecret = c.Val()
+			case "no_auth":
+				if !c.NextArg() {
+					noAuth = true
+					continue
+				}
+
+				noAuth, err = strconv.ParseBool(c.Val())
+				if err != nil {
+					return nil, err
+				}
+			}
+		}
+
+		caddyConf := httpserver.GetConfig(c)
+
+		path := filepath.Join(caddy.AssetsPath(), "filemanager")
+		err := os.MkdirAll(path, 0700)
+		if err != nil {
+			return nil, err
+		}
+
+		// if there is a database path and it is not absolute,
+		// it will be relative to Caddy folder.
+		if !filepath.IsAbs(database) && database != "" {
+			database = filepath.Join(path, database)
+		}
+
+		// If there is no database path on the settings,
+		// store one in .caddy/filemanager/name.db.
+		if database == "" {
+			// The name of the database is the hashed value of a string composed
+			// by the host, address path and the baseurl of this File Manager
+			// instance.
+			hasher := md5.New()
+			hasher.Write([]byte(caddyConf.Addr.Host + caddyConf.Addr.Path + baseURL))
+			sha := hex.EncodeToString(hasher.Sum(nil))
+			database = filepath.Join(path, sha+".db")
+
+			fmt.Println("[WARNING] A database is going to be created for your File Manager instance at " + database +
+				". It is highly recommended that you set the 'database' option to '" + sha + ".db'\n")
+		}
+
+		u.Scope = scope
+		u.FileSystem = fileutils.Dir(scope)
+
+		var db *storm.DB
+		if stored, ok := databases[database]; ok {
+			db = stored
+		} else {
+			db, err = storm.Open(database)
+			databases[database] = db
+		}
+
+		if err != nil {
+			return nil, err
+		}
+
+		recaptchaHost := "https://www.google.com"
+		if alterRecaptcha {
+			recaptchaHost = "https://recaptcha.net"
+		}
+
+		m := &filebrowser.FileBrowser{
+			NoAuth:          noAuth,
+			BaseURL:         "",
+			PrefixURL:       "",
+			ReCaptchaHost:   recaptchaHost,
+			ReCaptchaKey:    reCaptchaKey,
+			ReCaptchaSecret: reCaptchaSecret,
+			DefaultUser:     u,
+			Store: &filebrowser.Store{
+				Config: bolt.ConfigStore{DB: db},
+				Users:  bolt.UsersStore{DB: db},
+				Share:  bolt.ShareStore{DB: db},
+			},
+			NewFS: func(scope string) filebrowser.FileSystem {
+				return fileutils.Dir(scope)
+			},
+		}
+
+		err = m.Setup()
+		if err != nil {
+			return nil, err
+		}
+
+		switch plugin {
+		case "hugo":
+			// Initialize the default settings for Hugo.
+			hugo := &staticgen.Hugo{
+				Root:        scope,
+				Public:      filepath.Join(scope, "public"),
+				Args:        []string{},
+				CleanPublic: true,
+			}
+
+			// Attaches Hugo plugin to this file manager instance.
+			err = m.Attach(hugo)
+			if err != nil {
+				return nil, err
+			}
+		case "jekyll":
+			// Initialize the default settings for Jekyll.
+			jekyll := &staticgen.Jekyll{
+				Root:        scope,
+				Public:      filepath.Join(scope, "_site"),
+				Args:        []string{},
+				CleanPublic: true,
+			}
+
+			// Attaches Hugo plugin to this file manager instance.
+			err = m.Attach(jekyll)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		if err != nil {
+			return nil, err
+		}
+
+		m.NoAuth = noAuth
+		m.SetBaseURL(baseURL)
+		m.SetPrefixURL(strings.TrimSuffix(caddyConf.Addr.Path, "/"))
+
+		configs = append(configs, m)
+	}
+
+	return configs, nil
+}

cmd/filebrowser/main.go

@@ -44,6 +44,7 @@ var (
 	allowNew        bool
 	allowPublish    bool
 	showVer         bool
+	alterRecaptcha  bool
 )
 
 func init() {
@@ -64,6 +65,7 @@ func init() {
 	flag.BoolVar(&allowPublish, "allow-publish", true, "Default allow publish option for new users")
 	flag.BoolVar(&allowNew, "allow-new", true, "Default allow new option for new users")
 	flag.BoolVar(&noAuth, "no-auth", false, "Disables authentication")
+	flag.BoolVar(&alterRecaptcha, "alternative-recaptcha", false, "Use recaptcha.net for serving and handling, useful in China")
 	flag.StringVar(&locale, "locale", "", "Default locale for new users, set it empty to enable auto detect from browser")
 	flag.StringVar(&staticg, "staticgen", "", "Static Generator you want to enable")
 	flag.BoolVarP(&showVer, "version", "v", false, "Show version")
@@ -86,6 +88,7 @@ func setupViper() {
 	viper.SetDefault("BaseURL", "")
 	viper.SetDefault("PrefixURL", "")
 	viper.SetDefault("ViewMode", filebrowser.MosaicViewMode)
+	viper.SetDefault("AlternativeRecaptcha", false)
 	viper.SetDefault("ReCaptchaKey", "")
 	viper.SetDefault("ReCaptchaSecret", "")
 
@@ -105,6 +108,7 @@ func setupViper() {
 	viper.BindPFlag("BaseURL", flag.Lookup("baseurl"))
 	viper.BindPFlag("PrefixURL", flag.Lookup("prefixurl"))
 	viper.BindPFlag("ViewMode", flag.Lookup("view-mode"))
+	viper.BindPFlag("AlternativeRecaptcha", flag.Lookup("alternative-recaptcha"))
 	viper.BindPFlag("ReCaptchaKey", flag.Lookup("recaptcha-key"))
 	viper.BindPFlag("ReCaptchaSecret", flag.Lookup("recaptcha-secret"))
 
@@ -186,10 +190,16 @@ func handler() http.Handler {
 		log.Fatal(err)
 	}
 
+	recaptchaHost := "https://www.google.com"
+	if viper.GetBool("AlternativeRecaptcha") {
+		recaptchaHost = "https://recaptcha.net"
+	}
+
 	fm := &filebrowser.FileBrowser{
 		NoAuth:          viper.GetBool("NoAuth"),
 		BaseURL:         viper.GetString("BaseURL"),
 		PrefixURL:       viper.GetString("PrefixURL"),
+		ReCaptchaHost:   recaptchaHost,
 		ReCaptchaKey:    viper.GetString("ReCaptchaKey"),
 		ReCaptchaSecret: viper.GetString("ReCaptchaSecret"),
 		DefaultUser: &filebrowser.User{

file.go

@@ -134,13 +134,12 @@ func (i *File) GetListing(u *User, r *http.Request) error {
 		}
 
 		if strings.HasPrefix(f.Mode().String(), "L") {
-			// It's a symbolic link
-			// The FileInfo from Readdir treats symbolic link as a file only.
+			// It's a symbolic link. We try to follow it. If it doesn't work,
+			// we stay with the link information instead if the target's.
 			info, err := os.Stat(f.Name())
-			if err != nil {
-				return err
+			if err == nil {
+				f = info
 			}
-			f = info
 		}
 
 		if f.IsDir() {

filebrowser.go

@@ -23,7 +23,7 @@ import (
 
 const (
 	// Version is the current File Manager version.
-	Version = "1.5.0"
+	Version = "1.7.0"
 
 	ListViewMode   = "list"
 	MosaicViewMode = "mosaic"
@@ -71,7 +71,8 @@ type FileBrowser struct {
 	// there will only exist one user, called "admin".
 	NoAuth bool
 
-	// ReCaptcha Site key and secret.
+	// ReCaptcha host, key and secret.
+	ReCaptchaHost   string
 	ReCaptchaKey    string
 	ReCaptchaSecret string
 

http/auth.go

@@ -12,7 +12,7 @@ import (
 	fm "github.com/filebrowser/filebrowser"
 )
 
-const reCaptchaAPI = "https://www.google.com/recaptcha/api/siteverify"
+const reCaptchaAPI = "/recaptcha/api/siteverify"
 
 type cred struct {
 	Password  string `json:"password"`
@@ -21,14 +21,14 @@ type cred struct {
 }
 
 // reCaptcha checks the reCaptcha code.
-func reCaptcha(secret string, response string) (bool, error) {
+func reCaptcha(host, secret, response string) (bool, error) {
 	body := url.Values{}
 	body.Set("secret", secret)
 	body.Add("response", response)
 
 	client := &http.Client{}
 
-	resp, err := client.Post(reCaptchaAPI, "application/x-www-form-urlencoded", strings.NewReader(body.Encode()))
+	resp, err := client.Post(host+reCaptchaAPI, "application/x-www-form-urlencoded", strings.NewReader(body.Encode()))
 	if err != nil {
 		return false, err
 	}
@@ -69,7 +69,7 @@ func authHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, er
 
 	// If ReCaptcha is enabled, check the code.
 	if len(c.ReCaptchaSecret) > 0 {
-		ok, err := reCaptcha(c.ReCaptchaSecret, cred.ReCaptcha)
+		ok, err := reCaptcha(c.ReCaptchaHost, c.ReCaptchaSecret, cred.ReCaptcha)
 		if err != nil {
 			return http.StatusForbidden, err
 		}

http/http.go

@@ -223,12 +223,13 @@ func renderFile(c *fm.Context, w http.ResponseWriter, file string) (int, error)
 	w.Header().Set("Content-Type", contentType+"; charset=utf-8")
 
 	data := map[string]interface{}{
-		"BaseURL":      c.RootURL(),
-		"NoAuth":       c.NoAuth,
-		"Version":      fm.Version,
-		"CSS":          template.CSS(c.CSS),
-		"ReCaptcha":    c.ReCaptchaKey != "" && c.ReCaptchaSecret != "",
-		"ReCaptchaKey": c.ReCaptchaKey,
+		"BaseURL":       c.RootURL(),
+		"NoAuth":        c.NoAuth,
+		"Version":       fm.Version,
+		"CSS":           template.CSS(c.CSS),
+		"ReCaptcha":     c.ReCaptchaKey != "" && c.ReCaptchaSecret != "",
+		"ReCaptchaHost": c.ReCaptchaHost,
+		"ReCaptchaKey":  c.ReCaptchaKey,
 	}
 
 	if c.StaticGen != nil {

http/settings.go

@@ -11,7 +11,7 @@ import (
 )
 
 type modifySettingsRequest struct {
-	*modifyRequest
+	modifyRequest
 	Data struct {
 		CSS       string                 `json:"css"`
 		Commands  map[string][]string    `json:"commands"`

http/share.go

@@ -1,7 +1,7 @@
 package http
 
 import (
-	"encoding/hex"
+	"encoding/base64"
 	"net/http"
 	"path/filepath"
 	"strconv"
@@ -67,12 +67,12 @@ func sharePostHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (in
 		}
 	}
 
-	bytes, err := fm.GenerateRandomBytes(32)
+	bytes, err := fm.GenerateRandomBytes(6)
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
-	str := hex.EncodeToString(bytes)
+	str := base64.URLEncoding.EncodeToString(bytes)
 
 	s = &fm.ShareLink{
 		Path:    path,

http/users.go

@@ -18,7 +18,7 @@ type modifyRequest struct {
 }
 
 type modifyUserRequest struct {
-	*modifyRequest
+	modifyRequest
 	Data *fm.User `json:"data"`
 }
 

package.json

@@ -3,6 +3,6 @@
   "author": "File Browser contributors",
   "private": true,
   "dependencies": {
-    "filebrowser-frontend": "^1.0.2"
+    "filebrowser-frontend": "1.2.0"
   }
 }

rice-box.go.REMOVED.git-id

@@ -1 +1 @@
-26d1ae7f36e23f48110c279ac4c9e8222a803fe2
+1cc4a2b953e20dc9d36a8a240d446b5fa179dc26