Merge pull request #45 from pldubouilh/phone-pics-nav

bump ui

.github/workflows/go.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.12
+    - name: Set up Go 1.13
       uses: actions/setup-go@v1
       with:
-        go-version: 1.12
+        go-version: 1.13
       id: go
 
     - name: Check out code into the Go module directory
@@ -19,4 +19,4 @@ jobs:
         submodules: true
 
     - name: Run
-      run: make ci
+      run: make test

.gitignore

@@ -4,6 +4,7 @@ gossa-linux-arm
 gossa-linux-arm64
 gossa-mac
 gossa-windows.exe
+gossa_test.go
 
 .vscode
 test-fixture/*

Makefile

@@ -6,29 +6,32 @@ build:
 	rm gossa.go
 
 run:
-	make build
 	./gossa -verb=true test-fixture
 
+run-ro:
+	./gossa -verb=true -ro=true test-fixture
+
 run-extra:
-	make build
 	./gossa -verb=true -prefix="/fancy-path/" -k=false -symlinks=true test-fixture
 
-ci:
+test:
-	-@cd test-fixture && ln -s ../support .
 	make build
-	timeout 15 make run &
+	-rm gossa_test.go
-	sleep 16 && timeout 15 make run-extra &
+	-@cd test-fixture && ln -s ../support .
-	cp src/gossa_test.go . && go test
+	cp src/gossa_test.go .
-	rm gossa_test.go
+	go test
 
 watch:
-	ls src/* gossa-ui/* | entr -rc make run
+	ls src/* gossa-ui/* | entr -rc make build run
 
 watch-extra:
-	ls src/* gossa-ui/* | entr -rc make run-extra
+	ls src/* gossa-ui/* | entr -rc make build run-extra
 
-watch-ci:
+watch-ro:
-	ls src/* gossa-ui/* | entr -rc make ci
+	ls src/* gossa-ui/* | entr -rc make build run-ro
+
+watch-test:
+	ls src/* gossa-ui/* | entr -rc make test
 
 build-all:
 	cp src/gossa.go gossa.go

readme.md

@@ -1,7 +1,7 @@
 gossa
 =============
 
-![e](https://user-images.githubusercontent.com/760637/64541706-a3163080-d322-11e9-85ef-a4d8001fa6a5.gif)
+![e](https://user-images.githubusercontent.com/760637/71449335-790a4200-274a-11ea-80be-4c536fbad8a1.gif)
 
 [![build status](https://github.com/pldubouilh/gossa/workflows/ci/badge.svg)](https://github.com/pldubouilh/gossa/actions)
 [![docker build status](https://img.shields.io/docker/cloud/build/pldubouilh/gossa.svg?logo=docker)](https://hub.docker.com/r/pldubouilh/gossa)
@@ -14,13 +14,14 @@ a [simple UI](https://github.com/pldubouilh/gossa-ui) comes as default, featurin
 
   * 🔍 files/directories browser
   * 📩 drag-and-drop file/directory uploader
+  * 🚀 lightweight, default ui weights 110kB and prints in ms
   * 🗺️ files handling - move/rename/delete
   * 📸 picture browser
   * 📽️ video streaming
   * ✍️ simple text editor
   * ⌨️ keyboard shortcuts
-  * 🥂 speed - will easily fill available bandwidth
+  * 🥂 fast golang static server, easily fills available bandwidth
-  * 🔒 safe - easy/secure multi account setup
+  * 🔒 easy/secure multi account setup
 
 ### build
 built blobs are available on the [release page](https://github.com/pldubouilh/gossa/releases) - or simply `make build` this repo.

src/gossa.go

@@ -14,17 +14,18 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"sort"
 	"strconv"
 	"strings"
 )
 
 var host = flag.String("h", "127.0.0.1", "host to listen to")
 var port = flag.String("p", "8001", "port to listen to")
-var history = flag.Bool("history", true, "keep history for paths visited. default location is path/.gossa_history")
 var extraPath = flag.String("prefix", "/", "url prefix at which gossa can be reached, e.g. /gossa/ (slashes of importance)")
 var symlinks = flag.Bool("symlinks", false, "follow symlinks \033[4mWARNING\033[0m: symlinks will by nature allow to escape the defined path (default: false)")
 var verb = flag.Bool("verb", false, "verbosity")
 var skipHidden = flag.Bool("k", true, "\nskip hidden files")
+var ro = flag.Bool("ro", false, "read only mode (no upload, rename, move, etc...)")
 var initPath = "."
 
 var fs http.Handler
@@ -40,6 +41,7 @@ type rowTemplate struct {
 type pageTemplate struct {
 	Title       template.HTML
 	ExtraPath   template.HTML
+	Ro          bool
 	RowsFiles   []rowTemplate
 	RowsFolders []rowTemplate
 }
@@ -77,9 +79,11 @@ func humanize(bytes int64) string {
 	}
 }
 
-func replyList(w http.ResponseWriter, r *http.Request, fullPath string, path string) {
+func replyList(w http.ResponseWriter, fullPath string, path string) {
 	_files, err := ioutil.ReadDir(fullPath)
 	check(err)
+	sort.Slice(_files, func(i, j int) bool { return strings.ToLower(_files[i].Name()) < strings.ToLower(_files[j].Name()) })
+
 	if !strings.HasSuffix(path, "/") {
 		path += "/"
 	}
@@ -90,6 +94,7 @@ func replyList(w http.ResponseWriter, r *http.Request, fullPath string, path str
 		p.RowsFolders = append(p.RowsFolders, rowTemplate{"../", "../", "", "folder"})
 	}
 	p.ExtraPath = template.HTML(html.EscapeString(*extraPath))
+	p.Ro = *ro
 	p.Title = template.HTML(html.EscapeString(title))
 
 	for _, el := range _files {
@@ -105,7 +110,8 @@ func replyList(w http.ResponseWriter, r *http.Request, fullPath string, path str
 			p.RowsFolders = append(p.RowsFolders, rowTemplate{el.Name() + "/", template.HTML(href), "", "folder"})
 		} else {
 			sl := strings.Split(el.Name(), ".")
-			p.RowsFiles = append(p.RowsFiles, rowTemplate{el.Name(), template.HTML(href), humanize(el.Size()), strings.ToLower(sl[len(sl)-1])})
+			ext := strings.ToLower(sl[len(sl)-1])
+			p.RowsFiles = append(p.RowsFiles, rowTemplate{el.Name(), template.HTML(href), humanize(el.Size()), ext})
 		}
 	}
 
@@ -125,7 +131,7 @@ func doContent(w http.ResponseWriter, r *http.Request) {
 	check(errStat)
 
 	if stat.IsDir() {
-		replyList(w, r, fullPath, path)
+		replyList(w, fullPath, path)
 	} else {
 		fs.ServeHTTP(w, r)
 	}
@@ -147,7 +153,6 @@ func rpc(w http.ResponseWriter, r *http.Request) {
 	bodyBytes, _ := ioutil.ReadAll(r.Body)
 	json.Unmarshal(bodyBytes, &rpc)
 	defer exitPath(w, "rpc", rpc)
-	ret := "ok"
 
 	if rpc.Call == "mkdirp" {
 		err = os.MkdirAll(checkPath(rpc.Args[0]), os.ModePerm)
@@ -158,7 +163,7 @@ func rpc(w http.ResponseWriter, r *http.Request) {
 	}
 
 	check(err)
-	w.Write([]byte(ret))
+	w.Write([]byte("ok"))
 }
 
 func checkPath(p string) string {
@@ -188,8 +193,10 @@ func main() {
 	initPath, err = filepath.Abs(initPath)
 	check(err)
 
-	http.HandleFunc(*extraPath+"rpc", rpc)
+	if !*ro {
-	http.HandleFunc(*extraPath+"post", upload)
+		http.HandleFunc(*extraPath+"rpc", rpc)
+		http.HandleFunc(*extraPath+"post", upload)
+	}
 	http.HandleFunc("/", doContent)
 	fs = http.StripPrefix(*extraPath, http.FileServer(http.Dir(initPath)))
 	fmt.Printf("Gossa startig on directory %s\nListening on http://%s:%s%s\n", initPath, *host, *port, *extraPath)

src/gossa_test.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"os"
+	"os/exec"
 	"regexp"
 	"strings"
 	"testing"
@@ -84,7 +86,7 @@ func fetchAndTestDefault(t *testing.T, url string) string {
 	return body0
 }
 
-func doTest(t *testing.T, url string, testExtra bool) {
+func doTestRegular(t *testing.T, url string, testExtra bool) {
 	var payload, path, body0, body1, body2 string
 
 	// ~~~~~~~~~~~~~~~~~
@@ -229,20 +231,99 @@ func doTest(t *testing.T, url string, testExtra bool) {
 	if body0 != `ok` {
 		t.Fatal("cleanup errored #2")
 	}
+
+	fmt.Printf("\r\n=========\r\n")
 }
 
-func TestGetFolder(t *testing.T) {
+func doTestReadonly(t *testing.T, url string) {
-	time.Sleep(6 * time.Second)
+	var payload, path, body0, body1 string
+
+	// ~~~~~~~~~~~~~~~~~
+	fmt.Println("\r\n~~~~~~~~~~ test fetching default path")
+	fetchAndTestDefault(t, url)
+
+	// ~~~~~~~~~~~~~~~~~
+	fmt.Println("\r\n~~~~~~~~~~ test fetching an invalid path - redirected to root")
+	fetchAndTestDefault(t, url+"../../")
+	fetchAndTestDefault(t, url+"hols/../../")
+
+	// ~~~~~~~~~~~~~~~~~
+	fmt.Println("\r\n~~~~~~~~~~ test fetching regular files")
+	body0 = get(t, url+"subdir_with%20space/file_with%20space.html")
+	body1 = get(t, url+"fancy-path/a")
+	if body0 != `<b>spacious!!</b> ` || body1 != `fancy! ` {
+		t.Fatal("fetching a regular file errored")
+	}
+
+	// ~~~~~~~~~~~~~~~~~
+	fmt.Println("\r\n~~~~~~~~~~ test fetching a invalid file")
+	path = "../../../../../../../../../../etc/passwd"
+	if get(t, url+path) != `error` {
+		t.Fatal("fetching a invalid file didnt errored")
+	}
+
+	// ~~~~~~~~~~~~~~~~~
+	fmt.Println("\r\n~~~~~~~~~~ test mkdir rpc")
+	body0 = postJSON(t, url+"rpc", `{"call":"mkdirp","args":["/AAA"]}`)
+	if body0 == `ok` {
+		t.Fatal("mkdir rpc passed - should not be allowed")
+	}
+
+	// ~~~~~~~~~~~~~~~~~
+	fmt.Println("\r\n~~~~~~~~~~ test post file")
+	path = "%2F%E1%84%92%E1%85%A1%20%E1%84%92%E1%85%A1" // "하 하" encoded
+	payload = "123 하"
+	body0 = postDummyFile(t, url, path, payload)
+	body1 = get(t, url+path)
+	if body0 == `ok` {
+		t.Fatal("post file passed - should not be allowed")
+	}
+
+	// ~~~~~~~~~~~~~~~~~
+	fmt.Println("\r\n~~~~~~~~~~ test mv rpc")
+	body0 = postJSON(t, url+"rpc", `{"call":"mv","args":["/AAA", "/hols/AAA"]}`)
+	body1 = fetchAndTestDefault(t, url)
+	if body0 == `ok` {
+		t.Fatal("mv rpc passed - should not be allowed")
+	}
+
+	// ~~~~~~~~~~~~~~~~~
+	fmt.Println("\r\n~~~~~~~~~~ test rm rpc & cleanup")
+	body0 = postJSON(t, url+"rpc", `{"call":"rm","args":["/hols/AAA"]}`)
+	if body0 == `ok` {
+		t.Fatal("cleanup passed - should not be allowed")
+	}
+
+	fmt.Printf("\r\n=========\r\n")
+}
+
+func startGossa(what string) int {
+	cmd := exec.Command("/usr/bin/make", what)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stdout
+	cmd.Start()
+	time.Sleep(3 * time.Second)
+	return cmd.Process.Pid
+}
+
+func killallgossa() {
+	cmd := exec.Command("/usr/bin/killall", "gossa")
+	cmd.Start()
+}
+
+func TestGossa(t *testing.T) {
+	startGossa("run")
 	fmt.Println("========== testing normal path ============")
-	url := "http://127.0.0.1:8001/"
+	doTestRegular(t, "http://127.0.0.1:8001/", false)
-	doTest(t, url, false)
+	killallgossa()
 
-	fmt.Printf("\r\n=========\r\n")
+	startGossa("run-extra")
-	time.Sleep(10 * time.Second)
+	fmt.Println("========== testing extras options ============")
+	doTestRegular(t, "http://127.0.0.1:8001/fancy-path/", true)
+	killallgossa()
 
-	url = "http://127.0.0.1:8001/fancy-path/"
+	startGossa("run-ro")
-	fmt.Println("========== testing at fancy path ============")
+	fmt.Println("========== testing read only ============")
-	doTest(t, url, true)
+	doTestReadonly(t, "http://127.0.0.1:8001/")
-
+	killallgossa()
-	fmt.Printf("\r\n=========\r\n")
 }