Skip to content
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

Do not panic when reading public key of relay #6033

Merged
merged 1 commit into from
Mar 28, 2024

Conversation

MarkusPettersson98
Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 commented Mar 27, 2024

Do not panic when getting public key of relay due to unwrapping an unexpected relay type. The unwrap happened if an OpenVPN relay was selected on Android, which should not happen in the first place.


This change is Reviewable

@MarkusPettersson98 MarkusPettersson98 requested a review from dlon March 27, 2024 13:17
Copy link
Member

@dlon dlon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 5 of 5 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @MarkusPettersson98)


mullvad-relay-selector/src/relay_selector/detailer.rs line 180 at r1 (raw file):

}

/// TODO: Document

TODO

@MarkusPettersson98 MarkusPettersson98 force-pushed the fix-android-unwrap branch 3 times, most recently from 8475022 to 9d57001 Compare March 27, 2024 16:31
Copy link
Member

@dlon dlon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 3 of 3 files at r2, 2 of 2 files at r3, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @MrChocolatine)

@MarkusPettersson98 MarkusPettersson98 force-pushed the fix-android-unwrap branch 2 times, most recently from 65cf226 to 86c907b Compare March 27, 2024 16:41
Copy link
Member

@dlon dlon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r4, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @MrChocolatine)

Avoid panic when reading public key of relay due to unwrapping an
unexpected relay type. The unwrap happened if an OpenVPN relay was
selected on Android, which should not happen in the first place.
@MarkusPettersson98 MarkusPettersson98 merged commit 21cdeb1 into main Mar 28, 2024
42 of 45 checks passed
@MarkusPettersson98 MarkusPettersson98 deleted the fix-android-unwrap branch March 28, 2024 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants