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

android: Validate proposal strings when importing profiles

Browse Source
This commit is contained in:
Tobias Brunner
2017-11-17 18:11:43 +01:00
parent 9f962f6c19
commit b03713add4
1 changed files with 16 additions and 2 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
+16 -2
View File
@@ -59,6 +59,7 @@ import org.strongswan.android.security.TrustedCertificateEntry;
import org.strongswan.android.ui.widget.TextInputLayoutHelper; import org.strongswan.android.ui.widget.TextInputLayoutHelper;
import org.strongswan.android.utils.Constants; import org.strongswan.android.utils.Constants;
import org.strongswan.android.utils.IPRangeSet; import org.strongswan.android.utils.IPRangeSet;
import org.strongswan.android.utils.Utils;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@@ -497,8 +498,8 @@ public class VpnProfileImportActivity extends AppCompatActivity
} }
} }
profile.setIkeProposal(obj.optString("ike-proposal", null)); profile.setIkeProposal(getProposal(obj, "ike-proposal", true));
profile.setEspProposal(obj.optString("esp-proposal", null)); profile.setEspProposal(getProposal(obj, "esp-proposal", false));
profile.setMTU(getInteger(obj, "mtu", Constants.MTU_MIN, Constants.MTU_MAX)); profile.setMTU(getInteger(obj, "mtu", Constants.MTU_MIN, Constants.MTU_MAX));
profile.setNATKeepAlive(getInteger(obj, "nat-keepalive", Constants.NAT_KEEPALIVE_MIN, Constants.NAT_KEEPALIVE_MAX)); profile.setNATKeepAlive(getInteger(obj, "nat-keepalive", Constants.NAT_KEEPALIVE_MIN, Constants.NAT_KEEPALIVE_MAX));
JSONObject split = obj.optJSONObject("split-tunneling"); JSONObject split = obj.optJSONObject("split-tunneling");
@@ -536,6 +537,19 @@ public class VpnProfileImportActivity extends AppCompatActivity
return res < min || res > max ? null : res; return res < min || res > max ? null : res;
} }
private String getProposal(JSONObject obj, String key, boolean ike) throws JSONException
{
String value = obj.optString(key, null);
if (!TextUtils.isEmpty(value))
{
if (!Utils.isProposalValid(ike, value))
{
throw new JSONException(getString(R.string.profile_import_failed_value, key));
}
}
return value;
}
private String getSubnets(JSONObject split, String key) throws JSONException private String getSubnets(JSONObject split, String key) throws JSONException
{ {
ArrayList<String> subnets = new ArrayList<>(); ArrayList<String> subnets = new ArrayList<>();