ALIVENESS_CHECK = time.Second * 10 // Client's aliveness check period
)
+var (
+ RE_NICKNAME = regexp.MustCompile("^[a-zA-Z0-9-]{1,9}$")
+)
+
type Daemon struct {
+ Verbose bool
hostname string
motd string
clients map[*Client]bool
rooms map[string]*Room
room_sinks map[*Room]chan ClientEvent
last_aliveness_check time.Time
- log_sink chan LogEvent
- state_sink chan StateEvent
+ log_sink chan<- LogEvent
+ state_sink chan<- StateEvent
}
-func NewDaemon(hostname, motd string, log_sink chan LogEvent, state_sink chan StateEvent) *Daemon {
+func NewDaemon(hostname, motd string, log_sink chan<- LogEvent, state_sink chan<- StateEvent) *Daemon {
daemon := Daemon{hostname: hostname, motd: motd}
daemon.clients = make(map[*Client]bool)
daemon.rooms = make(map[string]*Room)
lusers++
}
}
- client.ReplyNicknamed("251", fmt.Sprintf("There are %d users and 0 services on 1 server", lusers))
+ client.ReplyNicknamed("251", fmt.Sprintf("There are %d users and 0 invisible on 1 servers", lusers))
}
func (daemon *Daemon) SendMotd(client *Client) {
}
client.ReplyNicknamed("375", "- "+daemon.hostname+" Message of the day -")
- for _, s := range bytes.Split(motd, []byte("\n")) {
+ for _, s := range bytes.Split(bytes.TrimRight(motd, "\n"), []byte("\n")) {
client.ReplyNicknamed("372", "- "+string(s))
}
client.ReplyNicknamed("376", "End of /MOTD command")
nickname = strings.ToLower(nickname)
found := false
for c := range daemon.clients {
- if c.nickname != nickname {
+ if strings.ToLower(c.nickname) != nickname {
continue
}
found = true
}
sort.Strings(subscriptions)
client.ReplyNicknamed("319", c.nickname, strings.Join(subscriptions, " "))
- client.ReplyNicknamed("318", c.nickname, "End of WHOIS list")
+ client.ReplyNicknamed("318", c.nickname, "End of /WHOIS list")
}
if !found {
client.ReplyNoNickChan(nickname)
client.ReplyNicknamed("322", room, fmt.Sprintf("%d", len(r.members)), r.topic)
}
}
- client.ReplyNicknamed("323", "End of LIST")
+ client.ReplyNicknamed("323", "End of /LIST")
}
// Unregistered client workflow processor. Unregistered client:
client.ReplyParts("431", "No nickname given")
return
}
- nickname := strings.ToLower(cols[1])
- nickname_found := false
+ nickname := cols[1]
for client := range daemon.clients {
if client.nickname == nickname {
- nickname_found = true
+ client.ReplyParts("433", "*", nickname, "Nickname is already in use")
+ return
}
}
- if nickname_found {
- client.ReplyParts("433", "*", cols[1], "Nickname is already in use")
- return
- }
- if ok, _ := regexp.MatchString("^[^_-][_a-z0-9-]{1,50}$", nickname); !ok {
+ if !RE_NICKNAME.MatchString(nickname) {
client.ReplyParts("432", "*", cols[1], "Erroneous nickname")
+ return
}
client.nickname = nickname
case "USER":
// Register new room in Daemon. Create an object, events sink, save pointers
// to corresponding daemon's places and start room's processor goroutine.
-func (daemon *Daemon) RoomRegister(name string) (*Room, chan ClientEvent) {
+func (daemon *Daemon) RoomRegister(name string) (*Room, chan<- ClientEvent) {
room_new := NewRoom(daemon.hostname, name, daemon.log_sink, daemon.state_sink)
+ room_new.Verbose = daemon.Verbose
room_sink := make(chan ClientEvent)
daemon.rooms[name] = room_new
daemon.room_sinks[room_new] = room_sink
keys = []string{}
}
for n, room := range rooms {
- room, valid := RoomNameSanitize(room)
- if !valid {
+ if !RoomNameValid(room) {
client.ReplyNoChannel(room)
continue
}
}
if denied {
client.ReplyNicknamed("475", room, "Cannot join channel (+k) - bad key")
- continue
}
if denied || joined {
continue
room_new, room_sink := daemon.RoomRegister(room)
if key != "" {
room_new.key = key
+ room_new.StateSave()
}
room_sink <- ClientEvent{client, EVENT_NEW, ""}
}
}
-func (daemon *Daemon) Processor(events chan ClientEvent) {
+func (daemon *Daemon) Processor(events <-chan ClientEvent) {
for event := range events {
// Check for clients aliveness
case EVENT_MSG:
cols := strings.SplitN(event.text, " ", 2)
command := strings.ToUpper(cols[0])
- log.Println(client, "command", command)
+ if daemon.Verbose {
+ log.Println(client, "command", command)
+ }
if command == "QUIT" {
delete(daemon.clients, client)
client.conn.Close()
}
continue
}
- room, _ := RoomNameSanitize(cols[0])
+ room := cols[0]
r, found := daemon.rooms[room]
if !found {
client.ReplyNoChannel(room)
continue
}
for _, room := range strings.Split(cols[1], ",") {
- room, _ = RoomNameSanitize(room)
r, found := daemon.rooms[room]
if !found {
client.ReplyNoChannel(room)
+ continue
}
daemon.room_sinks[r] <- ClientEvent{client, EVENT_DEL, ""}
}
continue
case "NOTICE", "PRIVMSG":
if len(cols) == 1 {
- client.ReplyNicknamed("411", "No recipient given")
+ client.ReplyNicknamed("411", "No recipient given ("+command+")")
continue
}
cols = strings.SplitN(cols[1], " ", 2)
if msg != "" {
continue
}
- target, _ = RoomNameSanitize(target)
r, found := daemon.rooms[target]
if !found {
client.ReplyNoNickChan(target)
continue
}
cols = strings.SplitN(cols[1], " ", 2)
- room, _ := RoomNameSanitize(cols[0])
- r, found := daemon.rooms[room]
+ r, found := daemon.rooms[cols[0]]
if !found {
- client.ReplyNoChannel(room)
+ client.ReplyNoChannel(cols[0])
+ continue
}
var change string
if len(cols) > 1 {
client.ReplyNotEnoughParameters("WHO")
continue
}
- room, _ := RoomNameSanitize(strings.Split(cols[1], " ")[0])
+ room := strings.Split(cols[1], " ")[0]
r, found := daemon.rooms[room]
if !found {
client.ReplyNoChannel(room)
+ continue
}
daemon.room_sinks[r] <- ClientEvent{client, EVENT_WHO, ""}
case "WHOIS":