Commit Graph

8097 Commits

Author SHA1 Message Date
gabi-250 3fdadcc750 Merge branch 'nogit' into 'main'
CI: Remove unneeded install of git in maint-checks

See merge request tpo/core/arti!1492
2023-08-09 16:46:54 +00:00
Ian Jackson 879a3e8acf CI: Remove unneeded install of git in maint-checks
This was added in 9357a8fd6b "ci: add shebang to the GitLab CI" as
part of !990 to the `maint-checks` job; but the actual additional
check was added to the `doc-features` job (by mistake, fixed in
!1490); and, that shebang check script doesn't need git anyway.
2023-08-09 17:16:58 +01:00
Ian Jackson 72eff516ac Merge branch 'shebang-ci' into 'main'
ci: move shebang check into proper CI test

See merge request tpo/core/arti!1490
2023-08-09 15:50:00 +00:00
Emil Engler 01e619d872
ci: move shebang check into proper CI test
Currently, the shebang check CI is not executed, as it would need to
fail then.

See !1489
2023-08-09 16:56:36 +02:00
gabi-250 af755b5b49 Merge branch 'relative-shebang-nodep' into 'main'
maint: use relative shebang in `maint/bump_nodep`

See merge request tpo/core/arti!1489
2023-08-09 13:24:26 +00:00
Ian Jackson 0001f520ca Merge branch 'chutney' into 'main'
Disable chutney test again

Closes #810

See merge request tpo/core/arti!1488
2023-08-09 13:20:39 +00:00
Ian Jackson bde9a25f06 Merge branch 'tor-proto-incoming-discard' into 'main'
tor-proto: Implement IncomingStream::discard()

See merge request tpo/core/arti!1484
2023-08-09 12:58:41 +00:00
Emil Engler e8cdc4c3d2
maint: use relative shebang in `maint/bump_nodep` 2023-08-09 14:33:01 +02:00
Ian Jackson 96e56ab73d Disable chutney test again 2023-08-09 13:32:07 +01:00
Gabriela Moldovan 6073a4f767
tor-proto: Make update_state() and discard() return Result<(), Bug>.
These functions only ever return `Bug` errors.
2023-08-09 13:07:35 +01:00
Ian Jackson 1a1abac2c8 Merge branch 'key-uses' into 'main'
key-management.md: Use scenarios

See merge request tpo/core/arti!1445
2023-08-09 10:59:46 +00:00
Ian Jackson 8838c6bfd2 Merge branch 'remove-keystore-fs-perm-variant' into 'main'
tor-error: Remove KeystoreFsPermissions variant.

See merge request tpo/core/arti!1487
2023-08-09 10:57:39 +00:00
Ian Jackson 17b78f6108 Merge branch 'with_coverage-no-list' into 'main'
maint: provide no list of grcov formats

See merge request tpo/core/arti!1482
2023-08-09 10:37:43 +00:00
Ian Jackson 65409b02d7 Merge branch 'bridge-disabled' into 'main'
arti-client config: Fix bridge handling and test it

Closes #1000

See merge request tpo/core/arti!1481
2023-08-08 17:24:14 +00:00
Ian Jackson 4b64f988aa bridge config: Fix an error message slightly 2023-08-08 18:01:31 +01:00
Ian Jackson 635edd4129 arti-client config test: partially un-degrade formatting 2023-08-08 18:01:31 +01:00
Ian Jackson 2fc249ce66 arti-client config test: degrade formatting
As demanded by rustfmt
2023-08-08 18:01:31 +01:00
Ian Jackson e142f9a560 arti-client config: Add an extra test case for bridges
This complements the new `check_bridge_pt` test.
2023-08-08 18:01:31 +01:00
Ian Jackson 9ba4b496fd bridge config: reject bridges=true when there are no bridges
This is a bugfix.  Perhaps it is a security fix?
2023-08-08 18:01:31 +01:00
Gabriela Moldovan 5d0fb5177f
tor-error: Remove KeystoreFsPermissions variant.
According to the `ErrorKind` lumping guidelines, `KeystoreFsPermissions`
should be lumped with `FsPermissions`: they represent the same type
of error, and their "location" is the same ("Host").

