Changeset 100 in code for trunk/downstream.go

Timestamp:

Mar 16, 2020, 8:32:18 AM (5 years ago)

Author:

contact

Message:

Strip client & network name from username

File:

• trunk/downstream.go (modified) (5 diffs)

trunk/downstream.go

@@ -62 +62 @@
         closed       chan struct{}
 
-        registered bool
-        user       *user
-        nick       string
-        username   string
-        realname   string
-        password   string   // empty after authentication
-        network    *network // can be nil
+        registered  bool
+        user        *user
+        nick        string
+        username    string
+        rawUsername string
+        realname    string
+        password    string   // empty after authentication
+        network     *network // can be nil
 }
 
@@ -324 +325 @@
                         return err
                 }
-                dc.username = "~" + username
+                dc.rawUsername = username
         case "PASS":
                 if err := parseMessageParams(msg, &dc.password); err != nil {
@@ -333 +334 @@
                 return newUnknownCommandError(msg.Command)
         }
-        if dc.username != "" && dc.nick != "" {
+        if dc.rawUsername != "" && dc.nick != "" {
                 return dc.register()
         }
@@ -349 +350 @@
 
 func (dc *downstreamConn) register() error {
-        username := strings.TrimPrefix(dc.username, "~")
+        username := dc.rawUsername
         var networkName string
         if i := strings.LastIndexAny(username, "/@"); i >= 0 {
@@ -357 +358 @@
                 username = username[:i]
         }
+        dc.username = "~" + username
 
         password := dc.password