Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add pii around upn for wp registration web response #1444

Open
wants to merge 6 commits into
base: release/1.7.43
Choose a base branch
from
+82 −2
Open

Add pii around upn for wp registration web response #1444

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5936a58
Add pii around upn
Nov 15, 2024
3159581
hide userinfo for error logging
Nov 15, 2024
461309f
Apply mask on email address from user info MSALDisplayableUserIdKey
Nov 15, 2024
558ba69
formatting
Nov 15, 2024
62bc447
formatting
Nov 15, 2024
5d3f187
switch to use NSrange
Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
switch to use NSrange
Kai Song authored and Kai Song committed Nov 22, 2024
commit 5d3f187c3d99458b953a07420869412b97e72ea7
24 changes: 9 additions & 15 deletions IdentityCore/src/logger/MSIDMaskedLogParameter.m
View file
Original file line number Diff line number Diff line change
@@ -112,32 +112,26 @@ - (NSString *)EUIIMaskedDescription

- (NSString *)noMaskWithCondition
{
// If input is NSError, mask userinfo as it may contain upn
// If input is NSError, mask upn and email address from if there is any
if ([self.parameterValue isKindOfClass:[NSError class]])
{
NSError *errorParameter = (NSError *)self.parameterValue;
if (errorParameter.userInfo && errorParameter.userInfo.allKeys.count > 0)
{
NSString *emailRegex = @"[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}";
NSPredicate *emailPredicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", emailRegex];
BOOL maskedError = NO;
NSMutableDictionary *localUserInfo = [errorParameter.userInfo mutableCopy];
for (NSErrorUserInfoKey key in errorParameter.userInfo)
{
if ([errorParameter.userInfo[key] isKindOfClass:NSString.class])
{
if ([emailPredicate evaluateWithObject:errorParameter.userInfo[key]])
if ([errorParameter.userInfo[key] isKindOfClass:NSString.class]) {
NSString *stringValue = (NSString *)errorParameter.userInfo[key];
NSRange emailIndex = [stringValue rangeOfString:@"@"];
if (emailIndex.location != NSNotFound)
{
localUserInfo[key] = _PII_NULLIFY(errorParameter.userInfo[key]);
maskedError = YES;
NSMutableDictionary *localUserInfo = [errorParameter.userInfo mutableCopy];
// localUserInfo is only for log purpose, so should be safe to assign value here
localUserInfo[key] = _PII_NULLIFY(stringValue);
return [NSString stringWithFormat:@"MaskedError(%@, %ld, %@)", errorParameter.domain, (long)errorParameter.code, localUserInfo];
}
}
}

if (maskedError)
{
return [NSString stringWithFormat:@"MaskedError(%@, %ld, %@)", errorParameter.domain, (long)errorParameter.code, localUserInfo];
}
}
}