Merge pull request #1420 from AzureAD/oldalton/merge_2.7.12_into_master

Merge 2.7.12 into master

ADAL.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "ADAL"
   s.module_name  = "ADAL"
-  s.version      = "2.7.11"
+  s.version      = "2.7.12"
   s.summary      = "The ADAL SDK for iOS gives you the ability to add Azure Identity authentication to your application"
 
   s.description  = <<-DESC

ADAL/ADAL.xcodeproj/project.pbxproj

@@ -4234,6 +4234,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D6CF4EB01FC370BF00CD70C5 /* adal__framework__ios.xcconfig */;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DEVELOPMENT_TEAM = "";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 			};
@@ -4243,6 +4245,8 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D6CF4EB01FC370BF00CD70C5 /* adal__framework__ios.xcconfig */;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DEVELOPMENT_TEAM = "";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 			};
 			name = Release;

ADAL/resources/ios/Framework/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.11</string>
+	<string>2.7.12</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

ADAL/src/ADAL_Internal.h

@@ -27,7 +27,7 @@
 // through build script. Don't change its format unless changing build script as well.)
 #define ADAL_VER_HIGH       2
 #define ADAL_VER_LOW        7
-#define ADAL_VER_PATCH      11
+#define ADAL_VER_PATCH      12
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)

ADAL/src/ADAuthenticationContext+Internal.m

@@ -56,14 +56,14 @@ + (ADAuthenticationError*)errorFromDictionary:(NSDictionary*)dictionary
                                     errorCode:(ADErrorCode)errorCode
 {
     //First check for explicit OAuth2 protocol error:
-    NSString *serverOAuth2Error = [dictionary msidStringForKey:MSID_OAUTH2_ERROR];
+    NSString *serverOAuth2Error = [dictionary msidStringObjectForKey:MSID_OAUTH2_ERROR];
     if (serverOAuth2Error)
     {
-        NSString *responseCorrelationId = [dictionary msidStringForKey:MSID_OAUTH2_CORRELATION_ID_RESPONSE];
+        NSString *responseCorrelationId = [dictionary msidStringObjectForKey:MSID_OAUTH2_CORRELATION_ID_RESPONSE];
         NSUUID *correlationId = responseCorrelationId ? [[NSUUID alloc] initWithUUIDString:responseCorrelationId] : nil;
 
         ADErrorCode code = errorCode;
-        NSString *suberror = [dictionary msidStringForKey:ADAL_AUTH_SUBERROR];
+        NSString *suberror = [dictionary msidStringObjectForKey:ADAL_AUTH_SUBERROR];
         NSMutableDictionary *userInfo = [NSMutableDictionary new];
         userInfo[ADSuberrorKey] = suberror;
 
@@ -72,8 +72,8 @@ + (ADAuthenticationError*)errorFromDictionary:(NSDictionary*)dictionary
             code = AD_ERROR_SERVER_PROTECTION_POLICY_REQUIRED;
         }
 
-        userInfo[ADUserIdKey] = [dictionary msidStringForKey:ADAL_AUTH_ADDITIONAL_USER_IDENTIFIER];
-        NSString *errorDescription = [dictionary msidStringForKey:MSID_OAUTH2_ERROR_DESCRIPTION];
+        userInfo[ADUserIdKey] = [dictionary msidStringObjectForKey:ADAL_AUTH_ADDITIONAL_USER_IDENTIFIER];
+        NSString *errorDescription = [dictionary msidStringObjectForKey:MSID_OAUTH2_ERROR_DESCRIPTION];
 
         return [ADAuthenticationError OAuthServerError:serverOAuth2Error
                                            description:errorDescription

ADAL/src/ADAuthenticationResult+Internal.m

@@ -182,7 +182,7 @@ + (ADAuthenticationResult *)resultForBrokerErrorResponse:(NSDictionary *)respons
         errorDetails = @"Broker did not provide any details";
     }
 
-    userInfo[ADBrokerVersionKey] = [response msidStringForKey:ADAL_BROKER_APP_VERSION];
+    userInfo[ADBrokerVersionKey] = [response msidStringObjectForKey:ADAL_BROKER_APP_VERSION];
 
     NSString *strErrorCode = [response valueForKey:@"error_code"];
     NSInteger errorCode = AD_ERROR_TOKENBROKER_UNKNOWN;
@@ -191,8 +191,8 @@ + (ADAuthenticationResult *)resultForBrokerErrorResponse:(NSDictionary *)respons
         errorCode = [strErrorCode integerValue];
     }
 
-    userInfo[ADSuberrorKey] = [response msidStringForKey:ADAL_AUTH_SUBERROR];
-    userInfo[ADUserIdKey] = [response msidStringForKey:@"user_id"];
+    userInfo[ADSuberrorKey] = [response msidStringObjectForKey:ADAL_AUTH_SUBERROR];
+    userInfo[ADUserIdKey] = [response msidStringObjectForKey:@"user_id"];
 
     NSString *protocolCode = [response valueForKey:@"protocol_code"];
     if (!protocolCode)

ADAL/src/request/ADAuthenticationRequest.m

@@ -165,9 +165,9 @@ - (BOOL)setClaims:(NSString *)claims error:(ADAuthenticationError **)error
 
     NSData *decodedData = [_claims.msidWWWFormURLDecode dataUsingEncoding:NSUTF8StringEncoding];
     NSError *jsonError = nil;
-    NSDictionary *decodedDictionary = [NSDictionary msidDictionaryFromJsonData:decodedData error:&jsonError];
+    NSDictionary *decodedDictionary = [NSJSONSerialization JSONObjectWithData:decodedData options:0 error:&jsonError];
 
-    if (!decodedDictionary)
+    if (!decodedDictionary || ![decodedDictionary isKindOfClass:[NSDictionary class]])
     {
         if (error)
         {

changelog.txt

@@ -1,3 +1,7 @@
+Version 2.7.12 (05.30.2019)
+----------
+* Make cache more resilient to corrupt data with nulls (#1419)
+
 Version 2.7.11 (05.14.2019)
 -----------
 * Fix issues when ADAL was trying to handle MSAL broker responses.