chore: version 1.4.5

Former-commit-id: c1c687c85477814782ac1c37f1153222cbd66aac [formerly 62f611d73f4a94b1a8c38be469edbe4b9f15b128] [formerly b18279cba8d103941a0c999e212fba4b4c36d1f1 [formerly e1836e2274]]
Former-commit-id: e735874c31bd3f07fefcc528e63e83520b1ccf8a [formerly 121a4fd4096b00d3a03df57bb6872f02cca94a47]
Former-commit-id: 79f9ba3aff8aab04125277fc8298aaf3416d3648

.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

README.md

@@ -73,7 +73,3 @@ this are keywords case:insensitive
 # Contributing
 
 The contributing guidelines can be found [here](https://github.com/hacdias/filemanager/blob/master/CONTRIBUTING.md).
-
-# Donate
-
-Enjoying this project? You can [donate to its creator](https://henriquedias.com/donate/). He will appreciate.

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/i18n/zh-cn.yaml

@@ -134,7 +134,7 @@ settings:
     您可以将该用户设置为管理员，也可以单独选择各项权限。\
     如果选择了“管理员”，则其他的选项会被自动勾上，\
     同时该用户可以管理其他用户。"
-  profileSettings: 配置文件设置
+  profileSettings: 个人设置
   ruleExample1: "\
     阻止用户访问所有文件夹下任何以 . 开头的文件\
     (隐藏文件, 例如: .git, .gitignore)。"

assets/src/i18n/zh-tw.yaml

@@ -134,7 +134,7 @@ settings:
     您可以將該使用者設置為管理員，也可以單獨選擇各項權限。\
     如果選擇了“管理員”，則其他的選項會被自動勾上，\
     同時該使用者可以管理其他使用者。"
-  profileSettings: 設定檔設定
+  profileSettings: 個人設定
   ruleExample1: "\
     封鎖使用者存取所有資料夾下任何以 . 開頭的檔案\
     (隱藏文件, 例如: .git, .gitignore)。"

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

@@ -53,7 +53,7 @@
         <p class="small"><strong>{{ $t('settings.examples') }}</strong></p>
 
         <ul class="small">
-          <li><code>disallow regex \\/\\..+</code> - {{ $t('settings.ruleExample1') }}</li>
+          <li><code>disallow regex [\\\/]\..+</code> - {{ $t('settings.ruleExample1') }}</li>
           <li><code>disallow /Caddyfile</code> - {{ $t('settings.ruleExample2') }}</li>
         </ul>
 
@@ -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 '

build.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Install rice tool if not present
 if ! [ -x "$(command -v rice)" ]; then

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.5"
 
 	ListViewMode   = "list"
 	MosaicViewMode = "mosaic"

http/download.go

@@ -1,8 +1,6 @@
 package http
 
 import (
-	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -45,72 +43,61 @@ func downloadHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int
 		files = append(files, c.File.Path)
 	}
 
-	// If the format is true, just set it to "zip".
-	if query == "true" || query == "" {
-		query = "zip"
-	}
-
 	var (
 		extension string
-		temp      string
-		err       error
-		tempfile  string
+		ar        archiver.Archiver
 	)
 
-	// Create a temporary directory.
-	temp, err = ioutil.TempDir("", "")
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	defer os.RemoveAll(temp)
-
-	tempfile = filepath.Join(temp, "temp")
-
 	switch query {
-	case "zip":
-		extension, err = ".zip", archiver.Zip.Make(tempfile, files)
+	// If the format is true, just set it to "zip".
+	case "zip", "true", "":
+		extension, ar = ".zip", archiver.Zip
 	case "tar":
-		extension, err = ".tar", archiver.Tar.Make(tempfile, files)
+		extension, ar = ".tar", archiver.Tar
 	case "targz":
-		extension, err = ".tar.gz", archiver.TarGz.Make(tempfile, files)
+		extension, ar = ".tar.gz", archiver.TarGz
 	case "tarbz2":
-		extension, err = ".tar.bz2", archiver.TarBz2.Make(tempfile, files)
+		extension, ar = ".tar.bz2", archiver.TarBz2
 	case "tarxz":
-		extension, err = ".tar.xz", archiver.TarXZ.Make(tempfile, files)
+		extension, ar = ".tar.xz", archiver.TarXZ
 	default:
 		return http.StatusNotImplemented, nil
 	}
 
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-
 	// Defines the file name.
 	name := c.File.Name
 	if name == "." || name == "" {
-		name = "download"
+		name = "archive"
 	}
 	name += extension
 
-	// Opens the file so it can be downloaded.
-	file, err := os.Open(temp + "/temp")
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	defer file.Close()
+	w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.QueryEscape(name))
+	err := ar.Write(w, files)
 
-	w.Header().Set("Content-Disposition", "attachment; filename=\""+name+"\"")
-	_, err = io.Copy(w, file)
 	return 0, err
 }
 
 func downloadFileHandler(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error) {
+	file, err := os.Open(c.File.Path)
+	defer file.Close()
+
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+
+	stat, err := file.Stat()
+	if err != nil {
+		return http.StatusInternalServerError, err
+	}
+
 	if r.URL.Query().Get("inline") == "true" {
 		w.Header().Set("Content-Disposition", "inline")
 	} else {
-		w.Header().Set("Content-Disposition", `attachment; filename="`+c.File.Name+`"`)
+		// As per RFC6266 section 4.3
+		w.Header().Set("Content-Disposition", "attachment; filename*=utf-8''"+url.QueryEscape(c.File.Name))
 	}
 
-	http.ServeFile(w, r, c.File.Path)
+	http.ServeContent(w, r, stat.Name(), stat.ModTime(), file)
+
 	return 0, nil
 }

package.json

@@ -12,11 +12,12 @@
     "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",
+    "noty": "^3.1.4",
     "vue": "^2.5.8",
-    "vue-i18n": "^7.3.2",
+    "vue-i18n": "^7.3.4",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
   },
@@ -33,7 +34,7 @@
     "connect-history-api-fallback": "^1.5.0",
     "copy-webpack-plugin": "^4.2.1",
     "css-loader": "^0.28.7",
-    "eslint": "^4.11.0",
+    "eslint": "^4.15.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-friendly-formatter": "^3.0.0",
     "eslint-loader": "^1.9.0",
@@ -63,7 +64,7 @@
     "vue-template-compiler": "^2.5.8",
     "webpack": "^3.8.1",
     "webpack-bundle-analyzer": "^2.9.1",
-    "webpack-dev-middleware": "^1.12.0",
+    "webpack-dev-middleware": "^2.0.4",
     "webpack-hot-middleware": "^2.20.0",
     "webpack-merge": "^4.1.1",
     "yml-loader": "^2.1.0"

publish.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 echo "Building assets"
 ./build.sh
@@ -8,7 +9,7 @@ sed -i "s|(untracked)|$1|g" filemanager.go
 
 echo "Commiting..."
 git add -A
-git commit -m "Version $1"
+git commit -m "chore: version $1"
 git push
 
 echo "Creating the tag..."
@@ -18,7 +19,7 @@ git push --tags
 echo "Commiting untracked version notice..."
 sed -i "s|$1|(untracked)|g" filemanager.go
 git add -A
-git commit -m "[ci skip] auto: setting untracked version"
+git commit -m "chore: setting untracked version [ci skip]"
 git push
 
 echo "Done!"

rice-box.go.REMOVED.git-id

@@ -1 +1 @@
-c6f470b346d636fddb53d5272ac4b421592270ff
+0333464bb0a238393150731bc833fa4aa3b7ec60

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)