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

Block OpenVPN relays from being selected on android #5574

Merged
merged 3 commits into from
Dec 11, 2023

Conversation

Pururun
Copy link
Contributor

@Pururun Pururun commented Dec 8, 2023


This change is Reviewable

@Pururun Pururun added the Android Issues related to Android label Dec 8, 2023
@Pururun Pururun self-assigned this Dec 8, 2023
Copy link

linear bot commented Dec 8, 2023

@Pururun Pururun force-pushed the openvpn-servers-used-by-relay-selector-droid-565 branch 2 times, most recently from f20cb3b to b85daaa Compare December 8, 2023 14:20
Copy link
Contributor

@Rawa Rawa 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 6 files at r1, 1 of 2 files at r2, all commit messages.
Reviewable status: 6 of 7 files reviewed, 1 unresolved discussion (waiting on @Pururun)


android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt line 67 at r2 (raw file):

        // Fix tunnel protocol being set to any
        getSettings()?.relaySettings?.let { relaySettings ->
            if (relaySettings is RelaySettings.Normal) {

We should scope it as limited as possible I feel like::
relaySettings is RelaySettings.Normal && relaySettings.tunnelType != Constraint.Only(TunnelType.Wireguard)

Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewable status: 6 of 7 files reviewed, 1 unresolved discussion (waiting on @Pururun)


android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt line 67 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

We should scope it as limited as possible I feel like::
relaySettings is RelaySettings.Normal && relaySettings.tunnelType != Constraint.Only(TunnelType.Wireguard)

Also if this is approved we should reference some issue that has a due date to remove this.

Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 2 files at r2.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Pururun)

@Pururun Pururun force-pushed the openvpn-servers-used-by-relay-selector-droid-565 branch from ed528ab to 9c6b196 Compare December 11, 2023 09:58
@Pururun Pururun changed the title Set tunnel protocol explicitly to Wireguard Block OpenVPN relays from being selected on android Dec 11, 2023
Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 7 of 8 files at r3, 1 of 1 files at r4, 1 of 1 files at r5, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Pururun)

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Pururun)

Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewed all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

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.

:lgtm:

Reviewed all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Pururun Pururun force-pushed the openvpn-servers-used-by-relay-selector-droid-565 branch from bbecfef to 5bc23d3 Compare December 11, 2023 14:22
@Pururun Pururun merged commit 821d36f into main Dec 11, 2023
26 of 27 checks passed
@Pururun Pururun deleted the openvpn-servers-used-by-relay-selector-droid-565 branch December 11, 2023 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android Issues related to Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants