third-party-mirrors/ssh-chat
1
0
Fork 0
mirror of https://github.com/shazow/ssh-chat.git synced 2025-06-09 03:42:25 +03:00
Code Issues Projects Releases Wiki Activity

minor message changes

Browse Source
This commit is contained in:
mik2k2 2022-01-04 15:11:14 +01:00
parent 7677d48704
commit dc6fa21eaa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
host.go
View File

@ -814,25 +814,26 @@ func (h *Host) InitCommands(c *chat.Commands) {
return nil return nil
}) })
if kicked != nil { if kicked != nil {
room.Send(message.NewAnnounceMsg(fmt.Sprintf("%v were kicked during pubkey reverification.", kicked))) room.Send(message.NewAnnounceMsg("Kicked during pubkey reverification: " + strings.Join(kicked, ", ")))
} }
return nil return nil
} }
allowlistStatus := func() (msgs []string) { allowlistStatus := func() (msgs []string) {
if h.auth.AllowlistMode() { if h.auth.AllowlistMode() {
msgs = []string{"The allowlist is currently enabled."} msgs = []string{"allowlist enabled"}
} else { } else {
msgs = []string{"The allowlist is currently disabled."} msgs = []string{"allowlist disabled"}
} }
allowlistedUsers := []string{} allowlistedUsers := []string{}
allowlistedKeys := []string{} allowlistedKeys := []string{}
// TODO: if we switch the loops, we can get unlisted users instead of unconnected keys easily
h.auth.allowlist.Each(func(key string, item set.Item) error { h.auth.allowlist.Each(func(key string, item set.Item) error {
keyFP := item.Key() keyFP := item.Key()
if forConnectedUsers(func(user *chat.Member, pk ssh.PublicKey) error { if forConnectedUsers(func(user *chat.Member, pk ssh.PublicKey) error {
if pk != nil && sshd.Fingerprint(pk) == keyFP { if pk != nil && sshd.Fingerprint(pk) == keyFP {
allowlistedUsers = append(allowlistedUsers, user.Name()) allowlistedUsers = append(allowlistedUsers, user.Name())
return errors.New("not an actual error, but exit early because we found the key") return io.EOF
} }
return nil return nil
}) == nil { }) == nil {
@ -842,7 +843,7 @@ func (h *Host) InitCommands(c *chat.Commands) {
return nil return nil
}) })
if len(allowlistedUsers) != 0 { if len(allowlistedUsers) != 0 {
msgs = append(msgs, fmt.Sprintf("The following connected users are on the allowlist: %v", allowlistedUsers)) msgs = append(msgs, "Connected users on the allowlist: "+strings.Join(allowlistedUsers, ", "))
} }
if len(allowlistedKeys) != 0 { if len(allowlistedKeys) != 0 {
msgs = append(msgs, fmt.Sprintf("The following keys of not connected users are on the allowlist: %v", allowlistedKeys)) msgs = append(msgs, fmt.Sprintf("The following keys of not connected users are on the allowlist: %v", allowlistedKeys))