Skip to content

Commit e0897bd

Browse files
author
kai
committed
Merge branch 'main' into hotfix/1.12.1
2 parents a882e9d + 5f27cd7 commit e0897bd

File tree

42 files changed

+682
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+682
-86
lines changed

‎IdentityCore/IdentityCore.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,9 @@
741741
728209D026FEA0F600B5F018 /* MSIDKeyOperationUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 728209CF26FEA0F600B5F018 /* MSIDKeyOperationUtil.m */; };
742742
728209D126FEA0F600B5F018 /* MSIDKeyOperationUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 728209CF26FEA0F600B5F018 /* MSIDKeyOperationUtil.m */; };
743743
728209D62702AF8900B5F018 /* MSIDBackgroundTaskManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 728209D32702AE9300B5F018 /* MSIDBackgroundTaskManagerTests.m */; };
744+
728ABACC2E5A3B4E00FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 728ABACB2E5A3B2800FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.h */; };
745+
728ABACE2E5A41A800FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ABACD2E5A418F00FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.m */; };
746+
728ABACF2E5A41A800FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ABACD2E5A418F00FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.m */; };
744747
728D9E4628245DD7001D990F /* MSIDTestSecureEnclaveKeyPairGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 728D9E4528245DD7001D990F /* MSIDTestSecureEnclaveKeyPairGenerator.m */; };
745748
728D9E4728245DD7001D990F /* MSIDTestSecureEnclaveKeyPairGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = 728D9E4528245DD7001D990F /* MSIDTestSecureEnclaveKeyPairGenerator.m */; };
746749
728D9E492824A323001D990F /* MSIDPkeyAuthHelperTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 23CA0C5E220A68D400768729 /* MSIDPkeyAuthHelperTests.m */; };
@@ -2654,6 +2657,8 @@
26542657
728209CD26FEA0D800B5F018 /* MSIDKeyOperationUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDKeyOperationUtil.h; sourceTree = "<group>"; };
26552658
728209CF26FEA0F600B5F018 /* MSIDKeyOperationUtil.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDKeyOperationUtil.m; sourceTree = "<group>"; };
26562659
728209D32702AE9300B5F018 /* MSIDBackgroundTaskManagerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDBackgroundTaskManagerTests.m; sourceTree = "<group>"; };
2660+
728ABACB2E5A3B2800FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MSIDWPJKeyPairWithCert+TransportKey.h"; sourceTree = "<group>"; };
2661+
728ABACD2E5A418F00FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "MSIDWPJKeyPairWithCert+TransportKey.m"; sourceTree = "<group>"; };
26572662
728D9E4528245DD7001D990F /* MSIDTestSecureEnclaveKeyPairGenerator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDTestSecureEnclaveKeyPairGenerator.m; sourceTree = "<group>"; };
26582663
728D9E4828247D4C001D990F /* MSIDTestSecureEnclaveKeyPairGenerator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDTestSecureEnclaveKeyPairGenerator.h; sourceTree = "<group>"; };
26592664
729357E72DD810C70001D03C /* MSIDNonceTokenRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDNonceTokenRequest.h; sourceTree = "<group>"; };
@@ -5098,7 +5103,6 @@
50985103
B2AF1D29218BCDEF0080C1A0 /* requests */ = {
50995104
isa = PBXGroup;
51005105
children = (
5101-
51025106
720B5B542DD57D6600318FE5 /* MSIDEcdhApv.m */,
51035107
720B5B522DD57C3700318FE5 /* MSIDEcdhApv.h */,
51045108
720B5B4F2DD577C100318FE5 /* MSIDJWECrypto.m */,
@@ -5172,6 +5176,8 @@
51725176
B2C0747E246B70DC0008D701 /* crypto */ = {
51735177
isa = PBXGroup;
51745178
children = (
5179+
728ABACD2E5A418F00FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.m */,
5180+
728ABACB2E5A3B2800FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.h */,
51755181
B27893792470CAF200627C28 /* mac */,
51765182
B2C0748E246B71470008D701 /* MSIDAssymetricKeyGenerating.h */,
51775183
B2C07490246B735B0008D701 /* MSIDAssymetricKeyKeychainGenerator.h */,
@@ -6132,6 +6138,7 @@
61326138
A07EB427259D0C6B00783943 /* MSIDThrottlingService.h in Headers */,
61336139
9658103120C7E1180025F4A4 /* MSIDWebviewResponse.h in Headers */,
61346140
1E707FDF2407335700716148 /* MSIDBrokerNativeAppOperationResponse.h in Headers */,
6141+
728ABACC2E5A3B4E00FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.h in Headers */,
61356142
B28BDA7F217E964B003E5670 /* MSIDB2CTokenResponse.h in Headers */,
61366143
96B8D57D20946D2600E3F4A6 /* MSIDPkce.h in Headers */,
61376144
B286B9912389DC47007833AD /* MSIDIndividualClaimRequest.h in Headers */,
@@ -7378,6 +7385,7 @@
73787385
23C8981A2C892A3800071482 /* MSIDBrowserNativeMessageGetSupportedContractsResponse.m in Sources */,
73797386
B286B9992389DC9D007833AD /* MSIDSSOExtensionSilentTokenRequest.m in Sources */,
73807387
B2C7089921991D0000D917B8 /* MSIDAADV2BrokerResponse.m in Sources */,
7388+
728ABACE2E5A41A800FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.m in Sources */,
73817389
B20E3CB61FC4FE400029C097 /* MSIDOAuth2Constants.m in Sources */,
73827390
B2BE924D21A2331A00F5AB8C /* MSIDTelemetryAuthorityValidationEvent.m in Sources */,
73837391
B2807FF9204CAFDF00944D89 /* MSIDHelpers.m in Sources */,
@@ -8083,6 +8091,7 @@
80838091
239E3BBF23E1004F00F7A50A /* MSIDClientSDKType.m in Sources */,
80848092
23B39ABD209BD47D000AA905 /* MSIDB2CAuthorityResolver.m in Sources */,
80858093
B2F671E92467A34400649855 /* MSIDAuthorizationCodeResult.m in Sources */,
8094+
728ABACF2E5A41A800FCE434 /* MSIDWPJKeyPairWithCert+TransportKey.m in Sources */,
80868095
23C10A9F2B40D9350063D97C /* MSIDBrowserNativeMessageSignOutResponse.m in Sources */,
80878096
23FB5C2B225517AA002BF1EB /* MSIDIndividualClaimRequestAdditionalInfo.m in Sources */,
80888097
1E707FDD2406FA9200716148 /* MSIDBrokerBrowserOperationResponse.m in Sources */,

‎IdentityCore/src/MSIDConstants.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,10 @@ extern NSString * _Nonnull const MSID_BROWSER_RESPONSE_SWITCH_BROWSER_RESUME;
213213

214214
extern NSString * _Nonnull const MSID_FLIGHT_USE_V2_WEB_RESPONSE_FACTORY;
215215
extern NSString * _Nonnull const MSID_FLIGHT_SUPPORT_DUNA_CBA;
216+
extern NSString * _Nonnull const MSID_FLIGHT_DISABLE_JIT_TROUBLESHOOTING_LEGACY_AUTH;
216217
extern NSString * _Nonnull const MSID_FLIGHT_CLIENT_SFRT_STATUS;
217218
extern NSString * _Nonnull const MSID_FLIGHT_DISABLE_PREFERRED_IDENTITY_CBA;
219+
extern NSString * _Nonnull const MSID_FLIGHT_SUPPORT_STATE_DUNA_CBA;
218220

219221
/**
220222
* Flight to indicate if remove account artifacts should be disabled

‎IdentityCore/src/MSIDConstants.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@
8585

8686
NSString *const MSID_FLIGHT_USE_V2_WEB_RESPONSE_FACTORY = @"use_v2_web_response_factory";
8787
NSString *const MSID_FLIGHT_SUPPORT_DUNA_CBA = @"support_duna_cba_v2";
88+
NSString *const MSID_FLIGHT_DISABLE_JIT_TROUBLESHOOTING_LEGACY_AUTH = @"disable_jit_remediation_legacy_auth";
8889
NSString *const MSID_FLIGHT_CLIENT_SFRT_STATUS = @"sfrt_v2";
8990
NSString *const MSID_FLIGHT_DISABLE_PREFERRED_IDENTITY_CBA = @"dis_pre_iden_cba";
91+
NSString *const MSID_FLIGHT_SUPPORT_STATE_DUNA_CBA = @"support_state_duna_cba";
9092

9193
// Making the flight string short to avoid legacy broker url size limit
9294
NSString *const MSID_FLIGHT_DISABLE_REMOVE_ACCOUNT_ARTIFACTS = @"disable_rm_metadata";

‎IdentityCore/src/broker_operation/request/browser_native_message_request/MSIDBrokerOperationBrowserNativeMessageRequest.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@ + (NSString *)operation
6161

6262
- (NSString *)callerBundleIdentifier
6363
{
64-
return self.parentProcessBundleIdentifier ?: NSLocalizedString(@"N/A", nil);
64+
return self.parentProcessBundleIdentifier ?: @"";
6565
}
6666

6767
- (NSString *)callerTeamIdentifier
6868
{
69-
return self.parentProcessTeamId ?: NSLocalizedString(@"N/A", nil);
69+
return self.parentProcessTeamId ?: @"";
7070
}
7171

7272
- (NSString *)localizedCallerDisplayName
7373
{
74-
return self.parentProcessLocalizedName ?: NSLocalizedString(@"N/A", nil);
74+
return self.parentProcessLocalizedName ?: @"";
7575
}
7676

7777
- (NSString *)localizedApplicationInfo
@@ -87,7 +87,7 @@ - (NSString *)localizedApplicationInfo
8787
return brokerOperationRequest.localizedApplicationInfo;
8888
}
8989

90-
return NSLocalizedString(@"N/A", nil);
90+
return @"";
9191
}
9292

9393
#pragma mark - MSIDJsonSerializable

‎IdentityCore/src/broker_operation/request/token_request/MSIDBrokerOperationBrowserTokenRequest.m‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ - (instancetype)initWithRequest:(NSURL *)requestURL
5757
_requestURL = requestURL;
5858

5959
[self printRequestURLInfo:requestURL];
60+
if (![httpBody length])
61+
{
62+
// Apple doesn't provide/expose the HTTP method of the request SSO extension intercepted. If httpBody is nil we assume GET else POST.
63+
MSID_LOG_WITH_CTX(MSIDLogLevelInfo, nil, @"[Browser SSO] Request body is empty or undefined. SSO extension will assume HTTP method to GET.");
64+
}
6065

6166
if (![requestValidator shouldHandleURL:_requestURL])
6267
{
@@ -121,8 +126,8 @@ + (NSString *)protocolLogNameForRequestURL:(NSURL *)requestURL
121126
return logProtocolNames[keyword];
122127
}
123128
}
124-
125-
return @"N/A";
129+
NSString *lastPathComponent = [requestURL lastPathComponent];
130+
return [NSString msidIsStringNilOrBlank:lastPathComponent] ? @"N/A" : lastPathComponent;
126131
}
127132

128133
- (void)printRequestURLInfo:(NSURL *)requestURL

‎IdentityCore/src/broker_operation/request/token_request/MSIDBrokerOperationTokenRequest.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
5050
@property (nonatomic) BOOL skipValidateResultAccount;
5151
@property (nonatomic) BOOL forceRefresh;
5252
@property (nonatomic) BOOL ignoreScopeValidation;
53-
53+
@property (nonatomic) BOOL bypassRedirectURIValidation;
5454

5555
+ (BOOL)fillRequest:(MSIDBrokerOperationTokenRequest *)request
5656
withParameters:(MSIDRequestParameters *)parameters

‎IdentityCore/src/broker_operation/request/token_request/MSIDBrokerOperationTokenRequest.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ + (BOOL)fillRequest:(MSIDBrokerOperationTokenRequest *)request
6868
request.platformSequence = parameters.platformSequence;
6969
request.allowAnyExtraURLQueryParameters = parameters.allowAnyExtraURLQueryParameters;
7070
request.ignoreScopeValidation = parameters.ignoreScopeValidation;
71+
request.bypassRedirectURIValidation = parameters.bypassRedirectURIValidation;
7172
return YES;
7273
}
7374

‎IdentityCore/src/cache/accessor/MSIDAccountCredentialCache.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ - (MSIDIsFRTEnabledStatus)checkFRTEnabled:(nullable id<MSIDRequestContext>)conte
581581

582582
if ([NSString msidIsStringNilOrBlank:flagEnableFRT] || (!shouldEnableFRT && !shouldDisableFRT))
583583
{
584-
MSID_LOG_WITH_CTX(MSIDLogLevelError, context, @"FRT flight set to keep current status: %ld", (long)status);
584+
MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"FRT flight set to keep current status: %ld", (long)status);
585585
return status;
586586
}
587587
MSIDIsFRTEnabledStatus newStatus = status;

‎IdentityCore/src/cache/crypto/MSIDWPJKeyPairWithCert+TransportKey.h‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
//
2+
// Copyright (c) Microsoft Corporation.
3+
// All rights reserved.
4+
//
5+
// This code is licensed under the MIT License.
6+
//
7+
// Permission is hereby granted, free of charge, to any person obtaining a copy
8+
// of this software and associated documentation files(the "Software"), to deal
9+
// in the Software without restriction, including without limitation the rights
10+
// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
11+
// copies of the Software, and to permit persons to whom the Software is
12+
// furnished to do so, subject to the following conditions :
13+
//
14+
// The above copyright notice and this permission notice shall be included in
15+
// all copies or substantial portions of the Software.
16+
//
17+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
// THE SOFTWARE.
24+
25+
#import <Foundation/Foundation.h>
26+
27+
NS_ASSUME_NONNULL_BEGIN
28+
@interface MSIDWPJKeyPairWithCert (TransportKey)
29+
30+
@property (nonatomic) SecKeyRef privateTransportKeyRef;
31+
32+
@end
33+
NS_ASSUME_NONNULL_END

‎IdentityCore/src/cache/crypto/MSIDWPJKeyPairWithCert+TransportKey.m‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
//
2+
// Copyright (c) Microsoft Corporation.
3+
// All rights reserved.
4+
//
5+
// This code is licensed under the MIT License.
6+
//
7+
// Permission is hereby granted, free of charge, to any person obtaining a copy
8+
// of this software and associated documentation files(the "Software"), to deal
9+
// in the Software without restriction, including without limitation the rights
10+
// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
11+
// copies of the Software, and to permit persons to whom the Software is
12+
// furnished to do so, subject to the following conditions :
13+
//
14+
// The above copyright notice and this permission notice shall be included in
15+
// all copies or substantial portions of the Software.
16+
//
17+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
// THE SOFTWARE.
24+
25+
#import "MSIDWPJKeyPairWithCert.h"
26+
#import "MSIDWPJKeyPairWithCert+TransportKey.h"
27+
28+
@implementation MSIDWPJKeyPairWithCert (TransportKey)
29+
30+
- (void)setPrivateTransportKeyRef:(SecKeyRef)privateTransportKeyRef
31+
{
32+
if (_privateTransportKeyRef != privateTransportKeyRef)
33+
{
34+
if (_privateTransportKeyRef)
35+
{
36+
CFRelease(_privateTransportKeyRef);
37+
_privateTransportKeyRef = NULL;
38+
}
39+
40+
_privateTransportKeyRef = privateTransportKeyRef;
41+
42+
if (_privateTransportKeyRef)
43+
{
44+
CFRetain(_privateTransportKeyRef);
45+
}
46+
}
47+
}
48+
49+
@end

0 commit comments

Comments
 (0)