nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: print command aprsing error

Browse Source 
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
This commit is contained in:
Henrique Dias 2019-01-02 19:33:35 +00:00
parent 88effa0889
commit 1470ec8629
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
http/websockets.go
View File

@ -21,8 +21,7 @@ var upgrader = websocket.Upgrader{
}
var (
cmdNotImplemented = []byte("Command not implemented.")
cmdNotAllowed = []byte("Command not allowed.")
cmdNotAllowed = []byte("Command not allowed.")
)
func (e *Env) commandsHandler(w http.ResponseWriter, r *http.Request) {
@ -63,6 +62,15 @@ func (e *Env) commandsHandler(w http.ResponseWriter, r *http.Request) {
}
command, err := e.Settings.ParseCommand(raw)
if err != nil {
err := conn.WriteMessage(websocket.TextMessage, []byte(err.Error()))
if err != nil {
wsErr(conn, r, http.StatusInternalServerError, err)
}
return
}
path := strings.TrimPrefix(r.URL.Path, "/api/command")
dir := afero.FullBaseFsPath(user.Fs.(*afero.BasePathFs), path)
cmd := exec.Command(command[0], command[1:]...)
@ -73,7 +81,7 @@ func (e *Env) commandsHandler(w http.ResponseWriter, r *http.Request) {
wsErr(conn, r, http.StatusInternalServerError, err)
return
}
stderr, err := cmd.StderrPipe()
if err != nil {
wsErr(conn, r, http.StatusInternalServerError, err)