X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=daemon.go;h=30d458bd83a10b3a19c716a3081e8e88edb250b9;hb=60bd9cec0bea6457b64299e14de4c61c8e9082cf;hp=5eb1a875bd8fec55f115ace9f897fb6011870a62;hpb=80082ba6f68530a3806705c6313abdc8cbb799d8;p=goircd.git diff --git a/daemon.go b/daemon.go index 5eb1a87..30d458b 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" @@ -35,18 +34,23 @@ const ( 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) @@ -63,33 +67,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 +95,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 +117,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 +142,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 +157,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 + 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": @@ -194,8 +195,9 @@ 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) { +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 @@ -213,8 +215,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 } @@ -239,7 +240,6 @@ 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 @@ -247,12 +247,13 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) { 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 @@ -289,7 +290,9 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { 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() @@ -326,7 +329,7 @@ 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) @@ -345,10 +348,10 @@ 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, ""} } @@ -362,7 +365,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 +377,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,7 +385,6 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { if msg != "" { continue } - target, _ = RoomNameSanitize(target) r, found := daemon.rooms[target] if !found { client.ReplyNoNickChan(target) @@ -394,10 +396,10 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { 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 { @@ -411,10 +413,11 @@ func (daemon *Daemon) Processor(events chan ClientEvent) { 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":