Changeset 183 in code for trunk/downstream.go

Timestamp:

Mar 28, 2020, 4:25:48 PM (5 years ago)

Author:

contact

Message:

Add downstreamConn.clientName

File:

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

trunk/downstream.go

@@ -73 +73 @@
         rawUsername string
         networkName string
+        clientName  string
         realname    string
         hostname    string
@@ -575 +576 @@
 }
 
-func unmarshalUsername(rawUsername string) (username, network string) {
+func unmarshalUsername(rawUsername string) (username, client, network string) {
         username = rawUsername
-        if i := strings.LastIndexAny(username, "/@"); i >= 0 {
-                network = username[i+1:]
-        }
-        if i := strings.IndexAny(username, "/@"); i >= 0 {
-                username = username[:i]
-        }
-        return username, network
+
+        i := strings.IndexAny(username, "/@")
+        j := strings.LastIndexAny(username, "/@")
+        if i >= 0 {
+                username = rawUsername[:i]
+        }
+        if j >= 0 {
+                network = rawUsername[j+1:]
+        }
+        if i >= 0 && j >= 0 && i < j {
+                client = rawUsername[i+1 : j]
+        }
+
+        return username, client, network
 }
 
 func (dc *downstreamConn) authenticate(username, password string) error {
-        username, networkName := unmarshalUsername(username)
+        username, clientName, networkName := unmarshalUsername(username)
 
         u, err := dc.srv.db.GetUser(username)
@@ -606 +614 @@
                 return errAuthFailed
         }
+        dc.clientName = clientName
         dc.networkName = networkName
         return nil
@@ -623 +632 @@
         }
 
-        if dc.networkName == "" {
-                _, dc.networkName = unmarshalUsername(dc.rawUsername)
+        if dc.clientName == "" && dc.networkName == "" {
+                _, dc.clientName, dc.networkName = unmarshalUsername(dc.rawUsername)
         }