X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=daemon.go;h=1bb39598d3c9181678fda83a01803c7f18f6ce6f;hb=cfeaaad88f71bf1b0846251b7f448bf41bde26d9;hp=5eb1a875bd8fec55f115ace9f897fb6011870a62;hpb=80082ba6f68530a3806705c6313abdc8cbb799d8;p=goircd.git diff --git a/daemon.go b/daemon.go index 5eb1a87..1bb3959 100644 --- a/daemon.go +++ b/daemon.go @@ -18,11 +18,10 @@ along with this program. If not, see . package main import ( - "bytes" "fmt" - "io" + "io/ioutil" "log" - "os" + "net" "regexp" "sort" "strings" @@ -30,29 +29,36 @@ import ( ) const ( - PING_TIMEOUT = time.Second * 180 // Max time deadline for client's unresponsiveness - PING_THRESHOLD = time.Second * 90 // Max idle client's time before PING are sent - ALIVENESS_CHECK = time.Second * 10 // Client's aliveness check period + PingTimeout = time.Second * 180 // Max time deadline for client's unresponsiveness + PingThreshold = time.Second * 90 // Max idle client's time before PING are sent + AlivenessCheck = time.Second * 10 // Client's aliveness check period +) + +var ( + RENickname = regexp.MustCompile("^[a-zA-Z0-9-]{1,9}$") ) type Daemon struct { - 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 + Verbose bool + hostname string + motd string + clients map[*Client]bool + clientAliveness map[*Client]*ClientAlivenessState + rooms map[string]*Room + roomSinks map[*Room]chan ClientEvent + lastAlivenessCheck time.Time + logSink chan<- LogEvent + stateSink chan<- StateEvent } -func NewDaemon(hostname, motd string, log_sink chan LogEvent, state_sink chan StateEvent) *Daemon { +func NewDaemon(hostname, motd string, logSink chan<- LogEvent, stateSink chan<- StateEvent) *Daemon { daemon := Daemon{hostname: hostname, motd: motd} daemon.clients = make(map[*Client]bool) + daemon.clientAliveness = make(map[*Client]*ClientAlivenessState) daemon.rooms = make(map[string]*Room) - daemon.room_sinks = make(map[*Room]chan ClientEvent) - daemon.log_sink = log_sink - daemon.state_sink = state_sink + daemon.roomSinks = make(map[*Room]chan ClientEvent) + daemon.logSink = logSink + daemon.stateSink = stateSink return &daemon } @@ -63,33 +69,27 @@ func (daemon *Daemon) SendLusers(client *Client) { 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) { - if daemon.motd != "" { - fd, err := os.Open(daemon.motd) - if err == nil { - defer fd.Close() - motd := []byte{} - var err error - for err != io.EOF { - buf := make([]byte, 1024) - _, err = fd.Read(buf) - motd = append(motd, bytes.TrimRight(buf, "\x00")...) - } + if len(daemon.motd) == 0 { + client.ReplyNicknamed("422", "MOTD File is missing") + return + } - client.ReplyNicknamed("375", "- "+daemon.hostname+" Message of the day -") - for _, s := range bytes.Split(motd, []byte("\n")) { - client.ReplyNicknamed("372", "- "+string(s)) - } - client.ReplyNicknamed("376", "End of /MOTD command") - return - } else { - log.Println("Can not open motd file", daemon.motd, err) - } + motd, err := ioutil.ReadFile(daemon.motd) + if err != nil { + log.Printf("Can not read motd file %s: %v", daemon.motd, err) + client.ReplyNicknamed("422", "Error reading MOTD File") + return + } + + client.ReplyNicknamed("375", "- "+daemon.hostname+" Message of the day -") + for _, s := range strings.Split(strings.Trim(string(motd), "\n"), "\n") { + client.ReplyNicknamed("372", "- "+string(s)) } - client.ReplyNicknamed("422", "MOTD File is missing") + client.ReplyNicknamed("376", "End of /MOTD command") } func (daemon *Daemon) SendWhois(client *Client, nicknames []string) { @@ -97,11 +97,17 @@ func (daemon *Daemon) SendWhois(client *Client, nicknames []string) { nickname = strings.ToLower(nickname) found := false for c := range daemon.clients { - if c.nickname != nickname { + if strings.ToLower(c.nickname) != nickname { continue } found = true - client.ReplyNicknamed("311", c.nickname, c.username, c.conn.RemoteAddr().String(), "*", c.realname) + h := c.conn.RemoteAddr().String() + h, _, err := net.SplitHostPort(h) + if err != nil { + log.Printf("Can't parse RemoteAddr %q: %v", h, err) + h = "Unknown" + } + client.ReplyNicknamed("311", c.nickname, c.username, h, "*", c.realname) client.ReplyNicknamed("312", c.nickname, daemon.hostname, daemon.hostname) subscriptions := []string{} for _, room := range daemon.rooms { @@ -113,7 +119,7 @@ func (daemon *Daemon) SendWhois(client *Client, nicknames []string) { } 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) @@ -138,7 +144,7 @@ func (daemon *Daemon) SendList(client *Client, cols []string) { 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: @@ -153,19 +159,16 @@ func (daemon *Daemon) ClientRegister(client *Client, command string, cols []stri client.ReplyParts("431", "No nickname given") return } - nickname := strings.ToLower(cols[1]) - nickname_found := false - for client := range daemon.clients { - if client.nickname == nickname { - nickname_found = true + nickname := cols[1] + for existingClient := range daemon.clients { + if existingClient.nickname == nickname { + 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 !RENickname.MatchString(nickname) { client.ReplyParts("432", "*", cols[1], "Erroneous nickname") + return } client.nickname = nickname case "USER": @@ -194,13 +197,14 @@ func (daemon *Daemon) ClientRegister(client *Client, command string, cols []stri // 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) { - room_new := NewRoom(daemon.hostname, name, daemon.log_sink, daemon.state_sink) - room_sink := make(chan ClientEvent) - daemon.rooms[name] = room_new - daemon.room_sinks[room_new] = room_sink - go room_new.Processor(room_sink) - return room_new, room_sink +func (daemon *Daemon) RoomRegister(name string) (*Room, chan<- ClientEvent) { + roomNew := NewRoom(daemon.hostname, name, daemon.logSink, daemon.stateSink) + roomNew.Verbose = daemon.Verbose + roomSink := make(chan ClientEvent) + daemon.rooms[name] = roomNew + daemon.roomSinks[roomNew] = roomSink + go roomNew.Processor(roomSink) + return roomNew, roomSink } func (daemon *Daemon) HandlerJoin(client *Client, cmd string) { @@ -213,8 +217,7 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) { keys = []string{} } for n, room := range rooms { - room, valid := RoomNameSanitize(room) - if !valid { + if !RoomNameValid(room) { client.ReplyNoChannel(room) continue } @@ -226,12 +229,12 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) { } denied := false joined := false - for room_existing, room_sink := range daemon.room_sinks { - if room == room_existing.name { - if (room_existing.key != "") && (room_existing.key != key) { + for roomExisting, roomSink := range daemon.roomSinks { + if room == roomExisting.name { + if (roomExisting.key != "") && (roomExisting.key != key) { denied = true } else { - room_sink <- ClientEvent{client, EVENT_NEW, ""} + roomSink <- ClientEvent{client, EventNew, ""} joined = true } break @@ -239,64 +242,73 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) { } if denied { client.ReplyNicknamed("475", room, "Cannot join channel (+k) - bad key") - continue } if denied || joined { continue } - room_new, room_sink := daemon.RoomRegister(room) + roomNew, roomSink := daemon.RoomRegister(room) if key != "" { - room_new.key = key + roomNew.key = key + roomNew.StateSave() } - room_sink <- ClientEvent{client, EVENT_NEW, ""} + roomSink <- ClientEvent{client, EventNew, ""} } } -func (daemon *Daemon) Processor(events chan ClientEvent) { +func (daemon *Daemon) Processor(events <-chan ClientEvent) { for event := range events { + now := time.Now() + client := event.client // Check for clients aliveness - now := time.Now() - if daemon.last_aliveness_check.Add(ALIVENESS_CHECK).Before(now) { + if daemon.lastAlivenessCheck.Add(AlivenessCheck).Before(now) { for c := range daemon.clients { - if c.timestamp.Add(PING_TIMEOUT).Before(now) { + aliveness, alive := daemon.clientAliveness[c] + if !alive { + continue + } + if aliveness.timestamp.Add(PingTimeout).Before(now) { log.Println(c, "ping timeout") c.conn.Close() continue } - if !c.ping_sent && c.timestamp.Add(PING_THRESHOLD).Before(now) { + if !aliveness.pingSent && aliveness.timestamp.Add(PingThreshold).Before(now) { if c.registered { c.Msg("PING :" + daemon.hostname) - c.ping_sent = true + aliveness.pingSent = true } else { log.Println(c, "ping timeout") c.conn.Close() } } } - daemon.last_aliveness_check = now + daemon.lastAlivenessCheck = now } - client := event.client - switch event.event_type { - case EVENT_NEW: + switch event.eventType { + case EventNew: daemon.clients[client] = true - case EVENT_DEL: + daemon.clientAliveness[client] = &ClientAlivenessState{pingSent: false, timestamp: now} + case EventDel: delete(daemon.clients, client) - for _, room_sink := range daemon.room_sinks { - room_sink <- event + delete(daemon.clientAliveness, client) + for _, roomSink := range daemon.roomSinks { + roomSink <- event } - case EVENT_MSG: + case EventMsg: 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) + delete(daemon.clientAliveness, client) client.conn.Close() continue } if !client.registered { - go daemon.ClientRegister(client, command, cols) + daemon.ClientRegister(client, command, cols) continue } switch command { @@ -307,7 +319,7 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { client.ReplyNotEnoughParameters("JOIN") continue } - go daemon.HandlerJoin(client, cols[1]) + daemon.HandlerJoin(client, cols[1]) case "LIST": daemon.SendList(client, cols) case "LUSERS": @@ -326,16 +338,16 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { } continue } - room, _ := RoomNameSanitize(cols[0]) + room := cols[0] r, found := daemon.rooms[room] if !found { client.ReplyNoChannel(room) continue } if len(cols) == 1 { - daemon.room_sinks[r] <- ClientEvent{client, EVENT_MODE, ""} + daemon.roomSinks[r] <- ClientEvent{client, EventMode, ""} } else { - daemon.room_sinks[r] <- ClientEvent{client, EVENT_MODE, cols[1]} + daemon.roomSinks[r] <- ClientEvent{client, EventMode, cols[1]} } case "MOTD": go daemon.SendMotd(client) @@ -345,12 +357,12 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { 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, ""} + daemon.roomSinks[r] <- ClientEvent{client, EventDel, ""} } case "PING": if len(cols) == 1 { @@ -362,7 +374,7 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { 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) @@ -374,7 +386,7 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { target := strings.ToLower(cols[0]) for c := range daemon.clients { if c.nickname == target { - msg = fmt.Sprintf(":%s %s %s :%s", client, command, c.nickname, cols[1]) + msg = fmt.Sprintf(":%s %s %s %s", client, command, c.nickname, cols[1]) c.Msg(msg) break } @@ -382,22 +394,21 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { if msg != "" { continue } - target, _ = RoomNameSanitize(target) r, found := daemon.rooms[target] if !found { client.ReplyNoNickChan(target) } - daemon.room_sinks[r] <- ClientEvent{client, EVENT_MSG, command + " " + strings.TrimLeft(cols[1], ":")} + daemon.roomSinks[r] <- ClientEvent{client, EventMsg, command + " " + strings.TrimLeft(cols[1], ":")} case "TOPIC": if len(cols) == 1 { client.ReplyNotEnoughParameters("TOPIC") 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 { @@ -405,18 +416,19 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { } else { change = "" } - daemon.room_sinks[r] <- ClientEvent{client, EVENT_TOPIC, change} + daemon.roomSinks[r] <- ClientEvent{client, EventTopic, change} case "WHO": if len(cols) == 1 || len(cols[1]) < 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, ""} + daemon.roomSinks[r] <- ClientEvent{client, EventWho, ""} case "WHOIS": if len(cols) == 1 || len(cols[1]) < 1 { client.ReplyNotEnoughParameters("WHOIS") @@ -429,5 +441,9 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { client.ReplyNicknamed("421", command, "Unknown command") } } + if aliveness, alive := daemon.clientAliveness[client]; alive { + aliveness.timestamp = now + aliveness.pingSent = false + } } }