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
chore: update dependencies
2018-03-10 13:25:46 +00:00 · 2018-03-10 13:25:11 +00:00 · 2018-03-10 09:00:56 +00:00 · 2018-03-10 09:00:46 +00:00 · 2018-03-10 09:00:24 +00:00 · 2018-02-27 17:12:54 +00:00
14 changed files with 576 additions and 53 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,9 @@ jobs:
      - 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:
@@ -32,11 +34,12 @@ jobs:
      - 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.10
@@ -46,9 +49,9 @@ jobs:
      - 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
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ yarn-error.log*
 .idea
 .vscode
 package-lock.json
-yarn.lock
+yarn.lock
+vendor
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -15,10 +15,6 @@ build:
    - 386
    - arm
    - arm64
-    - mips
-    - mips64
-    - mipsle
-    - mips64le
  ignore:
    - goos: openbsd
      goarch: arm
--- a/49
+++ b/49
@@ -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"]
--- a/Gopkg.lock
+++ b/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
--- a/Gopkg.toml
+++ b/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
--- a/caddy/parser/parser.go
+++ b/caddy/parser/parser.go
@@ -49,6 +49,7 @@ func Parse(c *caddy.Controller, plugin string) ([]*filebrowser.FileBrowser, erro
 		scope := "."
 		database := ""
 		noAuth := false
+		alterRecaptcha := false
 		reCaptchaKey := ""
 		reCaptchaSecret := ""

@@ -158,6 +159,16 @@ func Parse(c *caddy.Controller, plugin string) ([]*filebrowser.FileBrowser, erro
 				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()
@@ -227,10 +238,16 @@ func Parse(c *caddy.Controller, plugin string) ([]*filebrowser.FileBrowser, erro
 			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,
--- a/cmd/filebrowser/main.go
+++ b/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{
--- a/filebrowser.go
+++ b/filebrowser.go
@@ -23,7 +23,7 @@ import (

 const (
 	// Version is the current File Manager version.
-	Version = "1.5.5"
+	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

--- a/http/auth.go
+++ b/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
 		}
--- a/http/http.go
+++ b/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 {
--- a/http/share.go
+++ b/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,
--- a/package.json
+++ b/package.json
@@ -3,6 +3,6 @@
  "author": "File Browser contributors",
  "private": true,
  "dependencies": {
-    "filebrowser-frontend": "1.0.4"
+    "filebrowser-frontend": "1.2.0"
  }
 }
--- a/rice-box.go.REMOVED.git-id
+++ b/rice-box.go.REMOVED.git-id
@@ -1 +1 @@
-0f76698881872d56d49a72ede19f45c0ef58cbca
+1cc4a2b953e20dc9d36a8a240d446b5fa179dc26
Author	SHA1	Message	Date
Henrique Dias	2d63c288e4	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	2018-03-10 13:25:46 +00:00
Henrique Dias	218a96eebd	chore: update dependencies Former-commit-id: 17c4e043823582d827f3de6a50fc48f2c60250a7 [formerly b1783b936da0e7ede97e128c0d73d20c4c0f5c1b] [formerly b170eca4528721f3269451f6fabeffa54d08fcb9 [formerly `fbf49d61d6`]] Former-commit-id: b34516564cf6520f8c21693e287c092bc65b76e9 [formerly b45a4f2367831aee0e5def4096e34b6afb4b8a83] Former-commit-id: b06ebe48ba6311fa50488aa26b0cc74118d4dfd7	2018-03-10 13:25:11 +00:00
Henrique Dias	4fbef557ee	chore: setting untracked version [ci skip] Former-commit-id: 0fbfd17b4531b45f781fb8517eb155ec953a98f2 [formerly 3a6821e11c979bc638eeb1d31458f1ff7605f69e] [formerly 0ecb209c4172fc504860f25325e03d78f4a12408 [formerly `dc97fb7dc6`]] Former-commit-id: 18dc494d9c4b250dc451316ee6c342e0bc26a5e0 [formerly e375068391bba6b1e4c477895bcf054574c7865a] Former-commit-id: eed4fd2cddeb199b22843a293e8471cb3a40ab0a	2018-03-10 09:00:56 +00:00
Henrique Dias	0a4c803650	chore: version 1.6.0 Former-commit-id: 9b5297726d87eb6617a8c99a1f8e23c9b4d7f1e2 [formerly e227cf02e128ba194fba68f9aca3ea61476e65f4] [formerly 4d23059dc7db2615079ea2364ea5db10663a27e5 [formerly `5f9d216542`]] Former-commit-id: 7676703b8cf5c681fd671a7fe457f4bcdeafcdc2 [formerly 13e2b075b1db00a8de95742ac1a377bdb8272585] Former-commit-id: 64bfe1b140a3d98c1e6c77b1d225cfb7e5ed5055	2018-03-10 09:00:46 +00:00
Henrique Dias	68c5b8cd52	chore: remove failing arches Former-commit-id: bca9d8ef1c447c295b564711e52271c233ee76aa [formerly a8b9b2c7706199b9e655f77f51193540af9dcdaa] [formerly e03e1f77be77d2f9ae853472c03197183e3d000e [formerly `4c197176fc`]] Former-commit-id: 0a904664f8bf4177eb1e573a3dbd2e71ffbd86b4 [formerly 74c0785f2cd7b5c92c910f9043b9ccc06433acbc] Former-commit-id: 70a547ce5220e833f393a9c94b1d70c76fa708d1	2018-03-10 09:00:24 +00:00
Equim	0cff87be24	alternative ReCaptcha, close #366 Former-commit-id: c8c9baff75891868283bd353c83a19d38e6bc0e9 [formerly 88aeffc35a402c44c9c92a534c8cd271124826a7] [formerly 39cfd0e090894509e913100aa2f9b325ad6e5b68 [formerly `6e1c6a4a8c`]] Former-commit-id: a49c1046af3ba28c469e93e7d88013f5a6b1d062 [formerly 07c801b64ed03b187bb1dd9bbfb502b92572af44] Former-commit-id: aa69ed3d4d78f8942b8b2c924c73c8e4c4965520	2018-02-27 17:12:54 +00:00
Equim	a2fcb8b3b0	feat: 6 bytes version of share link, close #331 Former-commit-id: a4a4edf89a32e9b8338474eb3322de69e12da83e [formerly 57124e6118adfbf0ae38ec77ce6816f6351174ad] [formerly 6d9e5b81bf0f52373147cb46d3c71d7e8e1362a7 [formerly `f0a703baa7`]] Former-commit-id: 7da431b8bf791bdfe66fca2b0f87fc4b4918543b [formerly 4d02e3f0a697b912fb639b09857ae5daa0851ebf] Former-commit-id: 87af8b945b414dad82d1c6769d6ec014e097aa22	2018-02-27 17:06:23 +00:00
Equim	5eb9e95720	chore: use dep to manage vendor (#364 ) Former-commit-id: a5262bb5a3ca329e8d9d7f68bbcd932bcd4f5aa0 [formerly 38cda564a25a09a12a849a5ac756b55e895d8ac7] [formerly b70c0cf897f19e468259148fc75e9a60de5252ab [formerly `a184b775b3`]] Former-commit-id: 1de8ed7a5b316b7a64cad814c0efc80b67a9668f [formerly 5ef584fce122832b7e9200e6a7c6259a2b0e3c09] Former-commit-id: 7e11fda1d06bd57d16a03a17d7c3a644e46c451a	2018-02-25 08:55:48 +00:00
Henrique Dias	967d4e28de	chore: setting untracked version [ci skip] Former-commit-id: 093104cb4d68178bf5de22289d58c465fca10552 [formerly 17499e5eec1c3c54f9e1c699818ea823be3d6728] [formerly 0e561b7ea77348ba12e29173607062c6badccc88 [formerly `4bd2e8e333`]] Former-commit-id: 992c37c538e5aa2aec9b6504cf836f2dd6aea2c9 [formerly cf3727500421de16876ddc84462d48b5600e1946] Former-commit-id: af2ab326c2092bc169a44622e56b10000d6091dc	2018-02-24 08:45:44 +00:00