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

fix #311, fix #312 (see filebrowser/frontend#7) (#405) 

Former-commit-id: 2a2fe8e441a30073ff9dbb4ba4f6c6235709f158 [formerly 75aa9ca68f6fe2e20ff01d027c9c18e49fe75739] [formerly 371c60a517b81399929f520abc25462f7a271083 [formerly c6eb4fbac5]]
Former-commit-id: e501e318c908fd83ffe7a4984ea732385116aa97 [formerly c5a2a983c3960e2af98915b89a6abb3f2ae3bbde]
Former-commit-id: 90dd43012239882bf72855df4f538fa59f699d64
pull/726/head
1138-4EB 2018-04-23 21:21:18 +02:00 committed by Henrique Dias
parent dd2d02e492
commit e7e2edf76c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
http/websockets.go
View File

@ -57,13 +57,14 @@ func command(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error)
allowed := false allowed := false
for _, cmd := range c.User.Commands { for _, cmd := range c.User.Commands {
if cmd == command[0] { if regexp.MustCompile(cmd).MatchString(command[0]) {
allowed = true allowed = true
break
} }
} }
if !allowed { if !allowed {
err = conn.WriteMessage(websocket.BinaryMessage, cmdNotAllowed) err = conn.WriteMessage(websocket.TextMessage, cmdNotAllowed)
if err != nil { if err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }
@ -71,9 +72,9 @@ func command(c *fm.Context, w http.ResponseWriter, r *http.Request) (int, error)
return 0, nil return 0, nil
} }
// Check if the program is talled is installed on the computer. // Check if the program is installed on the computer.
if _, err = exec.LookPath(command[0]); err != nil { if _, err = exec.LookPath(command[0]); err != nil {
err = conn.WriteMessage(websocket.BinaryMessage, cmdNotImplemented) err = conn.WriteMessage(websocket.TextMessage, cmdNotImplemented)
if err != nil { if err != nil {
return http.StatusInternalServerError, err return http.StatusInternalServerError, err
} }