denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Import custom subnets from profile file

Browse Source
This commit is contained in:
Tobias Brunner
2017-07-03 10:27:53 +02:00
parent 4471a93481
commit 4a04bd3da5
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
+19 -10
View File
@@ -490,16 +490,10 @@ public class VpnProfileImportActivity extends AppCompatActivity
JSONObject split = obj.optJSONObject("split-tunneling"); JSONObject split = obj.optJSONObject("split-tunneling");
if (split != null) if (split != null)
{ {
String excluded = split.optString("excluded", null); String included = getSubnets(split, "subnets");
if (excluded != null && !excluded.isEmpty()) profile.setIncludedSubnets(included != null ? included : null);
{ String excluded = getSubnets(split, "excluded");
if (IPRangeSet.fromString(excluded) == null) profile.setExcludedSubnets(excluded != null ? excluded : null);
{
throw new JSONException(getString(R.string.profile_import_failed_value,
"split-tunneling.excluded"));
}
profile.setExcludedSubnets(excluded);
}
int st = 0; int st = 0;
st |= split.optBoolean("block-ipv4") ? VpnProfile.SPLIT_TUNNELING_BLOCK_IPV4 : 0; st |= split.optBoolean("block-ipv4") ? VpnProfile.SPLIT_TUNNELING_BLOCK_IPV4 : 0;
st |= split.optBoolean("block-ipv6") ? VpnProfile.SPLIT_TUNNELING_BLOCK_IPV6 : 0; st |= split.optBoolean("block-ipv6") ? VpnProfile.SPLIT_TUNNELING_BLOCK_IPV6 : 0;
@@ -514,6 +508,21 @@ public class VpnProfileImportActivity extends AppCompatActivity
return res < min || res > max ? null : res; return res < min || res > max ? null : res;
} }
private String getSubnets(JSONObject split, String key) throws JSONException
{
String subnets = split.optString(key, null);
if (subnets != null && !subnets.isEmpty())
{
if (IPRangeSet.fromString(subnets) == null)
{
throw new JSONException(getString(R.string.profile_import_failed_value,
"split-tunneling." + key));
}
return subnets;
}
return null;
}
/** /**
* Save or update the profile depending on whether we actually have a * Save or update the profile depending on whether we actually have a
* profile object or not (this was created in updateProfileData) * profile object or not (this was created in updateProfileData)