Add client public key hash as identifier

Author: NHAS

internal/server/clients/clients.go

@@ -42,19 +42,9 @@ func Add(conn *ssh.ServerConn) (string, string, error) {
 
 	username := NormaliseHostname(conn.User())
 
-	if _, ok := aliases[username]; !ok {
-		aliases[username] = make(map[string]bool)
-	}
-
-	uniqueIdToAllAliases[idString] = append(uniqueIdToAllAliases[idString], username)
-	aliases[username][idString] = true
-
-	if _, ok := aliases[conn.RemoteAddr().String()]; !ok {
-		aliases[conn.RemoteAddr().String()] = make(map[string]bool)
-	}
-
-	uniqueIdToAllAliases[idString] = append(uniqueIdToAllAliases[idString], conn.RemoteAddr().String())
-	aliases[conn.RemoteAddr().String()][idString] = true
+	addAlias(idString, username)
+	addAlias(idString, conn.RemoteAddr().String())
+	addAlias(idString, conn.Permissions.Extensions["pubkey-fp"])
 
 	clients[idString] = conn
 
@@ -67,6 +57,15 @@ func Add(conn *ssh.ServerConn) (string, string, error) {
 
 }
 
+func addAlias(uniqueId, newAlias string) {
+	if _, ok := aliases[newAlias]; !ok {
+		aliases[newAlias] = make(map[string]bool)
+	}
+
+	uniqueIdToAllAliases[uniqueId] = append(uniqueIdToAllAliases[uniqueId], newAlias)
+	aliases[newAlias][uniqueId] = true
+}
+
 func Search(filter string) (out map[string]*ssh.ServerConn, err error) {
 
 	filter = filter + "*"

internal/server/commands/list.go

@@ -17,15 +17,15 @@ type list struct {
 }
 
 type displayItem struct {
-	sc ssh.Conn
+	sc ssh.ServerConn
 	id string
 }
 
 func fancyTable(tty io.ReadWriter, applicable []displayItem) {
 
-	t, _ := table.NewTable("Targets", "ID", "Hostname", "IP Address", "Version")
+	t, _ := table.NewTable("Targets", "ID", "Public Key Hash", "Hostname", "IP Address", "Version")
 	for _, a := range applicable {
-		t.AddValues(a.id, clients.NormaliseHostname(a.sc.User()), a.sc.RemoteAddr().String(), string(a.sc.ClientVersion()))
+		t.AddValues(a.id, a.sc.Permissions.Extensions["pubkey-fp"], clients.NormaliseHostname(a.sc.User()), a.sc.RemoteAddr().String(), string(a.sc.ClientVersion()))
 	}
 
 	t.Fprint(tty)
@@ -71,7 +71,7 @@ func (l *list) Run(tty io.ReadWriter, line terminal.ParsedLine) error {
 	sort.Strings(ids)
 
 	for _, id := range ids {
-		toReturn = append(toReturn, displayItem{id: id, sc: matchingClients[id]})
+		toReturn = append(toReturn, displayItem{id: id, sc: *matchingClients[id]})
 	}
 
 	if line.IsSet("t") {
@@ -83,7 +83,7 @@ func (l *list) Run(tty io.ReadWriter, line terminal.ParsedLine) error {
 
 	for i, tr := range toReturn {
 
-		fmt.Fprintf(tty, "%s %s %s, version: %s", tr.id, clients.NormaliseHostname(tr.sc.User()), tr.sc.RemoteAddr().String(), tr.sc.ClientVersion())
+		fmt.Fprintf(tty, "%s %s %s %s, version: %s", tr.id, tr.sc.Permissions.Extensions["pubkey-fp"], clients.NormaliseHostname(tr.sc.User()), tr.sc.RemoteAddr().String(), tr.sc.ClientVersion())
 
 		if i != len(toReturn)-1 {
 			fmt.Fprint(tty, sep)
@@ -109,7 +109,7 @@ func (l *list) Help(explain bool) string {
 
 	return terminal.MakeHelpText(
 		"ls [OPTION] [FILTER]",
-		"Filter uses glob matching against all attributes of a target (hostname, ip, id)",
+		"Filter uses glob matching against all attributes of a target (id, public key hash, hostname, ip)",
 		"\t-t\tPrint all attributes in pretty table",
 		"\t-h\tPrint help",
 	)