third-party-mirrors/ssh-chat
1
0
Fork 0
mirror of https://github.com/shazow/ssh-chat.git synced 2025-04-15 00:20:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #353 from pavelz/show_admin_status

Browse Source 
/whois: Show op status for ops
This commit is contained in:
Andrey Petrov 2020-07-20 12:27:34 -04:00 committed by GitHub
commit 208a6a4712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
host.go
View File

@ -407,12 +407,11 @@ func (h *Host) InitCommands(c *chat.Commands) {
if !ok { if !ok {
return errors.New("user not found") return errors.New("user not found")
} }
id := target.Identifier.(*Identity) id := target.Identifier.(*Identity)
var whois string var whois string
switch room.IsOp(msg.From()) { switch room.IsOp(msg.From()) {
case true: case true:
whois = id.WhoisAdmin() whois = id.WhoisAdmin(room)
case false: case false:
whois = id.Whois() whois = id.Whois()
} }

12
identity.go
View File

@ -4,6 +4,7 @@ import (
"net" "net"
"time" "time"
"github.com/shazow/ssh-chat/chat"
"github.com/shazow/ssh-chat/chat/message" "github.com/shazow/ssh-chat/chat/message"
"github.com/shazow/ssh-chat/internal/humantime" "github.com/shazow/ssh-chat/internal/humantime"
"github.com/shazow/ssh-chat/internal/sanitize" "github.com/shazow/ssh-chat/internal/sanitize"
@ -59,15 +60,22 @@ func (i Identity) Whois() string {
} }
// WhoisAdmin returns a whois description for admin users. // WhoisAdmin returns a whois description for admin users.
func (i Identity) WhoisAdmin() string { func (i Identity) WhoisAdmin(room *chat.Room) string {
ip, _, _ := net.SplitHostPort(i.RemoteAddr().String()) ip, _, _ := net.SplitHostPort(i.RemoteAddr().String())
fingerprint := "(no public key)" fingerprint := "(no public key)"
if i.PublicKey() != nil { if i.PublicKey() != nil {
fingerprint = sshd.Fingerprint(i.PublicKey()) fingerprint = sshd.Fingerprint(i.PublicKey())
} }
isOp := ""
if member, ok := room.MemberByID(i.ID()); ok && room.IsOp(member.User) {
isOp = message.Newline + " > op: true"
}
return "name: " + i.Name() + message.Newline + return "name: " + i.Name() + message.Newline +
" > ip: " + ip + message.Newline + " > ip: " + ip + message.Newline +
" > fingerprint: " + fingerprint + message.Newline + " > fingerprint: " + fingerprint + message.Newline +
" > client: " + sanitize.Data(string(i.ClientVersion()), 64) + message.Newline + " > client: " + sanitize.Data(string(i.ClientVersion()), 64) + message.Newline +
" > joined: " + humantime.Since(i.created) + " ago" " > joined: " + humantime.Since(i.created) + " ago" +
isOp
} }