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

fix(android): Handle empty strings for allowed and disallowed VPN apps #3918

Merged
merged 2 commits into from
Mar 4, 2024

Conversation

jamilbk
Copy link
Member

@jamilbk jamilbk commented Mar 4, 2024

Copy link

vercel bot commented Mar 4, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
firezone ⬜️ Ignored (Inspect) Mar 4, 2024 8:13pm

Copy link

github-actions bot commented Mar 4, 2024

Terraform Cloud Plan Output

Plan: 8 to add, 7 to change, 8 to destroy.

Terraform Cloud Plan

Copy link

github-actions bot commented Mar 4, 2024

Performance Test Results

TCP

Test Name Received/s Sent/s Retransmits
direct-tcp-client2server 65.1 MiB (-2%) 65.6 MiB (-2%) 46 (+18%)
direct-tcp-server2client 55.3 MiB (+2%) 55.5 MiB (+1%) 30 (-14%)
relayed-tcp-client2server 28.9 MiB (-6%) 31.9 MiB (-2%) 152 (+63%)
relayed-tcp-server2client 29.1 MiB (-2%) 32.0 MiB (-1%) 228 (+55%)

UDP

Test Name Total/s Jitter Lost
direct-udp-client2server 50.0 MiB (-0%) 0.19ms (+7%) 0.00% (NaN%)
direct-udp-server2client 50.0 MiB (-0%) 0.21ms (+29%) 0.00% (NaN%)
relayed-udp-client2server 50.0 MiB (-0%) 0.37ms (+44%) 20.42% (+11%)
relayed-udp-server2client 50.0 MiB (+0%) 0.29ms (+30%) 20.48% (+4%)

Copy link
Collaborator

@ReactorScram ReactorScram left a comment

Choose a reason for hiding this comment

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

The code change looks okay mechanically but I don't understand how making one of these settings strings blank would cause both to be set? Or was that always happening even if only one was blank?

@jamilbk jamilbk added this pull request to the merge queue Mar 4, 2024
@jamilbk
Copy link
Member Author

jamilbk commented Mar 4, 2024

I don't understand how making one of these settings strings blank would cause both to be set? Or was that always happening even if only one was blank?

What was happening was that an empty string was causing the addAllowedApplication and addDisallowedApplication functions to be called with an empty string.

Android doesn't let you call both on a tunnel, so it crashed.

The reason both were empty was because when you provision the app with MDM, it sets them to an empty string (there is no null case)

Merged via the queue into main with commit 932594e Mar 4, 2024
66 checks passed
@jamilbk jamilbk deleted the fix/android-empty-app-vpn branch March 4, 2024 21:07
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.

None yet

2 participants