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

tor: Change auth order to only use password auth if -torpassword #7703

Merged
merged 1 commit into from Jun 8, 2016

Conversation

Projects
None yet
4 participants
@laanwj
Member

laanwj commented Mar 17, 2016

Change authentication order to make it more clear, and make it possible to use password authentication even though the Tor instance supports cookie auth (see #7700).

Before:

  • If Tor is configured to allow cookie authentication, always try cookie authentication first. If cookie authentication fails, stop trying.
  • Only if cookie authentication is not supported try password authentication with value of -torpassword (if provided)

After:

  • If the -torpassword option is provided, force use of password auth.
  • Give error message if -torpassword provided, but password auth is not available.
  • Give error message if only password auth available, but -torpassword not given.

@laanwj laanwj added the P2P label Mar 17, 2016

@laanwj laanwj referenced this pull request Mar 17, 2016

Closed

Get hidden service address #7700

@laanwj laanwj changed the title from tor: Change auth order to only use HASHEDPASSWORD if -torpassword to tor: Change auth order to only use password auth if -torpassword Mar 17, 2016

@laanwj laanwj added the Privacy label Mar 31, 2016

@sipa

View changes

Show outdated Hide outdated src/torcontrol.cpp
@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa May 17, 2016

Member

Concept ACK

Member

sipa commented May 17, 2016

Concept ACK

@gmaxwell

This comment has been minimized.

Show comment
Hide comment
@gmaxwell

gmaxwell May 25, 2016

Member

Concept ACK

Member

gmaxwell commented May 25, 2016

Concept ACK

tor: Change auth order to only use HASHEDPASSWORD if -torpassword
Change authentication order to make it more clear (see #7700).

- If the `-torpassword` option is provided, force use of
  `HASHEDPASSWORD` auth.

- Give error message if `-torpassword` provided, but
  `HASHEDPASSWORD` auth is not available.

- Give error message if only `HASHEDPASSWORD` available, but
  `-torpassword` not given.
@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Jun 6, 2016

Member

utACK 2e49448

Member

sipa commented Jun 6, 2016

utACK 2e49448

@laanwj laanwj merged commit 2e49448 into bitcoin:master Jun 8, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jun 8, 2016

Merge #7703: tor: Change auth order to only use password auth if -tor…
…password

2e49448 tor: Change auth order to only use HASHEDPASSWORD if -torpassword (Wladimir J. van der Laan)

@laanwj laanwj added this to the 0.12.2 milestone Sep 26, 2016

codablock added a commit to codablock/dash that referenced this pull request Sep 16, 2017

Merge bitcoin#7703: tor: Change auth order to only use password auth …
…if -torpassword

2e49448 tor: Change auth order to only use HASHEDPASSWORD if -torpassword (Wladimir J. van der Laan)

codablock added a commit to codablock/dash that referenced this pull request Sep 19, 2017

Merge bitcoin#7703: tor: Change auth order to only use password auth …
…if -torpassword

2e49448 tor: Change auth order to only use HASHEDPASSWORD if -torpassword (Wladimir J. van der Laan)

codablock added a commit to codablock/dash that referenced this pull request Dec 22, 2017

Merge bitcoin#7703: tor: Change auth order to only use password auth …
…if -torpassword

2e49448 tor: Change auth order to only use HASHEDPASSWORD if -torpassword (Wladimir J. van der Laan)

@fanquake fanquake removed the Needs backport label Mar 7, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment