LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Reimplement DumpUtils#checkDumpPermission() in ConnectivityService"

Browse Source
This commit is contained in:
Lucas Lin
2020-12-10 10:57:58 +00:00
committed by Gerrit Code Review
parent 999c30297a 99473f6489
commit 081753f277
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -186,7 +186,6 @@ import com.android.internal.net.VpnInfo;
import com.android.internal.net.VpnProfile; import com.android.internal.net.VpnProfile;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.internal.util.AsyncChannel; import com.android.internal.util.AsyncChannel;
import com.android.internal.util.DumpUtils;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.LocationPermissionChecker; import com.android.internal.util.LocationPermissionChecker;
import com.android.internal.util.MessageUtils; import com.android.internal.util.MessageUtils;
@@ -2525,9 +2524,21 @@ public class ConnectivityService extends IConnectivityManager.Stub
PriorityDump.dump(mPriorityDumper, fd, writer, args); PriorityDump.dump(mPriorityDumper, fd, writer, args);
} }
private boolean checkDumpPermission(Context context, String tag, PrintWriter pw) {
if (context.checkCallingOrSelfPermission(android.Manifest.permission.DUMP)
!= PackageManager.PERMISSION_GRANTED) {
pw.println("Permission Denial: can't dump " + tag + " from from pid="
+ Binder.getCallingPid() + ", uid=" + Binder.getCallingUid()
+ " due to missing android.permission.DUMP permission");
return false;
} else {
return true;
}
}
private void doDump(FileDescriptor fd, PrintWriter writer, String[] args, boolean asProto) { private void doDump(FileDescriptor fd, PrintWriter writer, String[] args, boolean asProto) {
final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return; if (!checkDumpPermission(mContext, TAG, pw)) return;
if (asProto) return; if (asProto) return;
if (ArrayUtils.contains(args, DIAG_ARG)) { if (ArrayUtils.contains(args, DIAG_ARG)) {