Merge pull request #4105 from sfdctaka/fix-ios26-login-host-classifier

sfdctaka · web-flow · commit b155f785d2c6 · 2026-07-15T11:21:27.000-07:00
Fix login-host recovery on iOS 26: broaden classifier + surface prefetch errors
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj b/libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj
@@ -193,6 +193,7 @@
 		A3C7476129F709EB00D72B7F /* BiometricAuthenticationManagerInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3C7476029F709EB00D72B7F /* BiometricAuthenticationManagerInternal.swift */; };
 		AA9154482F59E3C900A0A41C /* SFRestAPIDataTaskRaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = AA9154472F59E3C900A0A41C /* SFRestAPIDataTaskRaceTests.m */; };
 		B70135621F87F63900995171 /* SFSDKAuthErrorManager.h in Headers */ = {isa = PBXBuildFile; fileRef = B70135601F87F63900995171 /* SFSDKAuthErrorManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		B70135631F87F63900995171 /* SFSDKAuthErrorManager+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = B70135651F87F63900995171 /* SFSDKAuthErrorManager+Internal.h */; };
 		B70135641F87F63900995171 /* SFSDKAuthErrorManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B70135611F87F63900995171 /* SFSDKAuthErrorManager.m */; };
 		B711290D1F8A780800436CFB /* SFSDKAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = B71129071F8A780700436CFB /* SFSDKAlertView.m */; };
 		B711290E1F8A780800436CFB /* SFSDKAlertMessageBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = B71129081F8A780800436CFB /* SFSDKAlertMessageBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -824,6 +825,7 @@
 		AA9154472F59E3C900A0A41C /* SFRestAPIDataTaskRaceTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SFRestAPIDataTaskRaceTests.m; path = SalesforceSDKCoreTests/SFRestAPIDataTaskRaceTests.m; sourceTree = SOURCE_ROOT; };
 		B70135601F87F63900995171 /* SFSDKAuthErrorManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SFSDKAuthErrorManager.h; sourceTree = "<group>"; };
 		B70135611F87F63900995171 /* SFSDKAuthErrorManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFSDKAuthErrorManager.m; sourceTree = "<group>"; };
+		B70135651F87F63900995171 /* SFSDKAuthErrorManager+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SFSDKAuthErrorManager+Internal.h"; sourceTree = "<group>"; };
 		B71129071F8A780700436CFB /* SFSDKAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFSDKAlertView.m; sourceTree = "<group>"; };
 		B71129081F8A780800436CFB /* SFSDKAlertMessageBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFSDKAlertMessageBuilder.h; sourceTree = "<group>"; };
 		B71129091F8A780800436CFB /* SFSDKAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SFSDKAlertView.h; sourceTree = "<group>"; };
@@ -1380,6 +1382,7 @@
 				4F96FCF41BFD32130022F021 /* SFAuthErrorHandlerList.h */,
 				4F96FCF51BFD32130022F021 /* SFAuthErrorHandlerList.m */,
 				B70135601F87F63900995171 /* SFSDKAuthErrorManager.h */,
+				B70135651F87F63900995171 /* SFSDKAuthErrorManager+Internal.h */,
 				B70135611F87F63900995171 /* SFSDKAuthErrorManager.m */,
 				6935FB9E23FDEC92002BEFCC /* ViewControllers */,
 			);
@@ -1858,6 +1861,7 @@
 				B7FB26E31F78096300FB25A2 /* SFSDKURLHandlerManager.h in Headers */,
 				CE4CE3091C0E523B009F6029 /* NSURL+SFAdditions.h in Headers */,
 				B70135621F87F63900995171 /* SFSDKAuthErrorManager.h in Headers */,
