David Goulet
fb1d212021
hs-v3: Set extended error when descriptor is not found
...
Part of #30382
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-11-18 19:06:43 +02:00
David Goulet
7bba8bf72f
hs-v3: Return descriptor decoding status when storing as client
...
This will allow us to callback into the HS subsytem depending on the decoding
status and return an extended SOCKS5 error code depending on the decoding
issue.
This is how we'll be able to tell the SocksPort connection if we are missing
or have bad client authorization for a service.
Part of #30382
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-11-18 19:06:43 +02:00
David Goulet
96a53221b0
hs-v3: Keep descriptor in cache if client auth is missing or bad
...
We now keep the descriptor in the cache, obviously not decoded, if it can't be
decrypted for which we believe client authorization is missing or unusable
(bad).
This way, it can be used later once the client authorization are added or
updated.
Part of #30382
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-11-18 19:06:43 +02:00
teor
c34fb3413d
Merge remote-tracking branch 'tor-github/pr/1517'
2019-11-18 11:21:37 +10:00
Nick Mathewson
183f89ccac
Merge remote-tracking branch 'tor-github/pr/1545'
2019-11-16 15:30:00 -05:00
Nick Mathewson
b0c1634ce9
Merge remote-tracking branch 'tor-github/pr/1544'
2019-11-16 15:29:14 -05:00
Nick Mathewson
59ba61a690
Make structs declared by tor_queues.h macros also follow naming rules
2019-11-16 15:27:08 -05:00
Nick Mathewson
cc271afeda
map.h: replace maptype with mapname_t
...
This change makes our macro bodies consistent with our naming
expectations for structs and types outside macro bodies.
2019-11-16 15:20:47 -05:00
Nick Mathewson
0c80c2e45f
handles.h: replace structname with structname_t
...
This change makes our macro bodies consistent with our naming
expectations for structs and types outside macro bodies.
2019-11-16 15:20:32 -05:00
Nick Mathewson
5a1a60e65e
Revise struct names in examples in comments to end with _t
2019-11-16 15:12:35 -05:00
Nick Mathewson
d700dc7801
Topic documentation on our publish-subscribe architecture.
2019-11-16 14:31:49 -05:00
Nick Mathewson
0e4e96b9bf
High-level documentation of configuration in Tor.
...
Closes ticket 32209.
2019-11-15 16:25:00 -05:00
Neel Chauhan
c8859eb754
Remove the extra whitespace around the DARWIN #defines
2019-11-15 15:05:53 -05:00
Neel Chauhan
4874b00065
Remove the extra whitespace in the lines_eq() if statement in consdiff_gen_diff()
2019-11-15 14:56:47 -05:00
Nick Mathewson
8b91680d5c
Doxygen: rename all .dox files to end with .md
...
Using a standard ending here will let other tools that expect
markdown understand our output here.
This commit was automatically generated with:
for fn in $(find src -name '*.dox'); do \
git mv "$fn" "${fn%.dox}.md"; \
done
2019-11-15 09:28:12 -05:00
Nick Mathewson
3a7369d0cf
Doxygen: remove /** and **/ from all .dox files
...
This is an automatically generated commit, made with:
find src -name '*.dox' | \
xargs perl -i -ne 'print unless (m#^\s*/?\*\*/?\s*$#);'
2019-11-15 09:23:51 -05:00
Nick Mathewson
625ad65382
Doxygen: expect .md files, not .dox files
...
Also, I have to add src/rust/registry to the excluded paths, since
it includes .md files that Doxygen can't handle.
2019-11-15 09:23:10 -05:00
Nick Mathewson
108d2967a7
Process "dox" files as regular markdown.
2019-11-15 09:20:51 -05:00
Nick Mathewson
97b5ff2b1d
Merge branch 'ticket32211'
2019-11-15 09:10:11 -05:00
Nick Mathewson
8746fedce4
Initialization documents: incorporate feedback from review.
...
(Thanks, Taylor!)
2019-11-15 09:00:54 -05:00
Nick Mathewson
7aaa4ae303
copy 0.4.2.4-rc changelog to master
2019-11-15 08:14:43 -05:00
Nick Mathewson
00cdb17a54
Merge branch 'maint-0.4.2'
...
"ours" to avoid version bump.
2019-11-15 08:06:36 -05:00
Nick Mathewson
6d81ca845c
bump version to 0.4.2.4-rc-dev
2019-11-15 08:06:09 -05:00
teor
825f52784d
Merge remote-tracking branch 'tor-github/pr/1535'
2019-11-15 12:11:32 +10:00
teor
b58e5091b7
Merge remote-tracking branch 'tor-github/pr/1533'
2019-11-15 12:11:22 +10:00
teor
d8d36c7dc3
Merge remote-tracking branch 'tor-github/pr/1536'
2019-11-15 11:28:29 +10:00
Nick Mathewson
d57a04b648
Avoid redundant typedef of or_options_t and smartlist_t in *_config.h
...
Fixes bug 32495.
2019-11-14 15:43:53 -05:00
David Goulet
196be8ca26
Merge branch 'tor-github/pr/1537'
2019-11-14 12:59:28 -05:00
Nick Mathewson
cf79ffaf1e
Fix 32-bit warnings in test_circuitmux.c
...
Fixes bug 32496; bug not in any released Tor.
2019-11-14 11:04:10 -05:00
David Goulet
1371d29e5b
Merge branch 'tor-github/pr/1489'
2019-11-14 10:37:14 -05:00
Nick Mathewson
a76b7cd8b5
Merge remote-tracking branch 'tor-github/pr/1531'
2019-11-14 09:58:37 -05:00
teor
d19f370aa2
Run "make autostyle"
2019-11-14 16:28:39 +10:00
teor
0df8bcfb6f
relay: Disable relay_sys when the relay module is disabled
...
Closes ticket 32245.
2019-11-14 16:27:06 +10:00
teor
88c2a23c4b
relay: Disable relay_periodic when the relay module is disabled
...
Closes ticket 32244.
2019-11-14 16:17:17 +10:00
teor
3b4a360ed0
practracker: Don't read editor temp files, attempt 2
...
(Or any files that start with "." or "#".)
Obviously correct changes to already-reviewed code.
2019-11-14 16:12:19 +10:00
teor
ef00b1ce0f
dirauth: Remove a HAVE_MODULE_DIRAUTH inside a function
...
There are now no HAVE_MODULE_{DIRAUTH,RELAY} inside functions.
Closes ticket 32163.
2019-11-14 15:43:27 +10:00
teor
b2b61b0268
changes: Update the changes file for 32410
...
When the relay module is disabled, we change the ClientOnly
default to 1. But we forgot to mention that in the changes file.
2019-11-14 15:39:40 +10:00
teor
9f37c0f4f2
changes: file for 32451
2019-11-14 13:12:42 +10:00
teor
aa3e2bbd4b
test/parseconf: Warn when the expected_log* file is missing
...
Part of 32451.
2019-11-14 12:57:59 +10:00
teor
ced434c586
test/parseconf: Update conf_examples to use expected_log
...
Part of 32451.
2019-11-14 12:57:34 +10:00
teor
c7838c71fb
test/parseconf: Add failure cases in conf_failures/
...
These failure cases can be used to test the failure behaviour
and failure logs of test_parseconf.sh.
See the README for details.
Part of 32451.
2019-11-14 11:57:50 +10:00
teor
51a6c0c8fd
test/parseconf: Stop adding newlines to *_printf
...
Cleanup after 32451.
2019-11-14 11:57:50 +10:00
teor
2c4ada729e
test/parseconf: Show tor command lines on failure
...
Part of 32451.
2019-11-14 11:57:50 +10:00
teor
a5628cf5b3
test/parseconf: Refactor and simplify, stage 2
...
Remove more duplicate code.
Eliminate some arguments.
Rewrite some comments.
Cleanup after 32451.
2019-11-14 10:55:21 +10:00
teor
39046019ec
test/parseconf: Refactor and standardise, stage 1
...
Remove duplicate code, and standardise similar behaviour.
Add some additional error checking.
Cleanup after 32451.
2019-11-14 10:55:21 +10:00
teor
b4b3060f69
test/parseconf: Rename some functions, and reformat
...
Part of 32451.
2019-11-14 10:55:21 +10:00
teor
e6ca32fae3
test/parseconf: Use consistent formatting
...
Make spacing, quotes, and env vars consistent.
Cleanup after 32451 and 32468.
2019-11-14 10:55:21 +10:00
teor
4514bfe9c2
test/parseconf: Stop ignoring --dump-config failures
...
When we added the $FILTER for Windows newlines, we made
the pipeline always exit successfully, even if tor failed.
Fixes bug 32468; bugfix on 0.4.2.1-alpha.
2019-11-14 10:55:21 +10:00
teor
7ef44100c4
test/parseconf: Standardise output messages
...
Part of 32451.
2019-11-14 10:55:21 +10:00
teor
3df6432006
test/parseconf: Add an expected_log file
...
The "expected_log" file is a set of patterns that matches the
output of "tor --verify-config". Unlike "error", it expects a
successful exit status.
Part of 32451.
2019-11-14 10:55:21 +10:00