Changeset 117 in code for trunk

Timestamp:

Mar 18, 2020, 11:23:08 AM (5 years ago)

Author:

contact

Message:

Add basic infrastructure for bouncer service

Location:

trunk

Files:

• downstream.go (modified) (2 diffs)
• go.mod (modified) (1 diff)
• go.sum (modified) (1 diff)
• service.go (added)
• upstream.go (modified) (1 diff)

trunk/downstream.go

@@ -327 +327 @@
         switch msg.Command {
         case "NICK":
-                if err := parseMessageParams(msg, &dc.nick); err != nil {
-                        return err
-                }
+                var nick string
+                if err := parseMessageParams(msg, &nick); err != nil {
+                        return err
+                }
+                if nick == serviceNick {
+                        return ircError{&irc.Message{
+                                Command: irc.ERR_NICKNAMEINUSE,
+                                Params:  []string{dc.nick, nick, "Nickname reserved for bouncer service"},
+                        }}
+                }
+                dc.nick = nick
         case "USER":
-                var username string
-                if err := parseMessageParams(msg, &username, nil, nil, &dc.realname); err != nil {
-                        return err
-                }
-                dc.rawUsername = username
+                if err := parseMessageParams(msg, &dc.rawUsername, nil, nil, &dc.realname); err != nil {
+                        return err
+                }
         case "PASS":
                 if err := parseMessageParams(msg, &dc.password); err != nil {
@@ -891 +897 @@
 
                 for _, name := range strings.Split(targetsStr, ",") {
+                        if name == serviceNick {
+                                handleServicePRIVMSG(dc, text)
+                                continue
+                        }
+
                         uc, upstreamName, err := dc.unmarshalChannel(name)
                         if err != nil {

trunk/go.mod

@@ -5 +5 @@
 require (
         github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b
+        github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
         github.com/mattn/go-sqlite3 v2.0.3+incompatible
         golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4

trunk/go.sum

@@ -3 +3 @@
 github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b h1:uhWtEWBHgop1rqEk2klKaxPAkVDCXexai6hSuRQ7Nvs=
 github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod h1:G/dpzLu16WtQpBfQ/z3LYiYJn3ZhKSGWn83fyoyQe/k=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=

trunk/upstream.go

@@ -559 +559 @@
                 })
         case "PRIVMSG":
-                if err := parseMessageParams(msg, nil, nil); err != nil {
-                        return err
-                }
+                if msg.Prefix == nil {
+                        return fmt.Errorf("expected a prefix")
+                }
+
+                var nick string
+                if err := parseMessageParams(msg, &nick, nil); err != nil {
+                        return err
+                }
+
+                if msg.Prefix.Name == serviceNick {
+                        uc.logger.Printf("skipping PRIVMSG from soju's service: %v", msg)
+                        break
+                }
+                if nick == serviceNick {
+                        uc.logger.Printf("skipping PRIVMSG to soju's service: %v", msg)
+                        break
+                }
+
                 uc.ring.Produce(msg)
         case "INVITE":