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

Hopefully fix hanging?

Browse Source
This commit is contained in:
Andrey Petrov 2014-12-13 13:05:42 -08:00
parent 820372a975
commit 35569887c0
2 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
client.go
View File

@ -9,18 +9,19 @@ import (
"golang.org/x/crypto/ssh/terminal"
)
const MSG_BUFFER int = 10
const MSG_BUFFER int = 50
const MAX_MSG_LENGTH int = 512
const HELP_TEXT string = SYSTEM_MESSAGE_FORMAT + `-> Available commands:
/about - About this chat
/exit - Exit the chat
/help - Show this help text
/list - List the users that are currently connected
/beep - Enable BEL notifications on mention.
/me $ACTION - Show yourself doing an action
/nick $NAME - Rename yourself to a new name
/whois $NAME - Display information about another connected user
/msg $NAME $MESSAGE
/beep - Enable BEL notifications on mention.
` + RESET
const OP_HELP_TEXT string = SYSTEM_MESSAGE_FORMAT + `-> Available operator commands:
@ -30,8 +31,7 @@ const OP_HELP_TEXT string = SYSTEM_MESSAGE_FORMAT + `-> Available operator comma
/silence $NAME - Revoke a user's ability to speak
`
const ABOUT_TEXT string = SYSTEM_MESSAGE_FORMAT + `
-> ssh-chat is made by @shazow.
const ABOUT_TEXT string = SYSTEM_MESSAGE_FORMAT + `-> ssh-chat is made by @shazow.
It is a custom ssh server built in Go to serve a chat experience
instead of a shell.
@ -79,10 +79,6 @@ func (c *Client) SysMsg(msg string, args ...interface{}) {
c.Msg <- ContinuousFormat(SYSTEM_MESSAGE_FORMAT, "-> "+fmt.Sprintf(msg, args...))
}
func (c *Client) SysMsg2(msg string, args ...interface{}) {
c.Write(ContinuousFormat(SYSTEM_MESSAGE_FORMAT, "-> "+fmt.Sprintf(msg, args...)))
}
func (c *Client) Write(msg string) {
c.term.Write([]byte(msg + "\r\n"))
}
@ -93,6 +89,24 @@ func (c *Client) WriteLines(msg []string) {
}
}
func (c *Client) Send(msg string) {
if len(msg) > MAX_MSG_LENGTH {
return
}
select {
case c.Msg <- msg:
default:
logger.Errorf("Msg buffer full, dropping: %s (%s)", c.Name, c.Conn.RemoteAddr())
c.Conn.Close()
}
}
func (c *Client) SendLines(msg []string) {
for _, line := range msg {
c.Send(line)
}
}
func (c *Client) IsSilenced() bool {
return c.silencedUntil.After(time.Now())
}
@ -216,7 +230,7 @@ func (c *Client) handleShell(channel ssh.Channel) {
c.SysMsg("No such name: %s", parts[1])
} else {
fingerprint := client.Fingerprint()
client.SysMsg2("Banned by %s.", c.ColoredName())
client.SysMsg("Banned by %s.", c.ColoredName())
c.Server.Ban(fingerprint, nil)
client.Conn.Close()
c.Server.Broadcast(fmt.Sprintf("* %s was banned by %s", parts[1], c.ColoredName()), nil)
@ -233,7 +247,7 @@ func (c *Client) handleShell(channel ssh.Channel) {
c.SysMsg("No such name: %s", parts[1])
} else {
fingerprint := client.Fingerprint()
client.SysMsg2("Made op by %s.", c.ColoredName())
client.SysMsg("Made op by %s.", c.ColoredName())
c.Server.Op(fingerprint)
}
}
@ -247,7 +261,7 @@ func (c *Client) handleShell(channel ssh.Channel) {
if client == nil {
c.SysMsg("No such name: %s", parts[1])
} else {
client.SysMsg2("Kicked by %s.", c.ColoredName())
client.SysMsg("Kicked by %s.", c.ColoredName())
client.Conn.Close()
c.Server.Broadcast(fmt.Sprintf("* %s was kicked by %s", parts[1], c.ColoredName()), nil)
}
@ -270,7 +284,7 @@ func (c *Client) handleShell(channel ssh.Channel) {
c.SysMsg("No such name: %s", parts[1])
} else {
client.Silence(duration)
client.SysMsg2("Silenced for %s by %s.", duration, c.ColoredName())
client.SysMsg("Silenced for %s by %s.", duration, c.ColoredName())
}
}
case "/msg": /* Send a PM */
@ -299,7 +313,7 @@ func (c *Client) handleShell(channel ssh.Channel) {
c.Msg <- fmt.Sprintf("-> Rate limiting in effect.")
continue
}
if c.IsSilenced() || len(msg) > 1000 {
if c.IsSilenced() || len(msg) > 1000 || len(msg) == 0 {
c.SysMsg("Message rejected.")
continue
}

17
server.go
View File

@ -61,11 +61,6 @@ func NewServer(privateKey []byte) (*Server, error) {
if server.IsBanned(fingerprint) {
return nil, fmt.Errorf("Banned.")
}
ip := strings.Split(conn.RemoteAddr().String(), ":")[0]
if ip == "73.3.250.197" {
// Can't believe I'm doing this...
return nil, fmt.Errorf("Banned.")
}
perm := &ssh.Permissions{Extensions: map[string]string{"fingerprint": fingerprint}}
return perm, nil
},
@ -93,11 +88,11 @@ func (s *Server) Broadcast(msg string, except *Client) {
if except != nil && client == except {
continue
}
/* Add an ascii BEL to ding clients when they're mentioned */
client.Send(msg)
if client.beepMe && strings.Contains(msg, client.Name) {
client.Msg <- msg + BEEP
} else {
client.Msg <- msg
/* Add an ascii BEL to ding clients when they're mentioned */
client.Send(BEEP)
}
}
}
@ -117,8 +112,8 @@ func (s *Server) Privmsg(nick, message string, sender *Client) error {
func (s *Server) Add(client *Client) {
go func() {
client.WriteLines(s.history.Get(10))
client.SysMsg2("Welcome to ssh-chat. Enter /help for more.")
client.SendLines(s.history.Get(10))
client.SysMsg("Welcome to ssh-chat. Enter /help for more.")
}()
s.lock.Lock()