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

Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647

Browse Source 
am: 97f92ce41e

* commit '97f92ce41e66b54e56733f18bdaae056f08c0ae7':
  Add NetworkSecurityConfigProvider.install
This commit is contained in:
Chad Brubaker
2015-11-17 21:18:12 +00:00
committed by android-build-merger
parent 377cc4887d 97f92ce41e
commit 1627a091f4
2 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/security/net/config/ApplicationConfig.java
View File

@@ -144,4 +144,18 @@ public final class ApplicationConfig {
return sInstance;
}
}
/** @hide */
public static ApplicationConfig getPlatformDefault() {
return new ApplicationConfig(new ConfigSource() {
@Override
public NetworkSecurityConfig getDefaultConfig() {
return NetworkSecurityConfig.DEFAULT;
}
@Override
public Set<Pair<Domain, NetworkSecurityConfig>> getPerDomainConfigs() {
return null;
}
});
}
}

51
core/java/android/security/net/config/NetworkSecurityConfigProvider.java
View File

@@ -16,13 +16,21 @@
package android.security.net.config;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.util.Log;
import java.security.Security;
import java.security.Provider;
/** @hide */
public final class NetworkSecurityConfigProvider extends Provider {
private static String PREFIX =
private static final String LOG_TAG = "NetworkSecurityConfig";
private static final String PREFIX =
NetworkSecurityConfigProvider.class.getPackage().getName() + ".";
public static final String META_DATA_NETWORK_SECURITY_CONFIG =
"android.security.net.config";
private static final boolean DBG = true;
public NetworkSecurityConfigProvider() {
// TODO: More clever name than this
@@ -30,4 +38,43 @@ public final class NetworkSecurityConfigProvider extends Provider {
put("TrustManagerFactory.PKIX", PREFIX + "RootTrustManagerFactorySpi");
put("Alg.Alias.TrustManagerFactory.X509", "PKIX");
}
public static void install(Context context) {
ApplicationInfo info = null;
// TODO: This lookup shouldn't be done in the app startup path, it should be done lazily.
try {
info = context.getPackageManager().getApplicationInfo(context.getPackageName(),
PackageManager.GET_META_DATA);
} catch (PackageManager.NameNotFoundException e) {
throw new RuntimeException("Failed to look up ApplicationInfo", e);
}
int configResourceId = 0;
if (info != null && info.metaData != null) {
configResourceId = info.metaData.getInt(META_DATA_NETWORK_SECURITY_CONFIG);
}
ApplicationConfig config;
if (configResourceId != 0) {
boolean debugBuild = (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
if (DBG) {
Log.d(LOG_TAG, "Using Network Security Config from resource "
+ context.getResources().getResourceEntryName(configResourceId)
+ " debugBuild: " + debugBuild);
}
ConfigSource source = new XmlConfigSource(context, configResourceId, debugBuild);
config = new ApplicationConfig(source);
} else {
if (DBG) {
Log.d(LOG_TAG, "No Network Security Config specified, using platform default");
}
config = ApplicationConfig.getPlatformDefault();
}
ApplicationConfig.setDefaultInstance(config);
int pos = Security.insertProviderAt(new NetworkSecurityConfigProvider(), 1);
if (pos != 1) {
throw new RuntimeException("Failed to install provider as highest priority provider."
+ " Provider was installed at position " + pos);
}
}
}