Fix bug in SetUserGroupMembership which results in always throwing an…

… error

commands/start.go

@@ -172,6 +172,13 @@ func clusterState(noIptables bool, errorChan chan<- error) func(string) {
 						errorChan <- fmt.Errorf("to write witness data when cluster is healthy: %v", err)
 						return
 					}
+
+					err = data.SetVersion()
+					if err != nil {
+						errorChan <- fmt.Errorf("to write version data when cluster is healthy: %v", err)
+						return
+					}
+
 				}
 
 				wasDead = false

internal/data/clustering.go

@@ -114,6 +114,21 @@ func IsWitness(idHex string) (bool, error) {
 	return isDrained.Count != 0, nil
 }
 
+func GetVersion(idHex string) (string, error) {
+	_, err := strconv.ParseUint(idHex, 16, 64)
+	if err != nil {
+		return "", fmt.Errorf("bad member ID arg (%v), expecting ID in Hex", err)
+	}
+
+	return getString(path.Join(NodeInfo, idHex, "version"))
+}
+
+func SetVersion() error {
+	d, _ := json.Marshal(config.Version)
+	_, err := etcd.Put(context.Background(), path.Join(NodeInfo, GetServerID().String(), "version"), string(d))
+	return err
+}
+
 func SetDrained(idHex string, on bool) error {
 
 	isWitness, err := IsWitness(idHex)

internal/data/groups.go

@@ -237,5 +237,9 @@ func SetUserGroupMembership(username string, newGroups []string) error {
 		return string(userGroups), nil
 	})
 
-	return fmt.Errorf("failed to update group membership: %s", err)
+	if err != nil {
+		return fmt.Errorf("failed to update group membership: %v", err)
+	}
+
+	return nil
 }

internal/router/statemachine.go

@@ -113,7 +113,7 @@ func deviceChanges(_ string, current, previous data.Device, et data.EventType) e
 			}
 
 			if current.Authorised.IsZero() {
-				reasons = append(reasons, "admin action")
+				reasons = append(reasons, "session terminated")
 			}
 
 			err := Deauthenticate(current.Address)

ui/clustering.go

@@ -16,8 +16,9 @@ type MembershipDTO struct {
 	IsDrained bool
 	IsWitness bool
 
-	Ping   string
-	Status string
+	Version string
+	Ping    string
+	Status  string
 }
 
 func clusterMembersUI(w http.ResponseWriter, r *http.Request) {

ui/templates/cluster/members.html

@@ -41,6 +41,14 @@ <h5 class="font-weight-bold text-truncate">{{if
                         {{.ID}}
                     </div>
                 </div>
+                <div class="row mb-1">
+                    <div class="col-4">
+                        Version:
+                    </div>
+                    <div class="col text-left">
+                        {{.Version}}
+                    </div>
+                </div>
                 <div class="row mb-1">
                     <div class="col-4">
                         Role: