diff --git a/gossa-ui b/gossa-ui
index 834858c..cf98fb0 160000
--- a/gossa-ui
+++ b/gossa-ui
@@ -1 +1 @@
-Subproject commit 834858c36912f38de85cc098bce1207e26f6d294
+Subproject commit cf98fb04e3d4c86bc916705479d69dd59ed7de9f
diff --git a/src/gossa_test.go b/src/gossa_test.go
index 31b6b6e..1bf4160 100644
--- a/src/gossa_test.go
+++ b/src/gossa_test.go
@@ -55,39 +55,37 @@ func postJSON(t *testing.T, url string, what string) string {
}
func fetchAndTestDefault(t *testing.T, url string) string {
- bodyStr := get(t, url)
+ body0 := get(t, url)
- if !strings.Contains(bodyStr, `
/`) {
+ if !strings.Contains(body0, `/`) {
t.Fatal("error title")
}
- if !strings.Contains(bodyStr, `./
`) {
+ if !strings.Contains(body0, `./
`) {
t.Fatal("error header")
}
- if !strings.Contains(bodyStr, `href="hols">hols/`) {
+ if !strings.Contains(body0, `href="hols">hols/`) {
t.Fatal("error hols folder")
}
- if !strings.Contains(bodyStr, `href="curimit@gmail.com%20%2840%25%29">curimit@gmail.com (40%)/`) {
+ if !strings.Contains(body0, `href="curimit@gmail.com%20%2840%25%29">curimit@gmail.com (40%)/`) {
t.Fatal("error curimit@gmail.com (40%) folder")
}
- if !strings.Contains(bodyStr, `href="%E4%B8%AD%E6%96%87">中文/`) {
+ if !strings.Contains(body0, `href="%E4%B8%AD%E6%96%87">中文/`) {
t.Fatal("error 中文 folder")
}
- if !strings.Contains(bodyStr, `href="custom_mime_type.types">custom_mime_type.types`) {
+ if !strings.Contains(body0, `href="custom_mime_type.types">custom_mime_type.types`) {
t.Fatal("error row custom_mime_type")
}
- return bodyStr
+ return body0
}
func doTest(t *testing.T, url string, testExtra bool) {
- payload := ""
- path := ""
- bodyStr := ""
+ var payload, path, body0, body1, body2 string
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test fetching default path")
@@ -100,40 +98,42 @@ func doTest(t *testing.T, url string, testExtra bool) {
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test fetching regular files")
- bodyStr = get(t, url+"subdir_with%20space/file_with%20space.html")
- bodyStr2 := get(t, url+"fancy-path/a")
- if !strings.Contains(bodyStr, `spacious!!`) || !strings.Contains(bodyStr2, `fancy!`) {
+ body0 = get(t, url+"subdir_with%20space/file_with%20space.html")
+ body1 = get(t, url+"fancy-path/a")
+ if body0 != `spacious!! ` || body1 != `fancy! ` {
t.Fatal("fetching a regular file errored")
}
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test fetching a invalid file")
- bodyStr = get(t, url+"../../../../../../../../../../etc/passwd")
- if !strings.Contains(bodyStr, `error`) {
+ path = "../../../../../../../../../../etc/passwd"
+ if !testExtra && get(t, url+path) != `error` {
t.Fatal("fetching a invalid file didnt errored")
+ } else if testExtra {
+ fetchAndTestDefault(t, url+path) // extra path will just redirect to root dir
}
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test mkdir rpc")
- bodyStr = postJSON(t, url+"rpc", `{"call":"mkdirp","args":["/AAA"]}`)
- if bodyStr != `ok` {
+ body0 = postJSON(t, url+"rpc", `{"call":"mkdirp","args":["/AAA"]}`)
+ if body0 != `ok` {
t.Fatal("mkdir rpc errored")
}
- bodyStr = fetchAndTestDefault(t, url)
- if !strings.Contains(bodyStr, `href="AAA">AAA/`) {
+ body0 = fetchAndTestDefault(t, url)
+ if !strings.Contains(body0, `href="AAA">AAA/`) {
t.Fatal("mkdir rpc folder not created")
}
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test invalid mkdir rpc")
- bodyStr = postJSON(t, url+"rpc", `{"call":"mkdirp","args":["../BBB"]}`)
- if !strings.Contains(bodyStr, `error`) {
+ body0 = postJSON(t, url+"rpc", `{"call":"mkdirp","args":["../BBB"]}`)
+ if body0 != `error` {
t.Fatal("invalid mkdir rpc didnt errored #0")
}
- bodyStr = postJSON(t, url+"rpc", `{"call":"mkdirp","args":["/../BBB"]}`)
- if !strings.Contains(bodyStr, `error`) {
+ body0 = postJSON(t, url+"rpc", `{"call":"mkdirp","args":["/../BBB"]}`)
+ if body0 != `error` {
t.Fatal("invalid mkdir rpc didnt errored #1")
}
@@ -141,70 +141,56 @@ func doTest(t *testing.T, url string, testExtra bool) {
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 하"
- bodyStr = postDummyFile(t, url, path, payload)
- if bodyStr != `ok` {
+ body0 = postDummyFile(t, url, path, payload)
+ body1 = get(t, url+path)
+ body2 = fetchAndTestDefault(t, url)
+ if body0 != `ok` || body1 != payload || !strings.Contains(body2, `href="%E1%84%92%E1%85%A1%20%E1%84%92%E1%85%A1">하 하`) {
t.Fatal("post file errored")
}
- bodyStr = get(t, url+path)
- if !strings.Contains(bodyStr, payload) {
- t.Fatal("post file errored reaching new file")
- }
-
- bodyStr = fetchAndTestDefault(t, url)
- if !strings.Contains(bodyStr, `href="%E1%84%92%E1%85%A1%20%E1%84%92%E1%85%A1">하 하`) {
- t.Fatal("post file errored checking new file row")
- }
-
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test post file incorrect path")
- bodyStr = postDummyFile(t, url, "%2E%2E"+path, payload)
- if !strings.Contains(bodyStr, `err`) {
+ body0 = postDummyFile(t, url, "%2E%2E"+path, payload)
+ if !strings.Contains(body0, `err`) {
t.Fatal("post file incorrect path didnt errored")
}
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test mv rpc")
- bodyStr = postJSON(t, url+"rpc", `{"call":"mv","args":["/AAA", "/hols/AAA"]}`)
- if bodyStr != `ok` {
+ body0 = postJSON(t, url+"rpc", `{"call":"mv","args":["/AAA", "/hols/AAA"]}`)
+ body1 = fetchAndTestDefault(t, url)
+ if body0 != `ok` || strings.Contains(body1, `href="AAA">AAA/ `) {
t.Fatal("mv rpc errored")
}
- bodyStr = fetchAndTestDefault(t, url)
- if strings.Contains(bodyStr, `href="AAA">AAA/ `) {
- t.Fatal("mv rpc folder not moved")
- }
-
// ~~~~~~~~~~~~~~~~~
// Test where auth header unset, otherwise it'd be apended to the first arg
fmt.Println("\r\n~~~~~~~~~~ test history rpc")
- bodyStr = postJSON(t, url+"rpc", `{"call":"historySet","args":["a", "123"]}`)
- if bodyStr != `ok` {
- t.Fatal("mv rpc errored")
+ body0 = postJSON(t, url+"rpc", `{"call":"historySet","args":["a", "123", "skipHash"]}`)
+ body1 = postJSON(t, url+"rpc", `{"call":"historyGet","args":["a"]}`)
+ if body0 != `ok` || body1 != `123` {
+ t.Fatal("error history get/set unhashed")
}
- bodyStr = postJSON(t, url+"rpc", `{"call":"historyGet","args":["a"]}`)
- if bodyStr != `123` {
- t.Fatal("error historyGet")
+ body0 = postJSON(t, url+"rpc", `{"call":"historySet","args":["b", "a", "hash"]}`)
+ body1 = postJSON(t, url+"rpc", `{"call":"historyGet","args":["b"]}`)
+ if body0 != `ok` || body1 != `ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb` {
+ t.Fatal("error history get/set hashed")
}
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test upload in new folder")
- payload = "abcdef1234"
- bodyStr = postDummyFile(t, url, "%2Fhols%2FAAA%2Fabcdef", payload)
- if strings.Contains(bodyStr, `err`) {
+ payload = "test"
+ body0 = postDummyFile(t, url, "%2Fhols%2FAAA%2Fabcdef", payload)
+ body1 = get(t, url+"hols/AAA/abcdef")
+ if body0 != `ok` || body1 != payload {
t.Fatal("upload in new folder errored")
}
- bodyStr = get(t, url+"hols/AAA/abcdef")
- if !strings.Contains(bodyStr, payload) {
- t.Fatal("upload in new folder error reaching new file")
- }
-
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test symlink, should succeed: ", testExtra)
- bodyStr = get(t, url+"/support/readme.md")
- hasReadme := strings.Contains(bodyStr, `the master branch is automatically built and pushed`)
+ body0 = get(t, url+"/support/readme.md")
+ hasReadme := strings.Contains(body0, `the master branch is automatically built and pushed`)
if !testExtra && hasReadme {
t.Fatal("error symlink reached where illegal")
} else if testExtra && !hasReadme {
@@ -213,20 +199,20 @@ func doTest(t *testing.T, url string, testExtra bool) {
if testExtra {
fmt.Println("\r\n~~~~~~~~~~ test symlink mkdir & cleanup")
- bodyStr = postJSON(t, url+"rpc", `{"call":"mkdirp","args":["/support/testfolder"]}`)
- if bodyStr != `ok` {
+ body0 = postJSON(t, url+"rpc", `{"call":"mkdirp","args":["/support/testfolder"]}`)
+ if body0 != `ok` {
t.Fatal("error symlink mkdir")
}
- bodyStr = postJSON(t, url+"rpc", `{"call":"rm","args":["/support/testfolder"]}`)
- if bodyStr != `ok` {
+ body0 = postJSON(t, url+"rpc", `{"call":"rm","args":["/support/testfolder"]}`)
+ if body0 != `ok` {
t.Fatal("error symlink rm")
}
}
fmt.Println("\r\n~~~~~~~~~~ test hidden file, should succeed: ", testExtra)
- bodyStr = get(t, url+"/.testhidden")
- hasHidden := strings.Contains(bodyStr, `test`)
+ body0 = get(t, url+"/.testhidden")
+ hasHidden := strings.Contains(body0, `test`)
if !testExtra && hasHidden {
t.Fatal("error hidden file reached where illegal")
} else if testExtra && !hasHidden {
@@ -235,31 +221,27 @@ func doTest(t *testing.T, url string, testExtra bool) {
//
fmt.Println("\r\n~~~~~~~~~~ test upload in new folder")
- payload = "abcdef1234"
- bodyStr = postDummyFile(t, url, "%2Fhols%2FAAA%2Fabcdef", payload)
- if strings.Contains(bodyStr, `err`) {
+ payload = "test"
+ body0 = postDummyFile(t, url, "%2Fhols%2FAAA%2Fabcdef", payload)
+ body1 = get(t, url+"hols/AAA/abcdef")
+ if body0 != `ok` || body1 != payload {
t.Fatal("upload in new folder errored")
}
- bodyStr = get(t, url+"hols/AAA/abcdef")
- if !strings.Contains(bodyStr, payload) {
- t.Fatal("upload in new folder error reaching new file")
- }
-
// ~~~~~~~~~~~~~~~~~
fmt.Println("\r\n~~~~~~~~~~ test rm rpc & cleanup")
- bodyStr = postJSON(t, url+"rpc", `{"call":"rm","args":["/hols/AAA"]}`)
- if bodyStr != `ok` {
+ body0 = postJSON(t, url+"rpc", `{"call":"rm","args":["/hols/AAA"]}`)
+ if body0 != `ok` {
t.Fatal("cleanup errored #0")
}
- bodyStr = get(t, url+"hols/AAA")
- if !strings.Contains(bodyStr, `error`) {
+ body0 = get(t, url+"hols/AAA")
+ if !strings.Contains(body0, `error`) {
t.Fatal("cleanup errored #1")
}
- bodyStr = postJSON(t, url+"rpc", `{"call":"rm","args":["/하 하"]}`)
- if bodyStr != `ok` {
+ body0 = postJSON(t, url+"rpc", `{"call":"rm","args":["/하 하"]}`)
+ if body0 != `ok` {
t.Fatal("cleanup errored #2")
}
}