chore: version 1.5.4

Former-commit-id: 1ad07843678a00d0f24d490dbdbbe5c211782c91 [formerly f0328a485087490f0f6fb1bdb8751ce0377edb63] [formerly 381a1863aa910ba03b89b47769b575f6dc2869d6 [formerly 83af6f2720]]
Former-commit-id: 8bdb8c1913820d84a3b504a7d55c98cd675baa58 [formerly 6b84fde09c4e03b8d9504d9786ae953e69d83402]
Former-commit-id: 9ddd4867df78fcbf7cd8302ab408fef3cdbf8906

.circleci/config.yml

@@ -2,7 +2,7 @@ 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
@@ -16,6 +16,7 @@ jobs:
           name: Run linting
           command: |
             gometalinter --exclude="rice-box.go" \
+              --deadline=300s \
               -D goconst \
               -D gocyclo \
               -D vetshadow \
@@ -24,7 +25,7 @@ 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
@@ -38,7 +39,7 @@ jobs:
           command: go build
   deploy:
     docker:
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.10
     working_directory: /go/src/github.com/filebrowser/filebrowser
     steps:
       - checkout

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.2"
+	Version = "1.5.4"
 
 	ListViewMode   = "list"
 	MosaicViewMode = "mosaic"

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/users.go

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

rice-box.go.REMOVED.git-id

@@ -1 +1 @@
-bf6bef64f1544a286116fe3a9366ac9addaa2dd5
+5bd14248e5562ade588c7130164631df6583f8a6