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

Commit 65406494 authored by Nathan Harold's avatar Nathan Harold
Browse files

Disable the AppOp Restriction for IpSec Tunnels 

This CL temporarily removes the AppOp restriction
that disallows creation of IpSec tunnels due to
the lack of the appropriate AppOp in AOSP/master.
When the relevant framework merges out to master,
this CL should be reverted.

Manually merging this due to skipping a merge
conflict at ef9f2740

Bug: none
Test: compilation
Change-Id: Ic06c193f85f6bcdd0ead4238825c1add78703cde
parent 401c4b1d

services/core/java/com/android/server/IpSecService.java

+15 −11
Original line number Diff line number Diff line
@@ -1481,10 +1481,13 @@ public class IpSecService extends IIpSecService.Stub { 
        }

    }



    private static final String TUNNEL_OP = "STOPSHIP"; // = AppOpsManager.OP_MANAGE_IPSEC_TUNNELS;



    private void enforceTunnelPermissions(String callingPackage) {

        checkNotNull(callingPackage, "Null calling package cannot create IpSec tunnels");

        if (false) { // STOPSHIP if this line is present

            switch (getAppOpsManager().noteOp(

                    AppOpsManager.OP_MANAGE_IPSEC_TUNNELS,

                        TUNNEL_OP,

                        Binder.getCallingUid(), callingPackage)) {

                case AppOpsManager.MODE_DEFAULT:

                    mContext.enforceCallingOrSelfPermission(
@@ -1496,6 +1499,7 @@ public class IpSecService extends IIpSecService.Stub { 
                    throw new SecurityException("Request to ignore AppOps for non-legacy API");

            }

        }

    }



    private void createOrUpdateTransform(

            IpSecConfig c, int resourceId, SpiRecord spiRecord, EncapSocketRecord socketRecord)

tests/net/java/com/android/server/IpSecServiceParameterizedTest.java

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import java.util.Arrays; 
import java.util.Collection;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.Parameterized;
@@ -592,6 +593,7 @@ public class IpSecServiceParameterizedTest { 
        }

    }



    @Ignore

    @Test

    public void testAddTunnelFailsForBadPackageName() throws Exception {

        try {