From f0476334b3227f24efcf7636a3ac6086a1576d8c Mon Sep 17 00:00:00 2001 From: xster Date: Tue, 30 Mar 2021 10:15:10 -0700 Subject: [PATCH] Turn off insecure socket policy configuration in the engine (#25299) --- .../flutter/embedding/engine/loader/FlutterLoader.java | 3 --- .../darwin/ios/framework/Source/FlutterDartProject.mm | 10 ++++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java b/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java index b3a3753a5..5a859047f 100644 --- a/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java +++ b/shell/platform/android/io/flutter/embedding/engine/loader/FlutterLoader.java @@ -237,9 +237,6 @@ public class FlutterLoader { } shellArgs.add("--cache-dir-path=" + result.engineCachesPath); - if (!flutterApplicationInfo.clearTextPermitted) { - shellArgs.add("--disallow-insecure-connections"); - } if (flutterApplicationInfo.domainNetworkPolicy != null) { shellArgs.add("--domain-network-policy=" + flutterApplicationInfo.domainNetworkPolicy); } diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm index 9c50109d1..a03465348 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm @@ -134,12 +134,10 @@ flutter::Settings FLTDefaultSettingsForBundle(NSBundle* bundle) { } // Domain network configuration - NSDictionary* appTransportSecurity = - [mainBundle objectForInfoDictionaryKey:@"NSAppTransportSecurity"]; - settings.may_insecurely_connect_to_all_domains = - [FlutterDartProject allowsArbitraryLoads:appTransportSecurity]; - settings.domain_network_policy = - [FlutterDartProject domainNetworkPolicy:appTransportSecurity].UTF8String; + // Disabled in https://github.com/flutter/flutter/issues/72723. + // Re-enable in https://github.com/flutter/flutter/issues/54448. + settings.may_insecurely_connect_to_all_domains = true; + settings.domain_network_policy = ""; // SkParagraph text layout library NSNumber* enableSkParagraph = [mainBundle objectForInfoDictionaryKey:@"FLTEnableSkParagraph"]; -- GitLab