[tor-commits] [torspec/master] Bug #14555: Clarify new CIRC attributes (SOCKS_USERNAME/PASSWORD)

[nickm@xxxxxxxxxxxxxx]

commit 01e7cb79bf3877d2c3e2d8f4f46a0a8bdfadbddf
Author: Arthur Edelstein <arthuredelstein@xxxxxxxxx>
Date:   Thu Feb 12 10:22:29 2015 -0800

    Bug #14555: Clarify new CIRC attributes (SOCKS_USERNAME/PASSWORD)
---
 control-spec.txt |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/control-spec.txt b/control-spec.txt
index f8a4cf5..966bdb6 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -1351,7 +1351,8 @@
                 "HSSI_CONNECTING" / "HSSI_ESTABLISHED" /
                 "HSSR_CONNECTING" / "HSSR_JOINED"
 
-      SocksUsername = SocksPassword = a quoted string
+      EscapedUsername = QuotedString
+      EscapedPassword = QuotedString
 
       HSAddress = 16*Base32Character
       Base32Character = ALPHA / "2" / "3" / "4" / "5" / "6" / "7"
@@ -1416,6 +1417,15 @@
         HSSR_CONNECTING          (connecting to client's rend point)
         HSSR_JOINED              (connected to client's RP circuit)
 
+   The "SOCKS_USERNAME" and "SOCKS_PASSWORD" fields indicate the credentials
+   that were used by a SOCKS client to connect to Tor's SOCKS port and
+   initiate this circuit. Special characters sent by the SOCKS client are
+   escaped, namely \\, \", \', \r, \n, \t, and byte values > 127 printed as
+   octal values, such as \377 for character 255. (Streams for SOCKS clients
+   connected with different usernames and/or passwords are isolated on
+   separate circuits if the IsolateSOCKSAuth flag is active; see Proposal
+   171.)
+
    The "REND_QUERY" field is provided only for hidden-service-related
    circuits, and only in versions 0.2.3.11-alpha and later.  Clients
    MUST accept hidden service addresses in formats other than that



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits