Skip to content

Commit f038109

Browse files
oldaltonoldalton
authored
Merge pull request #621 from AzureAD/release/1.3.8
Release 1.3.8 into master
2 parents 4426231 + 2d0fadc commit f038109

14 files changed

+1181
-235
lines changed

‎IdentityCore/IdentityCore.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,10 @@
738738
B26A0B942072B824006BD95A /* MSIDAADOauth2FactoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B26A0B922072B824006BD95A /* MSIDAADOauth2FactoryTests.m */; };
739739
B26A0B972072B9CB006BD95A /* MSIDAADV1Oauth2FactoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B26A0B952072B9CB006BD95A /* MSIDAADV1Oauth2FactoryTests.m */; };
740740
B26A0B9A2072BABE006BD95A /* MSIDAADV2Oauth2FactoryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B26A0B982072BABD006BD95A /* MSIDAADV2Oauth2FactoryTests.m */; };
741+
B26CEADA23652795009E6E54 /* MSIDMacACLKeychainAccessor.h in Headers */ = {isa = PBXBuildFile; fileRef = B26CEAD823652795009E6E54 /* MSIDMacACLKeychainAccessor.h */; };
742+
B26CEADB23652795009E6E54 /* MSIDMacACLKeychainAccessor.m in Sources */ = {isa = PBXBuildFile; fileRef = B26CEAD923652795009E6E54 /* MSIDMacACLKeychainAccessor.m */; };
743+
B26CEADE2365311E009E6E54 /* MSIDMacLegacyCachePersistenceHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = B26CEADC2365311E009E6E54 /* MSIDMacLegacyCachePersistenceHandler.h */; };
744+
B26CEADF2365311E009E6E54 /* MSIDMacLegacyCachePersistenceHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = B26CEADD2365311E009E6E54 /* MSIDMacLegacyCachePersistenceHandler.m */; };
741745
B274DEC721FC002300DB7757 /* MSIDInteractiveRequestParametersTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B274DEC621FC002300DB7757 /* MSIDInteractiveRequestParametersTests.m */; };
742746
B274DEC821FC002300DB7757 /* MSIDInteractiveRequestParametersTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B274DEC621FC002300DB7757 /* MSIDInteractiveRequestParametersTests.m */; };
743747
B27551C22081705300AA7A38 /* MSIDJWTHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = B2C7590C207EE9A400C1FE74 /* MSIDJWTHelper.m */; };
@@ -1116,6 +1120,8 @@
11161120
B2EF143A1FF2F225005DC1C0 /* MSIDAADV2TokenResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = B2EF14391FF2F21E005DC1C0 /* MSIDAADV2TokenResponse.h */; };
11171121
B2EF143B1FF2F228005DC1C0 /* MSIDAADV2TokenResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = B2EF14381FF2F21D005DC1C0 /* MSIDAADV2TokenResponse.m */; };
11181122
B2EF143C1FF2F228005DC1C0 /* MSIDAADV2TokenResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = B2EF14381FF2F21D005DC1C0 /* MSIDAADV2TokenResponse.m */; };
1123+
B2F6C7E4236BD01500C8D3AE /* MSIDMacLegacyCachePersistenceHandlerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B2F6C7E3236BD01500C8D3AE /* MSIDMacLegacyCachePersistenceHandlerTests.m */; };
1124+
B2F7C96B2368FCAC00627A7C /* MSIDMacACLKeychainAccessorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B2F7C96A2368FCAC00627A7C /* MSIDMacACLKeychainAccessorTests.m */; };
11191125
B4A5ACCD21F7ED4500D2A780 /* MSIDAccountCacheItem+MSIDAccountMatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = B4A5ACCB21F7ED4500D2A780 /* MSIDAccountCacheItem+MSIDAccountMatchers.h */; };
11201126
B4A5ACCF21F7ED4500D2A780 /* MSIDAccountCacheItem+MSIDAccountMatchers.m in Sources */ = {isa = PBXBuildFile; fileRef = B4A5ACCC21F7ED4500D2A780 /* MSIDAccountCacheItem+MSIDAccountMatchers.m */; };
11211127
B4A5ACD221F7F25400D2A780 /* MSIDAccountCacheItem+MSIDAccountMatchers.m in Sources */ = {isa = PBXBuildFile; fileRef = B4A5ACCC21F7ED4500D2A780 /* MSIDAccountCacheItem+MSIDAccountMatchers.m */; };
@@ -1806,6 +1812,10 @@
18061812
B26A0B922072B824006BD95A /* MSIDAADOauth2FactoryTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAADOauth2FactoryTests.m; sourceTree = "<group>"; };
18071813
B26A0B952072B9CB006BD95A /* MSIDAADV1Oauth2FactoryTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAADV1Oauth2FactoryTests.m; sourceTree = "<group>"; };
18081814
B26A0B982072BABD006BD95A /* MSIDAADV2Oauth2FactoryTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAADV2Oauth2FactoryTests.m; sourceTree = "<group>"; };
1815+
B26CEAD823652795009E6E54 /* MSIDMacACLKeychainAccessor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDMacACLKeychainAccessor.h; sourceTree = "<group>"; };
1816+
B26CEAD923652795009E6E54 /* MSIDMacACLKeychainAccessor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDMacACLKeychainAccessor.m; sourceTree = "<group>"; };
1817+
B26CEADC2365311E009E6E54 /* MSIDMacLegacyCachePersistenceHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDMacLegacyCachePersistenceHandler.h; sourceTree = "<group>"; };
1818+
B26CEADD2365311E009E6E54 /* MSIDMacLegacyCachePersistenceHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDMacLegacyCachePersistenceHandler.m; sourceTree = "<group>"; };
18091819
B274DEC621FC002300DB7757 /* MSIDInteractiveRequestParametersTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDInteractiveRequestParametersTests.m; sourceTree = "<group>"; };
18101820
B27551AF20816B4800AA7A38 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
18111821
B27551C8208179EE00AA7A38 /* libIdentityAutomationAppLib iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libIdentityAutomationAppLib iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2058,6 +2068,8 @@
20582068
B2ED1BB32204D26700A24E82 /* libIdentityAutomationTestLib Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libIdentityAutomationTestLib Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
20592069
B2EF14381FF2F21D005DC1C0 /* MSIDAADV2TokenResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAADV2TokenResponse.m; sourceTree = "<group>"; };
20602070
B2EF14391FF2F21E005DC1C0 /* MSIDAADV2TokenResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDAADV2TokenResponse.h; sourceTree = "<group>"; };
2071+
B2F6C7E3236BD01500C8D3AE /* MSIDMacLegacyCachePersistenceHandlerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDMacLegacyCachePersistenceHandlerTests.m; sourceTree = "<group>"; };
2072+
B2F7C96A2368FCAC00627A7C /* MSIDMacACLKeychainAccessorTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDMacACLKeychainAccessorTests.m; sourceTree = "<group>"; };
20612073
B4A5ACCB21F7ED4500D2A780 /* MSIDAccountCacheItem+MSIDAccountMatchers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MSIDAccountCacheItem+MSIDAccountMatchers.h"; sourceTree = "<group>"; };
20622074
B4A5ACCC21F7ED4500D2A780 /* MSIDAccountCacheItem+MSIDAccountMatchers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "MSIDAccountCacheItem+MSIDAccountMatchers.m"; sourceTree = "<group>"; };
20632075
D626000F1FBD380500EE4487 /* NSString+MSIDExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+MSIDExtensions.m"; sourceTree = "<group>"; };
@@ -3008,6 +3020,10 @@
30083020
05566D0F2204BB8A002DBA40 /* MSIDMacKeychainTokenCache.m */,
30093021
1EFD58C322B43A4500ECD86E /* MSIDMacCredentialStorageItem.h */,
30103022
1EFD58C422B43A4500ECD86E /* MSIDMacCredentialStorageItem.m */,
3023+
B26CEAD823652795009E6E54 /* MSIDMacACLKeychainAccessor.h */,
3024+
B26CEAD923652795009E6E54 /* MSIDMacACLKeychainAccessor.m */,
3025+
B26CEADC2365311E009E6E54 /* MSIDMacLegacyCachePersistenceHandler.h */,
3026+
B26CEADD2365311E009E6E54 /* MSIDMacLegacyCachePersistenceHandler.m */,
30113027
);
30123028
path = mac;
30133029
sourceTree = "<group>";
@@ -3814,8 +3830,9 @@
38143830
B27CCDD4229EF2C000CAD565 /* MSIDDictionaryExtensionsTests.m */,
38153831
B223B0A222ADEE4500FB8713 /* MSIDMaskedUsernameLogParameterTests.m */,
38163832
B223B0A522ADEE5900FB8713 /* MSIDMaskedLogParameterTests.m */,
3817-
B203197E217BF191006488D0 /* MSIDClientCapabilitiesTests.m */,
38183833
B2525C742330623E006FBA4B /* MSIDMainThreadUtilTests.m */,
3834+
B2F7C96A2368FCAC00627A7C /* MSIDMacACLKeychainAccessorTests.m */,
3835+
B2F6C7E3236BD01500C8D3AE /* MSIDMacLegacyCachePersistenceHandlerTests.m */,
38193836
);
38203837
path = tests;
38213838
sourceTree = "<group>";
@@ -3885,6 +3902,7 @@
38853902
232C657A2137684E002A41FE /* MSIDDRSDiscoveryResponseSerializer.h in Headers */,
38863903
96F94A39208184790034676C /* MSIDOAuth2EmbeddedWebviewController.h in Headers */,
38873904
B2000C9920EC64CA0092790A /* MSIDCredentialType.h in Headers */,
3905+
B26CEADA23652795009E6E54 /* MSIDMacACLKeychainAccessor.h in Headers */,
38883906
B223B09E22ADD86500FB8713 /* MSIDCacheItemSerializing.h in Headers */,
38893907
B2000C9820EC64AC0092790A /* MSIDTelemetryCacheEvent.h in Headers */,
38903908
B2000C9D20EC653A0092790A /* MSIDAADV1IdTokenClaims.h in Headers */,
@@ -4062,6 +4080,7 @@
40624080
96891A962190F15E00D7F437 /* MSIDWPJChallengeHandler.h in Headers */,
40634081
B20657A51FC91C1600412B7D /* MSIDTelemetryDispatcher.h in Headers */,
40644082
B281B334226BB83C009619AB /* MSIDOAuthRequestConfigurator.h in Headers */,
4083+
B26CEADE2365311E009E6E54 /* MSIDMacLegacyCachePersistenceHandler.h in Headers */,
40654084
238E19CB2086FC87004DF483 /* MSIDUrlRequestSerializer.h in Headers */,
40664085
233E96F322652C5B007FCE2A /* MSIDTelemetryEventsObserving.h in Headers */,
40674086
96F21B1A20A65187002B87C3 /* MSIDWebviewInteracting.h in Headers */,
@@ -4901,6 +4920,7 @@
49014920
B2B1D57A204369D600DD81F0 /* MSIDAccountType.m in Sources */,
49024921
B210F4571FDDFA7B005A8F76 /* MSIDBrokerResponse.m in Sources */,
49034922
23F9FD4822EC08D800DAB65D /* NSKeyedUnarchiver+MSIDExtensions.m in Sources */,
4923+
B26CEADF2365311E009E6E54 /* MSIDMacLegacyCachePersistenceHandler.m in Sources */,
49044924
23B39AC8209BF9F2000AA905 /* MSIDOpenIdConfigurationInfoRequest.m in Sources */,
49054925
23D7447A2097B2DA00210C51 /* MSIDAADV1AuthorizationCodeRequest.m in Sources */,
49064926
23642AB8218805B000F97009 /* MSIDIntuneMAMResourcesCache.m in Sources */,
@@ -4924,6 +4944,7 @@
49244944
B2CDB5741FE2F4DF003A4B5C /* NSOrderedSet+MSIDExtensions.m in Sources */,
49254945
96C998F120B638F60053A2D9 /* MSIDWebviewSession.m in Sources */,
49264946
96891A982190F15E00D7F437 /* MSIDWPJChallengeHandler.m in Sources */,
4947+
B26CEADB23652795009E6E54 /* MSIDMacACLKeychainAccessor.m in Sources */,
49274948
96090D9A20E59B2000E42B37 /* MSIDNotifications.m in Sources */,
49284949
23D2049521D1C274009B5975 /* MSIDTokenResponseSerializer.m in Sources */,
49294950
96F94A2920816B870034676C /* MSIDWebOAuth2Response.m in Sources */,
@@ -4964,6 +4985,7 @@
49644985
23AE9DA8213A169200B285F3 /* MSIDOpenIdConfigurationInfoResponseSerializerTests.m in Sources */,
49654986
B2DD5B952047564C0084313F /* MSIDCredentialTypeTests.m in Sources */,
49664987
B28BBD40221267B200F51723 /* MSIDLegacyTokenResponseValidatorTests.m in Sources */,
4988+
B2F7C96B2368FCAC00627A7C /* MSIDMacACLKeychainAccessorTests.m in Sources */,
49674989
B29A36B920AFAAF200427B63 /* MSIDLegacyAccessorSSOIntegrationTests.m in Sources */,
49684990
B2DD5BC320479D9D0084313F /* MSIDKeyedArchiverSerializerTests.m in Sources */,
49694991
238EF081208FFA4C0035ABE6 /* MSIDUrlRequestSerializerTests.m in Sources */,
@@ -5049,6 +5071,7 @@
50495071
B2DD5BB2204789FB0084313F /* MSIDIdTokenTests.m in Sources */,
50505072
232C657721376755002A41FE /* MSIDDRSDiscoveryResponseSerializerTests.m in Sources */,
50515073
B279835B20D33A0A0051167F /* MSIDIdTokenClaimsTests.m in Sources */,
5074+
B2F6C7E4236BD01500C8D3AE /* MSIDMacLegacyCachePersistenceHandlerTests.m in Sources */,
50525075
B20657D01FC92B8F00412B7D /* MSIDTelemetryUIEventTests.m in Sources */,
50535076
B26A0B972072B9CB006BD95A /* MSIDAADV1Oauth2FactoryTests.m in Sources */,
50545077
B2DD5BA2204761660084313F /* MSIDLegacySingleResourceTokenTests.m in Sources */,

‎IdentityCore/src/cache/mac/MSIDMacACLKeychainAccessor.h‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
// Copyright (c) Microsoft Corporation.
2+
// All rights reserved.
3+
//
4+
// This code is licensed under the MIT License.
5+
//
6+
// Permission is hereby granted, free of charge, to any person obtaining a copy
7+
// of this software and associated documentation files(the "Software"), to deal
8+
// in the Software without restriction, including without limitation the rights
9+
// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
10+
// copies of the Software, and to permit persons to whom the Software is
11+
// furnished to do so, subject to the following conditions :
12+
//
13+
// The above copyright notice and this permission notice shall be included in
14+
// all copies or substantial portions of the Software.
15+
//
16+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
// THE SOFTWARE.
23+
24+
#import <Foundation/Foundation.h>
25+
26+
NS_ASSUME_NONNULL_BEGIN
27+
28+
@interface MSIDMacACLKeychainAccessor : NSObject
29+
30+
@property (readonly, nonnull) id accessControlForSharedItems;
31+
@property (readonly, nonnull) id accessControlForNonSharedItems;
32+
33+
#pragma mark - Init
34+
35+
- (nullable instancetype)initWithTrustedApplications:(nullable NSArray *)trustedApplications
36+
accessLabel:(nonnull NSString *)accessLabel
37+
error:(NSError * _Nullable __autoreleasing * _Nullable)error;
38+
39+
#pragma mark - Operations
40+
41+
- (BOOL)saveData:(nonnull NSData *)data
42+
attributes:(nonnull NSDictionary *)attributes
43+
context:(nullable id<MSIDRequestContext>)context
44+
error:(NSError * _Nullable * _Nullable)error;
45+
46+
47+
- (BOOL)removeItemWithAttributes:(nonnull NSDictionary *)attributes
48+
context:(nullable id<MSIDRequestContext>)context
49+
error:(NSError * _Nullable * _Nullable)error;
50+
51+
52+
- (nullable NSData *)getDataWithAttributes:(nonnull NSDictionary *)attributes
53+
context:(nullable id<MSIDRequestContext>)context
54+
error:(NSError * _Nullable * _Nullable)error;
55+
56+
- (BOOL)clearWithAttributes:(nonnull NSDictionary *)attributes
57+
context:(nullable id<MSIDRequestContext>)context
58+
error:(NSError * _Nullable * _Nullable)error;
59+
60+
#pragma mark - Util
61+
62+
- (BOOL)createError:(nonnull NSString *)message
63+
domain:(nonnull NSErrorDomain)domain
64+
errorCode:(NSInteger)code
65+
error:(NSError *_Nullable *_Nullable)error
66+
context:(nullable id<MSIDRequestContext>)context;
67+
68+
@end
69+
70+
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)