New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug4700 #343

Merged
merged 9 commits into from Sep 21, 2018

Conversation

Projects
None yet
5 participants
@asn-d6
Member

asn-d6 commented Sep 15, 2018

No description provided.

mahrud and others added some commits Jul 30, 2018

Introduce per-service HiddenServiceExportCircuitID torrc option.
Moves code to a function, better viewed with --color-moved.
Improve export_hs_client_circuit_id() function.
- Change default values.
- Beautify.
- Documentation.
Add unittest for HiddenServiceExportCircuitID.
Had to move a function to test helpers.
Encode the 32-bit Global Identifier as 2 x 16-bit in the IPv6 address.
Without this patch we would encode the IPv6 address' last part as
::ffffffff instead of ::ffff:ffff when the GID is UINT32_MAX.

See: https://bugs.torproject.org/4700
Change HiddenServiceExportCircuitID to take a string parameter: the p…
…rotocol.

This patch changes HiddenServiceExportCircuitID so instead of being a
boolean it takes a string, which is the protocol. Currently only the
'haproxy' protocol is defined.

See: https://bugs.torproject.org/4700
@coveralls

This comment has been minimized.

Show comment
Hide comment
@coveralls

coveralls Sep 15, 2018

Coverage Status

Coverage increased (+0.008%) to 61.833% when pulling 3477a73 on asn-d6:bug4700 into 035166e on torproject:master.

coveralls commented Sep 15, 2018

Coverage Status

Coverage increased (+0.008%) to 61.833% when pulling 3477a73 on asn-d6:bug4700 into 035166e on torproject:master.

uint32_t gid = 0; /* default value */
/* Generate a GID and source port for this client */
if (edge_conn->on_circuit != NULL) {

This comment has been minimized.

@ahf

ahf Sep 15, 2018

Member

Does it ever happen that this one is NULL? And in that case having gid = 0 is fine? Or should we guard this one with BUG()?

@ahf

ahf Sep 15, 2018

Member

Does it ever happen that this one is NULL? And in that case having gid = 0 is fine? Or should we guard this one with BUG()?

Add proxy headers as early as possible.
This patch moves the logic that adds the proxy headers to an earlier
point in the exit connection lifetime, which ensures that the
application data cannot be written to the outbuf before the proxy header
is added.

See: https://bugs.torproject.org/4700

@torproject-pusher torproject-pusher merged commit 3477a73 into torproject:master Sep 21, 2018

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment