Merge "Allow several valid signatures per WebView provider." (081dcb82) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebViewFactory.java

+21 −2

Original line number	Original line	Diff line number	Diff line
	@@ -133,6 +133,25 @@ public final class WebViewFactory {
	private static String TAG_DESCRIPTION = "description";		private static String TAG_DESCRIPTION = "description";
	private static String TAG_SIGNATURE = "signature";		private static String TAG_SIGNATURE = "signature";

			/**
			* Reads all signatures at the current depth (within the current provider) from the XML parser.
			*/
			private static String[] readSignatures(XmlResourceParser parser) throws IOException,
			XmlPullParserException {
			List<String> signatures = new ArrayList<String>();
			int outerDepth = parser.getDepth();
			while(XmlUtils.nextElementWithin(parser, outerDepth)) {
			if (parser.getName().equals(TAG_SIGNATURE)) {
			// Parse the value within the signature tag
			String signature = parser.nextText();
			signatures.add(signature);
			} else {
			Log.e(LOGTAG, "Found an element in a webview provider that is not a signature");
			}
			}
			return signatures.toArray(new String[signatures.size()]);
			}

	/**		/**
	* Returns all packages declared in the framework resources as potential WebView providers.		* Returns all packages declared in the framework resources as potential WebView providers.
	* @hide		* @hide
	@@ -161,9 +180,9 @@ public final class WebViewFactory {
	throw new MissingWebViewPackageException(		throw new MissingWebViewPackageException(
	"WebView provider in framework resources missing description");		"WebView provider in framework resources missing description");
	}		}
	String signature = parser.getAttributeValue(null, TAG_SIGNATURE);
	webViewProviders.add(		webViewProviders.add(
	new WebViewProviderInfo(packageName, description, signature));		new WebViewProviderInfo(packageName, description,
			readSignatures(parser)));
	}		}
	else {		else {
	Log.e(LOGTAG, "Found an element that is not a webview provider");		Log.e(LOGTAG, "Found an element that is not a webview provider");

core/java/android/webkit/WebViewProviderInfo.java

+15 −8

Original line number	Original line	Diff line number	Diff line
	@@ -40,10 +40,10 @@ public class WebViewProviderInfo implements Parcelable {
	public WebViewPackageNotFoundException(Exception e) { super(e); }		public WebViewPackageNotFoundException(Exception e) { super(e); }
	}		}

	public WebViewProviderInfo(String packageName, String description, String signature) {		public WebViewProviderInfo(String packageName, String description, String[] signatures) {
	this.packageName = packageName;		this.packageName = packageName;
	this.description = description;		this.description = description;
	this.signature = signature;		this.signatures = signatures;
	}		}

	private boolean hasValidSignature() {		private boolean hasValidSignature() {
	@@ -53,7 +53,7 @@ public class WebViewProviderInfo implements Parcelable {
	try {		try {
	// If no signature is declared, instead check whether the package is included in the		// If no signature is declared, instead check whether the package is included in the
	// system.		// system.
	if (signature == null)		if (signatures == null \|\| signatures.length == 0)
	return getPackageInfo().applicationInfo.isSystemApp();		return getPackageInfo().applicationInfo.isSystemApp();

	packageSignatures = getPackageInfo().signatures;		packageSignatures = getPackageInfo().signatures;
	@@ -62,8 +62,15 @@ public class WebViewProviderInfo implements Parcelable {
	}		}
	if (packageSignatures.length != 1)		if (packageSignatures.length != 1)
	return false;		return false;
	final byte[] releaseSignature = Base64.decode(signature, Base64.DEFAULT);
	return Arrays.equals(releaseSignature, packageSignatures[0].toByteArray());		final byte[] packageSignature = packageSignatures[0].toByteArray();
			// Return whether the package signature matches any of the valid signatures
			for (String signature : signatures) {
			final byte[] validSignature = Base64.decode(signature, Base64.DEFAULT);
			if (Arrays.equals(packageSignature, validSignature))
			return true;
			}
			return false;
	}		}

	/**		/**
	@@ -109,7 +116,7 @@ public class WebViewProviderInfo implements Parcelable {
	private WebViewProviderInfo(Parcel in) {		private WebViewProviderInfo(Parcel in) {
	packageName = in.readString();		packageName = in.readString();
	description = in.readString();		description = in.readString();
	signature = in.readString();		signatures = in.createStringArray();
	packageInfo = null;		packageInfo = null;
	}		}

	@@ -122,14 +129,14 @@ public class WebViewProviderInfo implements Parcelable {
	public void writeToParcel(Parcel out, int flags) {		public void writeToParcel(Parcel out, int flags) {
	out.writeString(packageName);		out.writeString(packageName);
	out.writeString(description);		out.writeString(description);
	out.writeString(signature);		out.writeStringArray(signatures);
	}		}

	// fields read from framework resource		// fields read from framework resource
	public String packageName;		public String packageName;
	public String description;		public String description;

	private String signature;		private String[] signatures;

	private PackageInfo packageInfo;		private PackageInfo packageInfo;
	// flags declaring we want extra info from the package manager		// flags declaring we want extra info from the package manager

core/res/res/xml/config_webview_packages.xml

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,5 +16,6 @@

	<webviewproviders>		<webviewproviders>
	<!-- The default WebView implementation -->		<!-- The default WebView implementation -->
	<webviewprovider description="Android WebView" packageName="com.android.webview" />		<webviewprovider description="Android WebView" packageName="com.android.webview">
			</webviewprovider>
	</webviewproviders>		</webviewproviders>