Prompted by https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/1315#note_2916455
2023-08-08 16:46:20 +01:00
gabi-250 13c0b023e5 Merge branch 'coverage-fixes' into 'main'
maint: list the HTML dependencies in coverage

See merge request tpo/core/arti!1485
2023-08-08 15:11:50 +00:00
Emil Engler ab4d0182ab
maint: remove useless optarg
The `maint/coverage` script has a useless option `c`.
This commit removes it.
2023-08-08 16:32:31 +02:00
Emil Engler 3c1e5e32c2
maint: list the HTML dependencies in coverage
Currently, the `maint/coverage` script does not inform about the
dependencies required for generating the HTML output, those are, the
Python packages `bs4` and `lxml`.

This commit fixes that, by updating the help section accordingly.
2023-08-08 16:29:53 +02:00
Gabriela Moldovan a0daa9adb6
tor-proto: Implement IncomingStream::discard(). 2023-08-08 15:25:45 +01:00
Gabriela Moldovan 4507c33479
tor-proto: Replace boolean flags with an IncomingStreamState enum.
This commit introduces an `IncomingStreamState` enum, which indicates
whether the stream was accepted, discarded, or rejected, or if it is
still pending. The `is_rejected`/`is_accepted` boolean flags are no
longer needed.

Without this change, we'd need to introduce yet another boolean flag
when we implement `discard()` (for the "discarded" state).
2023-08-08 15:25:42 +01:00
Emil Engler e584cc8c08
maint: provide no list of grcov formats
This commit removes a list we provide for the supported grcov formats.
In my opinion, this is a practice of bad software engineering, as we would then
have to maintain this list by ourselves.

Therefore, this commit removes this list from the `maint/with_coverage` script
and replaces it with a references to the accompanying grcov command.
2023-08-08 16:16:21 +02:00
gabi-250 f9f8bcf5b9 key-management.md: Fix typos 2023-08-08 13:20:11 +00:00
gabi-250 fa595875ec Merge branch 'tor-proto-incoming-todo' into 'main'
tor-proto: Replace IncomingStreamMsg with IncomingStreamRequest.

See merge request tpo/core/arti!1477
2023-08-08 13:13:31 +00:00
Ian Jackson bff3475cc1 Merge branch 'tor-proto-incoming-drop' into 'main'
tor-proto: Implement `Drop` for `IncomingStream`.

See merge request tpo/core/arti!1476
2023-08-08 13:08:37 +00:00
Gabriela Moldovan 7446ed08b6
tor-proto: Fix broken docs. 2023-08-08 13:14:39 +01:00
Gabriela Moldovan a74e4cf661
tor-proto: Make it obvious that we're discarding a Result. 2023-08-08 13:07:45 +01:00
Gabriela Moldovan 4fb5121a77
tor-proto: Make StreamTarget::close return the oneshot::Receiver instead of blocking.
Instead of having 2 version of `StreamTarget::close` (a blocking one and
a nonblocking one), we can just return the `oneshot::Receiver` for
receiving the reactor's response and let the caller of
`StreamTarget::close` decide whether to block.

This allows us to reduce some code duplication in the `IncomingStream`
implementation.
2023-08-08 13:04:01 +01:00
Gabriela Moldovan 2b2f0f6065
tor-proto: Make take_inner() use mut_inner() to check the inner value. 2023-08-08 12:47:13 +01:00
gabi-250 3aa7c19427 Merge branch 'error' into 'main'
tor-config: Expand NoProjectDirs error message

See merge request tpo/core/arti!1480
2023-08-08 11:23:25 +00:00
Ian Jackson 849c83052e tor-config: Expand NoProjectDirs error message 2023-08-08 11:12:16 +01:00
gabi-250 a9c8bd5cc5 Merge branch 'error2' into 'main'
Allow operation when default config files cannot be determined

See merge request tpo/core/arti!1479
2023-08-07 18:32:47 +00:00
gabi-250 491898b5e3 Merge branch 'error' into 'main'
arti: Add context to default config files error message

