Changeset 789 in code for trunk

Timestamp:

Mar 3, 2022, 7:35:34 AM (3 years ago)

Author:

contact

Message:

downstream: be less strict when picking up client name

Allow e.g. the SASL username to contain "username/network" and the
raw username to contain "username@client", for instance.

File:

• trunk/downstream.go (modified) (1 diff)

trunk/downstream.go

@@ -1288 +1288 @@
         }
 
-        if dc.clientName == "" && dc.networkName == "" {
-                _, dc.clientName, dc.networkName = unmarshalUsername(dc.rawUsername)
+        _, fallbackClientName, fallbackNetworkName := unmarshalUsername(dc.rawUsername)
+        if dc.clientName == "" {
+                dc.clientName = fallbackClientName
+        }
+        if dc.networkName == "" {
+                dc.networkName = fallbackNetworkName
         }