Version 1.4.2

Former-commit-id: 6dab389efe4eed59f8f39d76e60130ccc74a13ea [formerly 8e106da6d1e25e04a26654435bb180793cc87c3d] [formerly cf02028f5fb706a296a8320fa1d54f222d02f78f [formerly 02f6bb81ccf9c39ea7b1174aa79bd9d2881e0245]]
Former-commit-id: b903fc7a2bf4fdad3a8c89a67b34d99fb3273c35 [formerly 6ea119c7468502d2244108600f0389eb05b502a3]
Former-commit-id: 96de8cafcd6c1ce94f05854a9fb2e9aa3d99eafb

.gitignore

@@ -8,3 +8,5 @@ yarn-debug.log*
 yarn-error.log*
 .idea
 .vscode
+package-lock.json
+yarn.lock

.goreleaser.yml

@@ -8,11 +8,17 @@ build:
     - freebsd
     - netbsd
     - openbsd
+    - dragonfly
+    - solaris
   goarch:
     - amd64
     - 386
     - arm
     - arm64
+    - mips
+    - mips64
+    - mipsle
+    - mips64le
   ignore:
     - goos: openbsd
       goarch: arm
@@ -20,6 +26,8 @@ build:
     - goos: freebsd
       goarch: arm
       goarm: 6
+    - goos: linux
+      goarch: arm64
 
 archive:
   name_template: "{{.Os}}-{{.Arch}}-{{ .ProjectName }}"

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 If you want to contribute or want to build the code from source, you will need to have the most recent version of Go and, if you want to change the static assets (JS, CSS, ...), Node.js installed on your computer. To start developing, you just need to do the following:
 
-1. `go get github.com/hacdias/filemanager`
+1. `go get github.com/hacdias/filemanager/cmd/filemanager`
 2. `cd $GOPATH/src/github.com/hacdias/filemanager`
 3. `npm install`
 4. `npm run dev` - regenerates the static assets automatically

assets/src/components/prompts/NewArchetype.vue

@@ -48,6 +48,10 @@ export default {
     new (url, type) {
       url = removePrefix(url)
 
+      if (!url.endsWith('.md') && !url.endsWith('.markdown')) {
+        url += '.markdown'
+      }
+
       return new Promise((resolve, reject) => {
         let request = new window.XMLHttpRequest()
         request.open('POST', `${this.$store.state.baseURL}/api/resource${url}`, true)

assets/src/utils/auth.js

@@ -1,13 +1,18 @@
 import cookie from './cookie'
 import store from '@/store'
 import router from '@/router'
+import { Base64 } from 'js-base64'
 
 function parseToken (token) {
   let path = store.state.baseURL
   if (path === '') path = '/'
   document.cookie = `auth=${token}; max-age=86400; path=${path}`
   let res = token.split('.')
-  let user = JSON.parse(window.atob(res[1]))
+  let user = JSON.parse(Base64.decode(res[1]))
+  if (!user.commands) {
+    user.commands = []
+  }
+
   store.commit('setJWT', token)
   store.commit('setUser', user)
 }

assets/src/views/settings/User.vue

@@ -163,11 +163,14 @@ export default {
         this.lockPassword = user.lockPassword
         this.filesystem = user.filesystem
         this.username = user.username
-        this.commands = user.commands.join(' ')
         this.css = user.css
         this.permissions = user.permissions
         this.locale = user.locale
 
+        if (user.commands) {
+          this.commands = user.commands.join(' ')
+        }
+
         for (let rule of user.rules) {
           if (rule.allow) {
             this.rules += 'allow '

caddy/parser/parser.go

@@ -37,6 +37,7 @@ func Parse(c *caddy.Controller, plugin string) ([]*filemanager.FileManager, erro
 			AllowPublish:  true,
 			Commands:      []string{"git", "svn", "hg"},
 			CSS:           "",
+			ViewMode:      "mosaic",
 			Rules: []*filemanager.Rule{{
 				Regex:  true,
 				Allow:  false,

filemanager.go

@@ -23,7 +23,7 @@ import (
 
 const (
 	// Version is the current File Manager version.
-	Version = "1.3.11"
+	Version = "1.4.2"
 
 	ListViewMode   = "list"
 	MosaicViewMode = "mosaic"

http/download.go

@@ -111,6 +111,17 @@ func downloadFileHandler(c *fm.Context, w http.ResponseWriter, r *http.Request)
 		w.Header().Set("Content-Disposition", `attachment; filename="`+c.File.Name+`"`)
 	}
 
-	http.ServeFile(w, r, c.File.Path)
+	file, err := os.Open(c.File.Path)
+	defer file.Close()
+
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+
+	_, err = io.Copy(w, file)
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+
 	return 0, nil
 }

package.json

@@ -12,6 +12,7 @@
     "clipboard": "^1.7.1",
     "codemirror": "^5.31.0",
     "filesize": "^3.5.11",
+    "js-base64": "^2.4.0",
     "moment": "^2.19.2",
     "normalize.css": "^7.0.0",
     "noty": "^3.1.3",

rice-box.go.REMOVED.git-id

@@ -1 +1 @@
-c6f470b346d636fddb53d5272ac4b421592270ff
+6e37237fbee662acdaf51c879107db450ea135ed

staticgen/hugo.go

@@ -84,7 +84,8 @@ func (h Hugo) Hook(c *fm.Context, w http.ResponseWriter, r *http.Request) (int,
 		return http.StatusForbidden, nil
 	}
 
-	filename := filepath.Join(c.User.Scope, r.URL.Path)
+	filename := filepath.Clean(r.URL.Path)
+	filename = strings.TrimPrefix(filename, string(filepath.Separator))
 	archetype := r.Header.Get("archetype")
 
 	ext := filepath.Ext(filename)