From b5f3bad5884679d78bfd02bb46c68df58ddff579 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 6 Feb 2020 16:18:19 +0100 Subject: [PATCH] Split downstram and upstream code into separate files --- downstream.go | 199 ++++++++++++++++++++++++++++++++++++++ server.go | 262 +------------------------------------------------- upstream.go | 73 ++++++++++++++ 3 files changed, 275 insertions(+), 259 deletions(-) create mode 100644 downstream.go create mode 100644 upstream.go diff --git a/downstream.go b/downstream.go new file mode 100644 index 0000000..61eff6f --- /dev/null +++ b/downstream.go @@ -0,0 +1,199 @@ +package jounce + +import ( + "fmt" + "io" + "net" + + "gopkg.in/irc.v3" +) + +type ircError struct { + Message *irc.Message +} + +func newUnknownCommandError(cmd string) ircError { + return ircError{&irc.Message{ + Command: irc.ERR_UNKNOWNCOMMAND, + Params: []string{ + "*", + cmd, + "Unknown command", + }, + }} +} + +func newNeedMoreParamsError(cmd string) ircError { + return ircError{&irc.Message{ + Command: irc.ERR_NEEDMOREPARAMS, + Params: []string{ + "*", + cmd, + "Not enough parameters", + }, + }} +} + +func (err ircError) Error() string { + return err.Message.String() +} + +type downstreamConn struct { + net net.Conn + irc *irc.Conn + srv *Server + registered bool + closed bool + nick string + username string + realname string +} + +func (c *downstreamConn) Close() error { + if err := c.net.Close(); err != nil { + return err + } + c.closed = true + return nil +} + +func (c *downstreamConn) WriteMessage(msg *irc.Message) error { + msg.Prefix = c.srv.prefix() + return c.irc.WriteMessage(msg) +} + +func (c *downstreamConn) handleMessage(msg *irc.Message) error { + switch msg.Command { + case "PING": + // TODO: handle params + return c.WriteMessage(&irc.Message{ + Command: "PONG", + Params: []string{c.srv.Hostname}, + }) + default: + if c.registered { + return c.handleMessageRegistered(msg) + } else { + return c.handleMessageUnregistered(msg) + } + } +} + +func (c *downstreamConn) handleMessageUnregistered(msg *irc.Message) error { + switch msg.Command { + case "NICK": + if len(msg.Params) != 1 { + return newNeedMoreParamsError(msg.Command) + } + c.nick = msg.Params[0] + case "USER": + if len(msg.Params) != 4 { + return newNeedMoreParamsError(msg.Command) + } + c.username = "~" + msg.Params[0] + c.realname = msg.Params[3] + case "QUIT": + return c.Close() + default: + return newUnknownCommandError(msg.Command) + } + if c.username != "" && c.nick != "" { + return c.register() + } + return nil +} + +func (c *downstreamConn) register() error { + c.registered = true + + err := c.WriteMessage(&irc.Message{ + Command: irc.RPL_WELCOME, + Params: []string{c.nick, "Welcome to jounce, " + c.nick}, + }) + if err != nil { + return err + } + + err = c.WriteMessage(&irc.Message{ + Command: irc.RPL_YOURHOST, + Params: []string{c.nick, "Your host is " + c.srv.Hostname}, + }) + if err != nil { + return err + } + + err = c.WriteMessage(&irc.Message{ + Command: irc.RPL_CREATED, + Params: []string{c.nick, "This server was created "}, // TODO + }) + if err != nil { + return err + } + + err = c.WriteMessage(&irc.Message{ + Command: irc.RPL_MYINFO, + Params: []string{c.nick, c.srv.Hostname, "unknown", "", ""}, + }) + if err != nil { + return err + } + + err = c.WriteMessage(&irc.Message{ + Command: irc.ERR_NOMOTD, + Params: []string{c.nick, "No MOTD"}, + }) + if err != nil { + return err + } + + return nil +} + +func (c *downstreamConn) handleMessageRegistered(msg *irc.Message) error { + switch msg.Command { + case "NICK", "USER": + return ircError{&irc.Message{ + Command: irc.ERR_ALREADYREGISTERED, + Params: []string{ + c.nick, + "You may not reregister", + }, + }} + case "QUIT": + return c.Close() + default: + return newUnknownCommandError(msg.Command) + } +} + +func handleConn(s *Server, netConn net.Conn) error { + s.Logger.Printf("Handling connection from %v", netConn.RemoteAddr()) + + c := downstreamConn{net: netConn, irc: irc.NewConn(netConn), srv: s} + defer c.Close() + for { + msg, err := c.irc.ReadMessage() + if err == io.EOF { + break + } else if err != nil { + return fmt.Errorf("failed to read IRC command: %v", err) + } + s.Logger.Printf("Downstream message: %v", msg) + + err = c.handleMessage(msg) + if ircErr, ok := err.(ircError); ok { + ircErr.Message.Prefix = s.prefix() + if err := c.WriteMessage(ircErr.Message); err != nil { + return fmt.Errorf("failed to write IRC reply: %v", err) + } + } else if err != nil { + return fmt.Errorf("failed to handle IRC command %q: %v", msg.Command, err) + } + + if c.closed { + return nil + } + } + + return c.Close() +} diff --git a/server.go b/server.go index e3e9ece..158ccbb 100644 --- a/server.go +++ b/server.go @@ -1,10 +1,7 @@ package jounce import ( - "crypto/tls" "fmt" - "io" - "log" "net" "gopkg.in/irc.v3" @@ -15,184 +12,6 @@ type Logger interface { Printf(format string, v ...interface{}) } -type ircError struct { - Message *irc.Message -} - -func newUnknownCommandError(cmd string) ircError { - return ircError{&irc.Message{ - Command: irc.ERR_UNKNOWNCOMMAND, - Params: []string{ - "*", - cmd, - "Unknown command", - }, - }} -} - -func newNeedMoreParamsError(cmd string) ircError { - return ircError{&irc.Message{ - Command: irc.ERR_NEEDMOREPARAMS, - Params: []string{ - "*", - cmd, - "Not enough parameters", - }, - }} -} - -func (err ircError) Error() string { - return err.Message.String() -} - -type downstreamConn struct { - net net.Conn - irc *irc.Conn - srv *Server - registered bool - closed bool - nick string - username string - realname string -} - -func (c *downstreamConn) Close() error { - if err := c.net.Close(); err != nil { - return err - } - c.closed = true - return nil -} - -func (c *downstreamConn) WriteMessage(msg *irc.Message) error { - msg.Prefix = c.srv.prefix() - return c.irc.WriteMessage(msg) -} - -func (c *downstreamConn) handleMessage(msg *irc.Message) error { - switch msg.Command { - case "PING": - // TODO: handle params - return c.WriteMessage(&irc.Message{ - Command: "PONG", - Params: []string{c.srv.Hostname}, - }) - default: - if c.registered { - return c.handleMessageRegistered(msg) - } else { - return c.handleMessageUnregistered(msg) - } - } -} - -func (c *downstreamConn) handleMessageUnregistered(msg *irc.Message) error { - switch msg.Command { - case "NICK": - if len(msg.Params) != 1 { - return newNeedMoreParamsError(msg.Command) - } - c.nick = msg.Params[0] - case "USER": - if len(msg.Params) != 4 { - return newNeedMoreParamsError(msg.Command) - } - c.username = "~" + msg.Params[0] - c.realname = msg.Params[3] - case "QUIT": - return c.Close() - default: - return newUnknownCommandError(msg.Command) - } - if c.username != "" && c.nick != "" { - return c.register() - } - return nil -} - -func (c *downstreamConn) register() error { - c.registered = true - - err := c.WriteMessage(&irc.Message{ - Command: irc.RPL_WELCOME, - Params: []string{c.nick, "Welcome to jounce, " + c.nick}, - }) - if err != nil { - return err - } - - err = c.WriteMessage(&irc.Message{ - Command: irc.RPL_YOURHOST, - Params: []string{c.nick, "Your host is " + c.srv.Hostname}, - }) - if err != nil { - return err - } - - err = c.WriteMessage(&irc.Message{ - Command: irc.RPL_CREATED, - Params: []string{c.nick, "This server was created "}, // TODO - }) - if err != nil { - return err - } - - err = c.WriteMessage(&irc.Message{ - Command: irc.RPL_MYINFO, - Params: []string{c.nick, c.srv.Hostname, "unknown", "", ""}, - }) - if err != nil { - return err - } - - err = c.WriteMessage(&irc.Message{ - Command: irc.ERR_NOMOTD, - Params: []string{c.nick, "No MOTD"}, - }) - if err != nil { - return err - } - - return nil -} - -func (c *downstreamConn) handleMessageRegistered(msg *irc.Message) error { - switch msg.Command { - case "NICK", "USER": - return ircError{&irc.Message{ - Command: irc.ERR_ALREADYREGISTERED, - Params: []string{ - c.nick, - "You may not reregister", - }, - }} - case "QUIT": - return c.Close() - default: - return newUnknownCommandError(msg.Command) - } -} - -type upstreamConn struct { - net net.Conn - irc *irc.Conn - srv *Server -} - -func (c *upstreamConn) handleMessage(msg *irc.Message) error { - switch msg.Command { - case "PING": - // TODO: handle params - return c.irc.WriteMessage(&irc.Message{ - Command: "PONG", - Params: []string{c.srv.Hostname}, - }) - default: - c.srv.Logger.Printf("Unhandled upstream message: %v", msg) - return nil - } -} - type Upstream struct { Addr string Nick string @@ -210,87 +29,12 @@ func (s *Server) prefix() *irc.Prefix { return &irc.Prefix{Name: s.Hostname} } -func (s *Server) handleConn(netConn net.Conn) error { - s.Logger.Printf("Handling connection from %v", netConn.RemoteAddr()) - - c := downstreamConn{net: netConn, irc: irc.NewConn(netConn), srv: s} - defer c.Close() - for { - msg, err := c.irc.ReadMessage() - if err == io.EOF { - break - } else if err != nil { - return fmt.Errorf("failed to read IRC command: %v", err) - } - s.Logger.Printf("Downstream message: %v", msg) - - err = c.handleMessage(msg) - if ircErr, ok := err.(ircError); ok { - ircErr.Message.Prefix = s.prefix() - if err := c.WriteMessage(ircErr.Message); err != nil { - return fmt.Errorf("failed to write IRC reply: %v", err) - } - } else if err != nil { - return fmt.Errorf("failed to handle IRC command %q: %v", msg.Command, err) - } - - if c.closed { - return nil - } - } - - return c.Close() -} - -func (s *Server) connect(upstream *Upstream) error { - s.Logger.Printf("Connecting to %v", upstream.Addr) - - netConn, err := tls.Dial("tcp", upstream.Addr, nil) - if err != nil { - return fmt.Errorf("failed to dial %q: %v", upstream.Addr, err) - } - - c := upstreamConn{net: netConn, irc: irc.NewConn(netConn), srv: s} - defer netConn.Close() - - err = c.irc.WriteMessage(&irc.Message{ - Command: "NICK", - Params: []string{upstream.Nick}, - }) - if err != nil { - return err - } - - err = c.irc.WriteMessage(&irc.Message{ - Command: "USER", - Params: []string{upstream.Username, "0", "*", upstream.Realname}, - }) - if err != nil { - return err - } - - for { - msg, err := c.irc.ReadMessage() - if err == io.EOF { - break - } else if err != nil { - return fmt.Errorf("failed to read IRC command: %v", err) - } - - if err := c.handleMessage(msg); err != nil { - return err - } - } - - return netConn.Close() -} - func (s *Server) Run() { for i := range s.Upstreams { upstream := &s.Upstreams[i] // TODO: retry connecting go func() { - if err := s.connect(upstream); err != nil { + if err := connect(s, upstream); err != nil { s.Logger.Printf("Failed to connect to upstream server %q: %v", upstream.Addr, err) } }() @@ -305,8 +49,8 @@ func (s *Server) Serve(ln net.Listener) error { } go func() { - if err := s.handleConn(c); err != nil { - log.Printf("error handling connection: %v", err) + if err := handleConn(s, c); err != nil { + s.Logger.Printf("Error handling connection: %v", err) } }() } diff --git a/upstream.go b/upstream.go new file mode 100644 index 0000000..16a3674 --- /dev/null +++ b/upstream.go @@ -0,0 +1,73 @@ +package jounce + +import ( + "crypto/tls" + "fmt" + "io" + "net" + + "gopkg.in/irc.v3" +) + +type upstreamConn struct { + net net.Conn + irc *irc.Conn + srv *Server +} + +func (c *upstreamConn) handleMessage(msg *irc.Message) error { + switch msg.Command { + case "PING": + // TODO: handle params + return c.irc.WriteMessage(&irc.Message{ + Command: "PONG", + Params: []string{c.srv.Hostname}, + }) + default: + c.srv.Logger.Printf("Unhandled upstream message: %v", msg) + return nil + } +} + +func connect(s *Server, upstream *Upstream) error { + s.Logger.Printf("Connecting to %v", upstream.Addr) + + netConn, err := tls.Dial("tcp", upstream.Addr, nil) + if err != nil { + return fmt.Errorf("failed to dial %q: %v", upstream.Addr, err) + } + + c := upstreamConn{net: netConn, irc: irc.NewConn(netConn), srv: s} + defer netConn.Close() + + err = c.irc.WriteMessage(&irc.Message{ + Command: "NICK", + Params: []string{upstream.Nick}, + }) + if err != nil { + return err + } + + err = c.irc.WriteMessage(&irc.Message{ + Command: "USER", + Params: []string{upstream.Username, "0", "*", upstream.Realname}, + }) + if err != nil { + return err + } + + for { + msg, err := c.irc.ReadMessage() + if err == io.EOF { + break + } else if err != nil { + return fmt.Errorf("failed to read IRC command: %v", err) + } + + if err := c.handleMessage(msg); err != nil { + return err + } + } + + return netConn.Close() +}