Added flag

Author: josephpab

IdentityCore/src/MSIDConstants.h

@@ -216,6 +216,7 @@ extern NSString * _Nonnull const MSID_FLIGHT_SUPPORT_DUNA_CBA;
 extern NSString * _Nonnull const MSID_FLIGHT_DISABLE_JIT_TROUBLESHOOTING_LEGACY_AUTH;
 extern NSString * _Nonnull const MSID_FLIGHT_CLIENT_SFRT_STATUS;
 extern NSString * _Nonnull const MSID_FLIGHT_DISABLE_PREFERRED_IDENTITY_CBA;
+extern NSString * _Nonnull const MSID_FLIGHT_SUPPORT_STATE_VALIDATION_DUNA_CBA;
 
 /**
  * Flight to indicate if remove account artifacts should be disabled

IdentityCore/src/MSIDConstants.m

@@ -88,6 +88,7 @@
 NSString *const MSID_FLIGHT_DISABLE_JIT_TROUBLESHOOTING_LEGACY_AUTH = @"disable_jit_remediation_legacy_auth";
 NSString *const MSID_FLIGHT_CLIENT_SFRT_STATUS = @"sfrt_v2";
 NSString *const MSID_FLIGHT_DISABLE_PREFERRED_IDENTITY_CBA = @"dis_pre_iden_cba";
+NSString *const MSID_FLIGHT_SUPPORT_STATE_VALIDATION_DUNA_CBA = @"support_state_validation_duna_cba";
 
 // Making the flight string short to avoid legacy broker url size limit
 NSString *const MSID_FLIGHT_DISABLE_REMOVE_ACCOUNT_ARTIFACTS = @"disable_rm_metadata";

IdentityCore/src/webview/operations/ios/MSIDSwitchBrowserResumeOperation.m

@@ -28,6 +28,8 @@
 #import "MSIDWebviewFactory.h"
 #import "MSIDInteractiveTokenRequestParameters.h"
 #import "MSIDWebResponseOperationFactory.h"
+#import "MSIDConstants.h"
+#import "MSIDFlightManager.h"
 
 @interface MSIDSwitchBrowserResumeOperation()
 
@@ -87,17 +89,20 @@ - (void)invokeWithRequestParameters:(nonnull MSIDInteractiveTokenRequestParamete
      webviewResponseCompletionBlock:(nonnull MSIDWebviewAuthCompletionHandler)webviewResponseCompletionBlock
    authorizationCodeCompletionBlock:(nonnull MSIDInteractiveAuthorizationCodeCompletionBlock)authorizationCodeCompletionBlock
 {
-    MSIDSwitchBrowserResponse *parentResponse = (MSIDSwitchBrowserResponse *)self.switchBrowserResumeResponse.parentResponse;
-    NSError *stateValidationError = nil;
-    
-    BOOL stateValidated = [MSIDSwitchBrowserResponse validateStateParameter:self.switchBrowserResumeResponse.state
-                                                              expectedState:parentResponse.state
-                                                                      error:&stateValidationError];
-    if (!stateValidated)
+    if ([MSIDFlightManager.sharedInstance boolForKey:MSID_FLIGHT_SUPPORT_STATE_VALIDATION_DUNA_CBA])
     {
-        MSID_LOG_WITH_CTX(MSIDLogLevelError, requestParameters, @"Resume operation rejected due to state validation failure");
-        if (webviewResponseCompletionBlock) webviewResponseCompletionBlock(nil, stateValidationError);
-        return;
+        MSIDSwitchBrowserResponse *parentResponse = (MSIDSwitchBrowserResponse *)self.switchBrowserResumeResponse.parentResponse;
+        NSError *stateValidationError = nil;
+        
+        BOOL stateValidated = [MSIDSwitchBrowserResponse validateStateParameter:self.switchBrowserResumeResponse.state
+                                                                  expectedState:parentResponse.state
+                                                                          error:&stateValidationError];
+        if (!stateValidated)
+        {
+            MSID_LOG_WITH_CTX(MSIDLogLevelError, requestParameters, @"Resume operation rejected due to state validation failure");
+            if (webviewResponseCompletionBlock) webviewResponseCompletionBlock(nil, stateValidationError);
+            return;
+        }
     }
 
     webRequestConfiguration.startURL = [[NSURL alloc] initWithString:self.switchBrowserResumeResponse.actionUri];

IdentityCore/src/webview/response/MSIDSwitchBrowserResponse.m

@@ -50,17 +50,20 @@ - (instancetype)initWithURL:(NSURL *)url
     {
         if (![self isMyUrl:url redirectUri:redirectUri]) return nil;
 
-        NSError *stateCheckError = nil;
-        BOOL stateValidated = [MSIDSwitchBrowserResponse validateStateParameter:self.parameters[MSID_OAUTH2_STATE]
-                                                                  expectedState:requestState
-                                                                          error:&stateCheckError];
-        if (!stateValidated)
+        if ([MSIDFlightManager.sharedInstance boolForKey:MSID_FLIGHT_SUPPORT_STATE_VALIDATION_DUNA_CBA])
         {
-            if (stateCheckError && error)
+            NSError *stateCheckError = nil;
+            BOOL stateValidated = [MSIDSwitchBrowserResponse validateStateParameter:self.parameters[MSID_OAUTH2_STATE]
+                                                                      expectedState:requestState
+                                                                              error:&stateCheckError];
+            if (!stateValidated)
             {
-                *error = stateCheckError;
+                if (stateCheckError && error)
+                {
+                    *error = stateCheckError;
+                }
+                return nil;
             }
-            return nil;
         }
 
         _actionUri = self.parameters[@"action_uri"];