Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always log web link filter verification parameters" into nyc-dev

Browse Source
This commit is contained in:
Chris Tate
2016-05-03 18:27:34 +00:00
committed by Android (Google) Code Review
parent 65e22a20ac eb87a4d969
commit 44b28493ca
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/StatementService/src/com/android/statementservice/IntentFilterVerificationReceiver.java
View File

@@ -24,6 +24,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.ResultReceiver; import android.os.ResultReceiver;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.util.Patterns; import android.util.Patterns;
@@ -90,8 +91,6 @@ public final class IntentFilterVerificationReceiver extends BroadcastReceiver {
String packageName = inputExtras.getString( String packageName = inputExtras.getString(
PackageManager.EXTRA_INTENT_FILTER_VERIFICATION_PACKAGE_NAME); PackageManager.EXTRA_INTENT_FILTER_VERIFICATION_PACKAGE_NAME);
Log.i(TAG, "Verify IntentFilter for " + hosts);
Bundle extras = new Bundle(); Bundle extras = new Bundle();
extras.putString(DirectStatementService.EXTRA_RELATION, HANDLE_ALL_URLS_RELATION); extras.putString(DirectStatementService.EXTRA_RELATION, HANDLE_ALL_URLS_RELATION);
@@ -103,6 +102,7 @@ public final class IntentFilterVerificationReceiver extends BroadcastReceiver {
return; return;
} }
ArrayList<String> finalHosts = new ArrayList<String>(hostList.length);
try { try {
ArrayList<String> sourceAssets = new ArrayList<String>(); ArrayList<String> sourceAssets = new ArrayList<String>();
for (String host : hostList) { for (String host : hostList) {
@@ -111,6 +111,7 @@ public final class IntentFilterVerificationReceiver extends BroadcastReceiver {
host = host.substring(2); host = host.substring(2);
} }
sourceAssets.add(createWebAssetString(scheme, host)); sourceAssets.add(createWebAssetString(scheme, host));
finalHosts.add(host);
} }
extras.putStringArrayList(DirectStatementService.EXTRA_SOURCE_ASSET_DESCRIPTORS, extras.putStringArrayList(DirectStatementService.EXTRA_SOURCE_ASSET_DESCRIPTORS,
sourceAssets); sourceAssets);
@@ -131,6 +132,9 @@ public final class IntentFilterVerificationReceiver extends BroadcastReceiver {
new IsAssociatedResultReceiver( new IsAssociatedResultReceiver(
new Handler(), context.getPackageManager(), verificationId)); new Handler(), context.getPackageManager(), verificationId));
// Required for CTS: log a few details of the validcation operation to be performed
logValidationParametersForCTS(verificationId, scheme, finalHosts, packageName);
serviceIntent.putExtras(extras); serviceIntent.putExtras(extras);
context.startService(serviceIntent); context.startService(serviceIntent);
} }
@@ -139,6 +143,15 @@ public final class IntentFilterVerificationReceiver extends BroadcastReceiver {
} }
} }
// CTS requirement: logging of the validation parameters in a specific format
private static final String CTS_LOG_FORMAT =
"Verifying IntentFilter. verificationId:%d scheme:\"%s\" hosts:\"%s\" package:\"%s\".";
private void logValidationParametersForCTS(int verificationId, String scheme,
ArrayList<String> finalHosts, String packageName) {
String hostString = TextUtils.join(" ", finalHosts.toArray());
Log.i(TAG, String.format(CTS_LOG_FORMAT, verificationId, scheme, hostString, packageName));
}
private String createAndroidAssetString(Context context, String packageName) private String createAndroidAssetString(Context context, String packageName)
throws NameNotFoundException { throws NameNotFoundException {
if (!ANDROID_PACKAGE_NAME_PATTERN.matcher(packageName).matches()) { if (!ANDROID_PACKAGE_NAME_PATTERN.matcher(packageName).matches()) {