Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d9908aa authored by Yan Yan's avatar Yan Yan
Browse files

Support converting IKE Options to/from PersistableBundle 

Bug: 163604823
Test: FrameworksVcnTests(add new tests)
Change-Id: I28cad3cf4d8ccccb8233f76c631db3a302eb320b
parent 85414c1c

core/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtils.java

+29 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.net.ipsec.ike.IkeSessionParams.IkeAuthEapConfig; 
import android.net.ipsec.ike.IkeSessionParams.IkeAuthPskConfig;

import android.net.ipsec.ike.IkeSessionParams.IkeConfigRequest;

import android.os.PersistableBundle;

import android.util.ArraySet;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.vcn.util.PersistableBundleUtils;
@@ -48,6 +49,7 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.List;

import java.util.Objects;

import java.util.Set;



/**

 * Abstract utility class to convert IkeSessionParams to/from PersistableBundle.
@@ -68,6 +70,15 @@ public final class IkeSessionParamsUtils { 
    private static final String SOFT_LIFETIME_SEC_KEY = "SOFT_LIFETIME_SEC_KEY";

    private static final String DPD_DELAY_SEC_KEY = "DPD_DELAY_SEC_KEY";

    private static final String NATT_KEEPALIVE_DELAY_SEC_KEY = "NATT_KEEPALIVE_DELAY_SEC_KEY";

    private static final String IKE_OPTIONS_KEY = "IKE_OPTIONS_KEY";



    private static final Set<Integer> IKE_OPTIONS = new ArraySet<>();



    static {

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_ACCEPT_ANY_REMOTE_ID);

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_EAP_ONLY_AUTH);

        IKE_OPTIONS.add(IkeSessionParams.IKE_OPTION_MOBIKE);

    }



    /** Serializes an IkeSessionParams to a PersistableBundle. */

    @NonNull
@@ -113,7 +124,15 @@ public final class IkeSessionParamsUtils { 
        result.putInt(DPD_DELAY_SEC_KEY, params.getDpdDelaySeconds());

        result.putInt(NATT_KEEPALIVE_DELAY_SEC_KEY, params.getNattKeepAliveDelaySeconds());



        // TODO: Handle IKE options.

        final List<Integer> enabledIkeOptions = new ArrayList<>();

        for (int option : IKE_OPTIONS) {

            if (params.hasIkeOption(option)) {

                enabledIkeOptions.add(option);

            }

        }



        final int[] optionArray = enabledIkeOptions.stream().mapToInt(i -> i).toArray();

        result.putIntArray(IKE_OPTIONS_KEY, optionArray);



        return result;

    }
@@ -180,7 +199,15 @@ public final class IkeSessionParamsUtils { 
            }

        }



        // TODO: Handle IKE options.

        // Clear IKE Options that are by default enabled

        for (int option : IKE_OPTIONS) {

            builder.removeIkeOption(option);

        }



        final int[] optionArray = in.getIntArray(IKE_OPTIONS_KEY);

        for (int option : optionArray) {

            builder.addIkeOption(option);

        }



        return builder.build();

    }

tests/vcn/java/android/net/vcn/persistablebundleutils/IkeSessionParamsUtilsTest.java

+10 −0
Original line number Diff line number Diff line
@@ -130,6 +130,16 @@ public class IkeSessionParamsUtilsTest { 
        verifyPersistableBundleEncodeDecodeIsLossless(params);

    }



    @Test

    public void testEncodeRecodeParamsWithIkeOptions() throws Exception {

        final IkeSessionParams params =

                createBuilderMinimum()

                        .addIkeOption(IkeSessionParams.IKE_OPTION_ACCEPT_ANY_REMOTE_ID)

                        .addIkeOption(IkeSessionParams.IKE_OPTION_MOBIKE)

                        .build();

        verifyPersistableBundleEncodeDecodeIsLossless(params);

    }



    private static InputStream openAssetsFile(String fileName) throws Exception {

        return InstrumentationRegistry.getContext().getResources().getAssets().open(fileName);

    }