summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | tor-netdoc: util: Add standard lint block to testsIan Jackson2023-02-101-0/+10
| | | | | | | | | | | | Not xure how my MR to try to do this everyone missed this one.
* | | Merge branch 'test_hsdesc_decrypt' into 'main'Nick Mathewson2023-02-133-8/+294
|\ \ \ | |/ / |/| | | | | | | | hsdesc: Add a test case for descriptors with ClientDescEncKey encryption. See merge request tpo/core/arti!1015
| * | netdoc: give hsdesc test info in its original form.Nick Mathewson2023-02-131-1/+5
| | |
| * | netdoc: Add a test for HSDesc decryption.Nick Mathewson2023-02-101-0/+63
| | |
| * | Add another test hsdesc to parse.Nick Mathewson2023-02-101-0/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This one was generated (by dgoulet) using `ClientDescEncKey` encryption. Its information is: ``` Address: paozpdhgz2okvc6kgbxvh2bnfsmt4xergrtcl4obkhopyvwxkpjzvoad.onion Time period: 19397 Client: paozpdhgz2okvc6kgbxvh2bnfsmt4xergrtcl4obkhopyvwxkpjzvoad:descriptor:x25519:SDZNMD4RP4SCH4EYTTUZPFRZINNFWAOPPKZ6BINZAC7LREV24RBQ Service: descriptor:x25519:SACGOAEODFGCYY22NYZV45ZESFPFLDGLMBWFACKEO34XGHASSAMQ ```
| * | hscrypto: Use minutes, not seconds, in blinding parameter.Nick Mathewson2023-02-101-8/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | Fixes an instance of #768. The problem with the test vectors is that I used a random time period number (1234) and the default-in-tor period length (1440) without checking whether 1440 _meant_ minutes or seconds. I'll add another test to Tor to make sure that the time period matches now. With this change, I can test Tor-generated hsdescs with encryption, so I'm fairly confident that the new behavior is correct.
* | Merge branch 'ticket_525_part2' into 'main'Nick Mathewson2023-02-0930-343/+376
|\ \ | | | | | | | | | | | | Apply restricted_msg to ChanMsg parts of tor-proto See merge request tpo/core/arti!1013
| * | Rename OpenClientChan{Msg,Cell} => OpenChan{Msg,Cell}S2CNick Mathewson2023-02-093-31/+31
| | |
| * | tor-proto: Do not parse forbidden commands on inbound cells.Nick Mathewson2023-02-093-88/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike C tor, we treat unrecognized commands as reason to kill off the connection entirely. That's fine; if we need to add an unrecognized command in the future, we can use VERSIONS to negotiate it. Also, if someday we want this code to support relay channels as well, we can use some type trickery to have that work too.
| * | tor-proto: only parse allowed ChanMsg types during handshake.Nick Mathewson2023-02-093-29/+100
| | |
| * | tor-cell: Return a useful error when restrist_msg rejects a command.Nick Mathewson2023-02-091-2/+3
| | |
| * | Change tor_bytes::Error::BadMessage to a Cow.Nick Mathewson2023-02-0918-52/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually, to avoid making a breaking change, I'm deprecating BadMessage and creating a new InvalidMessage variant that takes a Cow. This way I don't need to track every crate that re-exposes tor_bytes::Error and call this a breaking change in those. Making this change will allow tor_bytes errors to be much more helpful.
| * | tor-cell: Re-export paste so restrict_msg can work outside the crate.Nick Mathewson2023-02-091-3/+3
| | |
| * | tor-cell: Remove chancell::msg::Body::into_message.Nick Mathewson2023-02-091-52/+1
| | | | | | | | | | | | | | | It's now redundant, since `restricted_msg!` defines From and Into for us.
| * | tor-cell: Make RelayEarly a separate type.Nick Mathewson2023-02-097-12/+37
| | | | | | | | | | | | This allows us to remove a shenanigan from `restricted_msg!{}`.
| * | tor-cell: Have restrict_msg add conversion functions.Nick Mathewson2023-02-096-104/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every FooMsg type now implements Into<AnyFooMsg>, and TryFrom<FooMsg>. Additionally, it now implements From<X> for every distinct type that it supports. This last part lets us discard a bunch of code. Unfortunately, I needed some downright hackish trickery in order to get these macros to avoid generating `From<AnyFooMsg> for AnyFooMsg` and conflicting with the blanket implementation. The trickery to deal with RelayEarly and Relay being the same type was not necessarily worth it; I will be separating them and removing said trickery in the next commit.
| * | cell: Parameterize ChannelCodec::decode and encode.Nick Mathewson2023-02-093-12/+21
| | | | | | | | | | | | | | | | | | | | | This change lets us use ChannelCodec to encode and decode any restricted channel message type we want. (Later on, we'll turn the related Codec class in tor-proto into a more type-restricted version of this.)
* | | Merge branch 'hsdir' into 'main'Ian Jackson2023-02-0914-126/+375
|\ \ \ | | | | | | | | | | | | | | | | Compute the HS directory hash ring See merge request tpo/core/arti!1012
| * | | Fix minimal-versions (.then_some is too new)Ian Jackson2023-02-091-1/+1
| | | |
| * | | tor-netdir: Make is_hsdir_for_ring crate-localIan Jackson2023-02-091-1/+2
| | | | | | | | | | | | | | | | | | | | As per https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/1012#note_2876824
| * | | tor-netdir: Document fill_from_previous_netdir semverIan Jackson2023-02-091-0/+1
| | | |
| * | | Clarify which netdir index is meantNick Mathewson2023-02-091-1/+2
| | | |
| * | | Fix typosNick Mathewson2023-02-091-2/+2
| | | |
| * | | Fix compilation with various feature combinationsIan Jackson2023-02-092-6/+26
| | | |
| * | | hsdir: rustfmtIan Jackson2023-02-092-10/+6
| | | | | | | | | | | | | | | | | | | | Deferred formatting changes which would have obscured the commits they were prompted by.
| * | | hsdir: Actually compute the hash ringIan Jackson2023-02-092-8/+58
| | | |
| * | | hsdir: Be able to enumerate the hidden service directoriesIan Jackson2023-02-092-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | * Provide an accessor for the HSDIR flag * Provide a function for testing a relay for hsdir inclusion * Provide an iterator on NetDir that returns the hsdirs
| * | | hsdir: Ring calculation plumbingIan Jackson2023-02-092-17/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implement Netdir::compute_rings in terms of a new HsDirRing::compute, that currently does nothing. * Actually call Netdir::compute_rings (since now it doesn't panic). * Make Netdir::compute_rings not be pub. We do this unconditionally, rather than exposing the distinction between a netdir-without-hsdir and a netdir-with-hsdir.
| * | | hsdir representation: Introduce HsDirs generic typeIan Jackson2023-02-094-38/+63
| | | | | | | | | | | | | | | | | | | | This already allows us to get rid of some duplication, and will be useful more widely in a moment.
| * | | hsdir: Implement HS hash ring index calculationsIan Jackson2023-02-092-7/+80
| | | |
| * | | hsdir: Make HsDirIndex be AsRef<[u8; ]>Ian Jackson2023-02-091-2/+4
| | | |
| * | | hsdir: impl Eq for HsDirParamsIan Jackson2023-02-091-1/+1
| | | | | | | | | | | | | | | | This will allow us to tell if we can reuse parts of a ring.
| * | | hsdir: Rename HsRingParams to HsDirParamsIan Jackson2023-02-093-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file which contains this type is called hsdir_params.rs. We have a general problem with slight confusion about when to includen "dir" and when to include "ring". Resolve this in favour of the rule now added to the module-level doc comment.
| * | | hsdir_params: Rename some variables for consistencyIan Jackson2023-02-092-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These variables are going to be struct fields, which will sort of enforce consistent naming. The struct fields are going to appear in a moment. We'll call the fields "current" and "secondary" after the naming in the test cases. And import hsdir_params::HsRingParams, which we're going to make more references to.
| * | | hsdir: Replace open-coded params fields and args with HsRingParamsIan Jackson2023-02-093-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | This will enable us to pass these around more conveniently. And make empty_from_params take an owned params, which it would like.
| * | | hsdir: Remove a done TODO - this *is* now a TiSliceIan Jackson2023-02-091-1/+0
| | | |
| * | | tor-netdir: Provide Netdir::md_by_idxIan Jackson2023-02-091-0/+6
| | | | | | | | | | | | | | | | We'll need this shortly.
| * | | tor-netdir: Store previous netdir (if required by features)Ian Jackson2023-02-091-1/+15
| | | |
| * | | tor-netdoc: Change fill_from_previous_netdirIan Jackson2023-02-092-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove the return value, which was not used anywhere. Also remove the code to calculate the return value. * Take an Arc<NetDir> rather than a reference. We are going to want this for HS support. This has no overall effect on the lifetime of the4 Arc, which was owned at the one call site and then imediately dropped. * Change the documentation to explain what the function's role is in the netdir API, rather than the fiddly details of what it actually does internally. Relegate the latter to a code comment. (When we have HS, this will do more, or, at least, make further arrangements.)
| * | | tor-netdoc: Discuss that relays are ordered by rsa id in ConsensusIan Jackson2023-02-091-0/+3
| | | |
| * | | tor-netdir: Use typed-index-collections for router index (fix hsdir)Ian Jackson2023-02-091-2/+3
| | | | | | | | | | | | | | | | | | | | This was omitted in !1004. (Because this code isn't actually wired up yet, it typechecked anyway. But we need to fix it.)
| * | | hs time handling: Make TimePeriod contain length as IntegerMinutesIan Jackson2023-02-095-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | Locally, the only functional effect is that now we refuse to handle non-whole-number-of-minutes lengths - but since the consensus parameter can't represent those, there's no overall functional change.
| * | | tor-units: Fix IntegerMinutes accessor (omg)Ian Jackson2023-02-092-1/+3
| | | |
* | | | Merge branch 'hs_descencnonce' into 'main'Ian Jackson2023-02-092-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Rename DescEncNonce => HsDescEncNonce See merge request tpo/core/arti!1014
| * | | Rename DescEncNonce => HsDescEncNonceNick Mathewson2023-02-092-4/+4
|/ / /
* | | Merge branch 'key_renaming' into 'main'Nick Mathewson2023-02-0917-234/+233
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Rename hs-related identifiers to mirror those in the spec Closes #746 See merge request tpo/core/arti!1011
| * | hsdesc: Use an IntegerMinutes<u16> to hold lifetime.Nick Mathewson2023-02-084-10/+21
| | |
| * | netdoc: Fix most "TODO HS rename" commentsNick Mathewson2023-02-084-16/+14
| | |
| * | netdoc::hsdesc: Distinguish layer from document.Nick Mathewson2023-02-085-68/+62
| | |
| * | netdoc::hsdesc: Rename "layer" modules.Nick Mathewson2023-02-084-15/+14
| | |