github
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser
1
0
Fork 0
Code Issues Releases Wiki Activity

updates!!!! On #1

pull/144/head
Henrique Dias 2016-11-01 15:06:44 +00:00
parent d8d7502b1c
commit b517d47a84
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_embed/public/css/styles.css
View File

@ -1164,7 +1164,7 @@ i.spin {
color: #212121; color: #212121;
display: inline-block; display: inline-block;
width: auto; width: auto;
min-width: 0; min-width: 16em;
} }
header #search i { header #search i {
color: #6f6f6f; color: #6f6f6f;

2
_embed/templates/base.tmpl
View File

@ -51,7 +51,7 @@
{{ if .User.AllowCommands }} {{ if .User.AllowCommands }}
<div id="search"> <div id="search">
<i class="material-icons" title="Storage">storage</i> <i class="material-icons" title="Storage">storage</i>
<input type="text" placeholder="Execute a command..."> <input type="text" placeholder="Search or execute a command...">
<div> <div>
<div>Write your git, mercurial or svn command and press enter.</div> <div>Write your git, mercurial or svn command and press enter.</div>
<p><i class="material-icons spin">autorenew</i></p> <p><i class="material-icons spin">autorenew</i></p>

14
handlers/search.go
View File

@ -10,6 +10,7 @@ import (
"github.com/hacdias/caddy-filemanager/config" "github.com/hacdias/caddy-filemanager/config"
) )
// Search ...
func Search(w http.ResponseWriter, r *http.Request, c *config.Config, u *config.User) (int, error) { func Search(w http.ResponseWriter, r *http.Request, c *config.Config, u *config.User) (int, error) {
// Upgrades the connection to a websocket and checks for errors. // Upgrades the connection to a websocket and checks for errors.
conn, err := upgrader.Upgrade(w, r, nil) conn, err := upgrader.Upgrade(w, r, nil)
@ -18,11 +19,14 @@ func Search(w http.ResponseWriter, r *http.Request, c *config.Config, u *config.
} }
defer conn.Close() defer conn.Close()
var search string var (
search string
message []byte
)
// Starts an infinite loop until a valid command is captured. // Starts an infinite loop until a valid command is captured.
for { for {
_, message, err := conn.ReadMessage() _, message, err = conn.ReadMessage()
if err != nil { if err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }
@ -41,9 +45,11 @@ func Search(w http.ResponseWriter, r *http.Request, c *config.Config, u *config.
scope = filepath.Clean(scope) scope = filepath.Clean(scope)
err = filepath.Walk(scope, func(path string, f os.FileInfo, err error) error { err = filepath.Walk(scope, func(path string, f os.FileInfo, err error) error {
// TODO: check user permissions?
if strings.Contains(path, search) { if strings.Contains(path, search) {
if !u.Allowed(path) {
return nil
}
path = strings.TrimPrefix(path, scope) path = strings.TrimPrefix(path, scope)
path = strings.Replace(path, "\\", "/", -1) path = strings.Replace(path, "\\", "/", -1)
path = strings.TrimPrefix(path, "/") path = strings.TrimPrefix(path, "/")