aboutsummaryrefslogtreecommitdiff
path: root/control-spec.txt
diff options
context:
space:
mode:
authorArthur Edelstein <arthuredelstein@gmail.com>2015-02-12 10:22:29 -0800
committerArthur Edelstein <arthuredelstein@gmail.com>2015-02-19 17:19:24 -0800
commit01e7cb79bf3877d2c3e2d8f4f46a0a8bdfadbddf (patch)
treed9b53dc1b3a245ce652cc88dd18309e19f88250e /control-spec.txt
parent237d927ad92aed2d94c28b774c199debde4c4245 (diff)
downloadtorspec-01e7cb79bf3877d2c3e2d8f4f46a0a8bdfadbddf.tar.gz
torspec-01e7cb79bf3877d2c3e2d8f4f46a0a8bdfadbddf.zip
Bug #14555: Clarify new CIRC attributes (SOCKS_USERNAME/PASSWORD)
Diffstat (limited to 'control-spec.txt')
-rw-r--r--control-spec.txt12
1 files changed, 11 insertions, 1 deletions
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