Merge 5e9b85d4aa into 23e9e6853f

closes #123

gossa.go

@@ -100,8 +100,9 @@ func replyList(w http.ResponseWriter, r *http.Request, fullPath string, path str
 	p.Title = template.HTML(html.EscapeString(title))
 
 	for _, el := range files {
-		info, err := el.Info()
-		if err != nil {
+		info, errInfo := el.Info()
+		el, err := os.Stat(fullPath + "/" + el.Name())
+		if err != nil || errInfo != nil {
 			log.Println("error - cant stat a file", err)
 			continue
 		}
@@ -109,7 +110,7 @@ func replyList(w http.ResponseWriter, r *http.Request, fullPath string, path str
 		if *skipHidden && strings.HasPrefix(el.Name(), ".") {
 			continue // dont print hidden files if we're not allowed
 		}
-		if *symlinks && info.Mode()&os.ModeSymlink != 0 {
+		if !*symlinks && info.Mode()&os.ModeSymlink != 0 {
 			continue // dont follow symlinks if we're not allowed
 		}
 
@@ -126,7 +127,7 @@ func replyList(w http.ResponseWriter, r *http.Request, fullPath string, path str
 		} else {
 			sl := strings.Split(name, ".")
 			ext := strings.ToLower(sl[len(sl)-1])
-			row := rowTemplate{name, template.URL(href), humanize(info.Size()), ext}
+			row := rowTemplate{name, template.URL(href), humanize(el.Size()), ext}
 			p.RowsFiles = append(p.RowsFiles, row)
 		}
 	}
@@ -231,11 +232,12 @@ func rpc(w http.ResponseWriter, r *http.Request) {
 	check(err)
 	json.Unmarshal(bodyBytes, &rpc)
 
-	if rpc.Call == "mkdirp" {
+	switch rpc.Call {
+	case "mkdirp":
 		err = os.MkdirAll(enforcePath(rpc.Args[0]), os.ModePerm)
-	} else if rpc.Call == "mv" {
+	case "mv":
 		err = os.Rename(enforcePath(rpc.Args[0]), enforcePath(rpc.Args[1]))
-	} else if rpc.Call == "rm" {
+	case "rm":
 		err = os.RemoveAll(enforcePath(rpc.Args[0]))
 	}
 

gossa_test.go

@@ -238,6 +238,8 @@ func doTestRegular(t *testing.T, url string, testExtra bool) {
 	hasListing := strings.Contains(body0, `readme.md`)
 	body1 = get(t, url+"/support/readme.md")
 	hasReadme := strings.Contains(body1, `the master branch is automatically built and pushed`)
+	body2 = get(t, url)
+	hasMainListing := strings.Contains(body2, `href="support">support/</a>`)
 
 	if !testExtra && hasReadme {
 		t.Fatal("error symlink file reached where illegal")
@@ -249,6 +251,11 @@ func doTestRegular(t *testing.T, url string, testExtra bool) {
 	} else if testExtra && !hasListing {
 		t.Fatal("error symlink folder unreachable")
 	}
+	if !testExtra && hasMainListing {
+		t.Fatal("error symlink folder where illegal")
+	} else if testExtra && !hasMainListing {
+		t.Fatal("error symlink folder unreachable")
+	}
 
 	if testExtra {
 		fmt.Println("\r\n~~~~~~~~~~ test symlink mkdir & cleanup")

ui/script.js

@@ -749,40 +749,52 @@ document.body.addEventListener('keydown', e => {
     return
   }
 
-  // Ctrl keys
-  if ((e.ctrlKey || e.metaKey) && !e.shiftKey) {
-    switch (e.code) {
-      case 'KeyC':
-        return prevent(e) || isRo() || cpPath()
+  // Modifier keys
+  if (!e.shiftKey) {
+    if (e.ctrlKey || e.metaKey) {
+      switch (e.code) {
+        case 'KeyC':
+          return prevent(e) || isRo() || cpPath()
 
-      case 'KeyH':
-        return prevent(e) || isRo() || helpToggle()
+        case 'KeyH':
+          return prevent(e) || isRo() || helpToggle()
 
-      case 'KeyX':
-        return prevent(e) || isRo() || onCut()
+        case 'KeyX':
+          return prevent(e) || isRo() || onCut()
 
-      case 'KeyR':
-        return prevent(e) || refresh()
+        case 'KeyR':
+          return prevent(e) || refresh()
 
-      case 'KeyV':
-        return prevent(e) || isRo() || ensureMove() || onPaste()
+        case 'KeyV':
+          return prevent(e) || isRo() || ensureMove() || onPaste()
 
-      case 'Backspace':
-        return prevent(e) || isRo() || window.rm(e)
+        case 'Backspace':
+          return prevent(e) || isRo() || window.rm(e)
 
-      case 'KeyE':
-        return prevent(e) || isRo() || window.rename(e)
+        case 'KeyE':
+          return prevent(e) || isRo() || window.rename(e)
 
-      case 'KeyM':
-        return prevent(e) || isRo() || window.mkdirBtn()
+        case 'KeyM':
+          return prevent(e) || isRo() || window.mkdirBtn()
 
-      case 'KeyU':
-        return prevent(e) || isRo() || manualUpload.click()
+        case 'KeyU':
+          return prevent(e) || isRo() || manualUpload.click()
 
-      case 'Enter':
-      case 'ArrowRight':
-        return prevent(e) || dl(getASelected())
+        case 'Enter':
+        case 'ArrowRight':
+          return prevent(e) || dl(getASelected())
+      }
     }
+  } else {
+      // Workaround Firefox requirement for transient activation
+      // https://developer.mozilla.org/en-US/docs/Web/Security/User_activation
+      // Firefox requires user interaction (that is not reserved by the user agent)
+      // before a file picker can be displayed. This means that ctrl/meta are not
+      // usable as modifiers until the user clicks the page or presses another
+      // non-modifier key. To work around this, the shift key can be used, instead.
+      if (e.code == 'KeyU') {
+          return prevent(e) || isRo() || manualUpload.click()
+      }
   }
 
   switch (e.code) {

ui/ui.tmpl

@@ -26,7 +26,7 @@
         <tr><td>Ctrl/Meta + C</td><td>copy URL to clipboard</td></tr>
         <tr><td>Ctrl/Meta + E</td><td>rename item</td></tr>
         <tr><td>Ctrl/Meta + Backspace</td><td>delete item</td></tr>
-        <tr><td>Ctrl/Meta + U</td><td>upload new file/folder</td></tr>
+        <tr><td>Ctrl/Meta/Shift + U</td><td>upload new file/folder</td></tr>
         <tr><td>Ctrl/Meta + M</td><td>create a new directory</td></tr>
         <tr><td>Ctrl/Meta + X</td><td>cut selected path</td></tr>
         <tr><td>Ctrl/Meta + V</td><td>paste previously selected paths to directory</td></tr>