pull/406/head
1138-4EB 2018-04-23 21:21:18 +02:00 committed by Henrique Dias
parent f7fdd6cc92
commit c6eb4fbac5
1 changed files with 5 additions and 4 deletions

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
} }