Merge branch 'master' into streaming

api/amqp.go

@@ -106,6 +106,11 @@ func sendToAMQP(pmbConn *Connection, done chan error, id string) {
 				}
 			}
 		}
+
+		if message.Done != nil {
+			logrus.Debugf("Done channel present, sending message")
+			message.Done <- nil
+		}
 	}
 }
 

api/http.go

@@ -90,5 +90,10 @@ func sendToHTTP(pmbConn *Connection, done chan error, id string) {
 				logrus.Warningf("Error sending: %s", err)
 			}
 		}
+
+		if message.Done != nil {
+			logrus.Debugf("Done channel present, sending message")
+			message.Done <- nil
+		}
 	}
 }

api/pmb.go

@@ -22,6 +22,7 @@ type PMB struct {
 type Message struct {
 	Contents map[string]interface{}
 	Raw      string
+	Done     chan error
 }
 
 type Connection struct {
@@ -182,10 +183,13 @@ func copyKey(URI string, id string) (*Connection, error) {
 	data := map[string]interface{}{
 		"type": "RequestAuth",
 	}
-	conn.Out <- Message{Contents: data}
+	mess := Message{
+		Contents: data,
+		Done:     make(chan error),
+	}
+	conn.Out <- mess
 
-	// wait a second for the message to go out
-	time.Sleep(1 * time.Second)
+	<-mess.Done
 
 	return conn, nil
 }

api/util.go

@@ -114,6 +114,7 @@ func prepareMessage(message Message, keys []string, id string) ([][]byte, error)
 func parseMessage(body []byte, keys []string, ch chan Message, id string) {
 	var message []byte
 	var rawData interface{}
+	messageWasEncrypted := false
 	if body[0] != '{' {
 		logrus.Debugf("Decrypting message...")
 		if len(keys) > 0 {
@@ -146,6 +147,8 @@ func parseMessage(body []byte, keys []string, ch chan Message, id string) {
 
 			if !decryptedOk {
 				return
+			} else {
+				messageWasEncrypted = true
 			}
 
 		} else {
@@ -165,6 +168,12 @@ func parseMessage(body []byte, keys []string, ch chan Message, id string) {
 
 	senderId := data["id"].(string)
 
+	// only RequestAuth messages are allowed to be unencrypted
+	if !messageWasEncrypted && data["type"].(string) != "RequestAuth" {
+		logrus.Warningf("Unencrypted message that wasn't RequestAuth detected, discarding...")
+		return
+	}
+
 	// hide messages from ourselves
 	if senderId != id {
 		logrus.Debugf("Message received: %s", data)

run.go

@@ -92,16 +92,18 @@ func runRun(conn *pmb.Connection, id string, args []string) error {
 
 	cmdSuccess := true
 	result := "successfully"
+	resultEmoji := "👍"
 	if err != nil {
 		result = fmt.Sprintf("with error '%s'", err.Error())
+		resultEmoji = "👎"
 		cmdSuccess = false
 	}
 	logrus.Infof("Process complete.")
 
 	if len(message) == 0 {
-		message = fmt.Sprintf("Command [%s] completed %s.", command, result)
+		message = fmt.Sprintf("%s Command [%s] completed %s.", resultEmoji, command, result)
 	} else {
-		message = fmt.Sprintf("%s. Command completed %s.", message, result)
+		message = fmt.Sprintf("%s. %s Command completed %s.", message, resultEmoji, result)
 	}
 
 	note := pmb.Notification{Message: message, Level: runCommand.Level}