+				B70135631F87F63900995171 /* SFSDKAuthErrorManager+Internal.h in Headers */,
 				CE4CE32A1C0E523B009F6029 /* SalesforceSDKConstants.h in Headers */,
 				B7C274481F814BF500CE539D /* SFSDKSPLoginRequestCommand.h in Headers */,
 				CE4CE39B1C0E5272009F6029 /* SFSDKTestCredentialsData.h in Headers */,
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCoordinator.m
@@ -28,6 +28,7 @@
 #import "SFOAuthCoordinator+Internal.h"
 #import "SFOAuthInfo.h"
 #import "SFSDKAuthConfigUtil.h"
+#import "SFSDKAuthErrorManager.h"
 #import "SFSDKCryptoUtils.h"
 #import "NSData+SFSDKUtils.h"
 #import "NSString+SFAdditions.h"
@@ -55,6 +56,8 @@
 #import <SalesforceSDKCommon/SFSDKDatasharingHelper.h>
 #import <LocalAuthentication/LocalAuthentication.h>
 #import "SFSDKResourceUtils.h"
+#import "SFSDKAuthErrorManager+Internal.h"
+
 @interface SFOAuthCoordinator()
 
 @property (nonatomic) NSString *networkIdentifier;
@@ -197,8 +200,19 @@ - (void)authenticate {
             [SFSDKAuthConfigUtil getMyDomainAuthConfig:^(SFOAuthOrgAuthConfiguration *authConfig, NSError *error) {
                 __strong typeof(weakSelf) strongSelf = weakSelf;
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    // Ignore any errors why retrieving authconfig. Default to WKWebView
-                    // Errors should have already been logged.
+                    // A prefetch error against an unreachable login host is the earliest
+                    // authoritative signal that the host itself is bad. Falling through to
+                    // beginWebViewFlow would dispatch a WKWebView load against the same host
+                    // and hang silently, stranding the user on a blank screen and leaving the
+                    // bad host set as the sticky loginHost across app restarts. Surface it to
+                    // the failure delegate so the error manager's hostConnectionErrorHandler
+                    // can present an alert and roll loginHost back to the previous good host.
+                    // Non-host errors (parse failures, non-2xx responses, endpoint absent on
+                    // standard orgs) continue to fall through — auth-config is optional.
+                    if ([SFSDKAuthErrorManager errorIsHostConnectionFailure:error]) {
+                        [strongSelf notifyDelegateOfFailure:error authInfo:strongSelf.authInfo];
+                        return;
+                    }
                     if (!self.frontdoorBridgeLoginOverride &&
                         (authConfig.useNativeBrowserForAuth ||
                          [SalesforceSDKManager sharedManager].sdk_forceAdvancedAuthentication)) {
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFSDKAuthErrorManager+Internal.h b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFSDKAuthErrorManager+Internal.h
@@ -0,0 +1,40 @@
+/*
+ Copyright (c) 2017-present, salesforce.com, inc. All rights reserved.
+
+ Redistribution and use of this software in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this list of conditions
+ and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+ conditions and the following disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific prior written
+ permission of salesforce.com, inc.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+ WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "SFSDKAuthErrorManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+// Internal-only surface for SFSDKAuthErrorManager. Not published in the umbrella
+// header — kept off the public API but shared between SFOAuthCoordinator.m (for
+// the auth-config prefetch gate) and SFSDKErrorManagerTests.m (for direct
+// predicate coverage). A single compiler-visible declaration keeps both call
+// sites in sync if the signature ever changes.
+@interface SFSDKAuthErrorManager (Internal)
+
++ (BOOL)errorIsHostConnectionFailure:(nullable NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFSDKAuthErrorManager.m b/libs/SalesforceSDKCore/SalesforceSDKCore/Classes/UserAccount/SFSDKAuthErrorManager.m
@@ -28,6 +28,7 @@
  */
 
 #import "SFSDKAuthErrorManager.h"
+#import "SFSDKAuthErrorManager+Internal.h"
 #import "SFAuthErrorHandlerList.h"
 #import "SFAuthErrorHandler.h"
 #import "SFOAuthCoordinator+Internal.h"
@@ -135,14 +136,19 @@ - (SFAuthErrorHandlerList *)populateDefaultAuthErrorHandlerList
                                            }];
     [authHandlerList addAuthErrorHandler:self.networkFailureAuthErrorHandler];
     
-    // Host connection error handler
+    // Host connection error handler.
+    //
+    // NSURLErrorTimedOut / CannotConnectToHost / NetworkConnectionLost / NotConnectedToInternet
+    // also appear in +errorIsNetworkFailure:. NetworkFailureErrorHandler runs first in the chain
+    // and claims those codes only on Refresh flows with an existing access token; all other
+    // contexts return NO there and fall through to this handler. Ordering is guarded by
+    // testNetworkFailureClaimsFirst_RefreshWithToken.
     self.hostConnectionErrorHandler = [[SFAuthErrorHandler alloc] initWithName:kSFHostConnectionErrorHandler
                                      authSessionBlock:^BOOL(NSError *error, SFSDKAuthSession *authSession, NSDictionary *options) {
-                                        if ((error.userInfo[@"_kCFStreamErrorCodeKey"] && error.userInfo[@"_kCFStreamErrorDomainKey"]) ||
-                                            ([error.domain isEqualToString:kSFOAuthErrorDomain] && error.code == kSFOAuthErrorInvalidURL)) {
+                                        if ([[weakSelf class] errorIsHostConnectionFailure:error]) {
                                             if (self.hostConnectionErrorHandlerBlock) {
                                                 self.hostConnectionErrorHandlerBlock(error, authSession, options);
-                                                 return YES;
+                                                return YES;
                                             }
                                         }
                                         return NO;
@@ -187,11 +193,43 @@ + (BOOL)errorIsInvalidAuthCredentials:(NSError *)error
 }
 
 /**
- * Evaluates an NSError object to see if it represents a network failure during
- * an attempted connection.
+ * Evaluates an NSError object to see if it represents a host-connection failure —
+ * an unreachable or non-existent login host — rather than a transient network
+ * failure on an otherwise reachable host.
  * @param error The NSError to evaluate.
- * @return YES if the error represents a network failure, NO otherwise.
+ * @return YES if the error should trigger the host-connection recovery path, NO otherwise.
  */
++ (BOOL)errorIsHostConnectionFailure:(NSError *)error
+{
+    if (error == nil || error.domain == nil) {
+        return NO;
+    }
+    // Legacy iOS <= 18 shape: CFNetwork stream stack attached _kCFStreamError* keys to userInfo.
+    if (error.userInfo[@"_kCFStreamErrorCodeKey"] && error.userInfo[@"_kCFStreamErrorDomainKey"]) {
+        return YES;
+    }
+    // OAuth invalid-URL is a bad-host signal.
+    if ([error.domain isEqualToString:kSFOAuthErrorDomain] && error.code == kSFOAuthErrorInvalidURL) {
+        return YES;
+    }
+    // iOS 26+ shape: DNS resolution moved to Network.framework, so the CFStream keys are absent.
+    // NSURLErrorDomain surfaces these codes with a bare userInfo instead.
+    if ([error.domain isEqualToString:NSURLErrorDomain]) {
+        switch (error.code) {
+            case NSURLErrorCannotFindHost:            // -1003
+            case NSURLErrorDNSLookupFailed:           // -1006
+            case NSURLErrorCannotConnectToHost:       // -1004
+            case NSURLErrorTimedOut:                  // -1001
+            case NSURLErrorNotConnectedToInternet:    // -1009
+            case NSURLErrorNetworkConnectionLost:     // -1005
+                return YES;
+            default:
+                break;
+        }
+    }
+    return NO;
+}
+
 + (BOOL)errorIsNetworkFailure:(NSError *)error
 {
     BOOL isNetworkFailure = NO;
diff --git a/libs/SalesforceSDKCore/SalesforceSDKCoreTests/SFSDKErrorManagerTests.m b/libs/SalesforceSDKCore/SalesforceSDKCoreTests/SFSDKErrorManagerTests.m