See merge request tpo/core/arti!1478
2023-08-07 17:35:47 +00:00
Ian Jackson 00152515eb arti: Use ConfigurationSources::try_from_cmdline
This will allow us to proceed if

 * the default config file locations can't be established
   (eg due to failure of the `directories` crate), but

 * configuration files are explicitly specified,
   so the defaults wouldn't be used
2023-08-07 18:03:03 +01:00
Ian Jackson 6af1485a90 tor-config: Add ConfigurationSources::try_from_cmdline
We'll use this in crates/arti in a moment.
2023-08-07 18:03:03 +01:00
Ian Jackson 3d1c6cb395 arti: Add context to default config files error message
Improves the error mesage in #989 somewhat.

Before:

  target/debug/arti: error: Can't construct project directories to resolve a path element

After:

  target/debug/arti: error: identify default config file locations: Can't construct project directories to resolve a path element
2023-08-07 17:11:22 +01:00
Gabriela Moldovan 41fab65de1
tor-proto: Replace IncomingStreamMsg with IncomingStreamRequest.
The two enums essentially serve the same purpose, so we don't
need both of them.

This also addresses the TODO that says we should return an error if
`accept_data` is called for a RESOLVE stream.
2023-08-07 16:45:49 +01:00
Gabriela Moldovan ffb1360908
tor-proto: Implement `Drop` for `IncomingStream`. 2023-08-07 15:57:53 +01:00
Gabriela Moldovan df8a5b017e
tor-proto: Keep track of whether the `IncomingStream` was accepted.
The behaviour of `IncomingStream::drop` is going to depend on whether
the stream was accepted or not.
2023-08-07 15:57:50 +01:00
Gabriela Moldovan d856afe449
tor-proto: Add a function for closing a stream without waiting for the reactor to respond.
This will be used for implementing `Drop` for `IncomingStream` (it
needs to "reject" the stream on drop).
2023-08-07 15:57:36 +01:00
Ian Jackson 904337eae7 Merge branch 'tor-proto-todos' into 'main'
tor-proto: Rename misleading field in `DataCmdChecker`.

See merge request tpo/core/arti!1475
2023-08-07 13:19:21 +00:00
Gabriela Moldovan e61f1e8fbe
tor-proto: Rename misleading field in `DataCmdChecker`.
This is a follow-up from !1451.

This commit solves a `TODO HSS` introduced when `DataCmdChecker` got an
additional constructor (`new_connected`) for creating "pre-connected"
streams. See f6745d31 for more details.
2023-08-07 12:38:55 +01:00
gabi-250 9171080819 Merge branch 'proto-flaky-test' into 'main'
tor-proto: allow_stream_requests now waits until the control message is received.

Closes #994

See merge request tpo/core/arti!1474
2023-08-04 20:10:46 +00:00
Gabriela Moldovan 1a7c104d2e
tor-proto: Shut down the reactor if an error occurs in incoming stream init/close.
Propagating the error means will cause the reactor to shut down (there's
not much the control message sender can do about it, so there's no point
in sending it the error).
2023-08-04 20:46:05 +01:00
Gabriela Moldovan 2eaa0fa52b
tor-proto: reject() now waits until the control message is received.
As a result, by the time the `reject` future resolves, the stream has
been removed from the reactor's stream map and the corresponding END
cell has been sent.

Fixes #998.
2023-08-04 19:57:46 +01:00
Gabriela Moldovan f689e94f0f
tor-proto: allow_stream_requests now waits until the control message is received.
`ClientCirc::allow_stream_requests` is now `async` and waits until the
`AwaitIncomingStream` control message is processed by the reactor.

This guarantees that by the time the `allow_stream_requests` future
resolves, the reactor is ready to process BEGIN/BEGIN_DIR/RESOLVE cells.

Previously, the client tasks from allow_stream_requests tests had to
sleep before sending the BEGIN cell to give the reactor time to process
the `AwaitIncomingStream` control message (which tells the reactor to
expect incoming BEGIN/BEGIN_DIR/RESOLVE cells on the circuit).

Fixes #994
2023-08-04 19:22:45 +01:00