github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes an issue where an MDM could set these to an empty string, causing
a crash because then both would be added, which [isn't
allowed](https://developer.android.com/reference/android/net/VpnService.Builder#addAllowedApplication(java.lang.String)).


https://console.firebase.google.com/u/0/project/firezone-55040/crashlytics/app/android:dev.firezone.android/issues/a79c59418b12b8de7718561aa9d23f7e?time=last-seven-days&types=crash&sessionEventKey=65E623EB03C100015D9436036031A7CF_1921042370018336672
This commit is contained in:
Jamil
2024-03-04 12:53:22 -08:00
committed by GitHub
parent 885152d7c4
commit 932594e919
2 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt
View File

@@ -330,16 +330,24 @@ class TunnelService : VpnService() {
addAddress(tunnelIpv6Address!!, 128)
appRestrictions.getString("allowedApplications")?.let {
Firebase.crashlytics.log("Allowed applications: $it")
it.split(",").forEach { p ->
addAllowedApplication(p.trim())
if (it.isNotBlank()) {
Firebase.crashlytics.log("Allowed applications: $it")
it.split(",").forEach { p ->
if (p.isNotBlank()) {
addAllowedApplication(p.trim())
}
}
}
}
appRestrictions.getString("disallowedApplications")?.let {
Firebase.crashlytics.log("Disallowed applications: $it")
it.split(",").forEach { p ->
addDisallowedApplication(p.trim())
if (it.isNotBlank()) {
Firebase.crashlytics.log("Disallowed applications: $it")
it.split(",").forEach { p ->
if (p.isNotBlank()) {
addDisallowedApplication(p.trim())
}
}
}
}

28
kotlin/android/app/src/main/res/values/strings.xml
View File

@@ -30,18 +30,36 @@
<!-- Error Dialog -->
<string name="error_dialog_title">Error</string>
<string name="error_dialog_message">Oops! Something went wrong. Contact your admin if this issue persists.</string>
<string name="error_dialog_message">
Oops! Something went wrong. Contact your admin if this issue persists.
</string>
<string name="error_dialog_button_text">Ok</string>
<string name="enable_vpn_permission">Enable VPN Permission</string>
<string name="vpn_permission_description">Firezone requires the VPN permission in order to route packets from your device to protected resources in a secure manner. All communication is end-to-end encrypted; we can never decrypt or otherwise monitor your communication. Please grant the VPN permission by tapping the button below.</string>
<string name="vpn_permission_description">
Firezone requires the VPN permission in order to route packets from your device to protected
resources in a secure manner. All communication is end-to-end encrypted; we can never
decrypt or otherwise monitor your communication. Please grant the VPN permission by tapping
the button below.
</string>
<string name="request_permission">Request Permission</string>
<string name="signing_in_requires_chrome_browser">Signing in requires Chrome browser</string>
<!-- Managed Configuration -->
<string name="config_token_title">Token</string>
<string name="config_token_description">The token used for authentication. Set this to a service account token to enable headless operation.</string>
<string name="config_token_description">
The token used for authentication.
Set this to a service account token to enable headless operation.
</string>
<string name="config_allowed_applications_title">Allowed Applications</string>
<string name="config_allowed_applications_description">A comma-separated list of application package IDs that are allowed to use the Firezone tunnel. If this list is empty, all applications are allowed.</string>
<string name="config_allowed_applications_description">
A comma-separated list of application package IDs that are allowed to use the Firezone
tunnel. If this list is empty, all applications are allowed. Either "Allowed Applications"
OR "Disallowed Applications" may be set *but not* both.
</string>
<string name="config_disallowed_applications_title">Disallowed Applications</string>
<string name="config_disallowed_applications_description">A comma-separated list of application package IDs that are disallowed to use the Firezone tunnel and will be routed outside of it. If this list is empty, no applications are disallowed.</string>
<string name="config_disallowed_applications_description">A comma-separated list of application
package IDs that are disallowed to use the Firezone tunnel and will be routed outside of it.
If this list is empty, no applications are disallowed. Either "Allowed Applications" OR
"Disallowed Applications" may be set *but not* both.
</string>
</resources>