forked from mirrors/gecko-dev
Bug 1944119 - Refactor MicrosoftEntraSSOUtils.mm a=dmeehan
Currently, the delegate uses nested if statements. The patch simplifies this by replacing them with return/continues. Original Revision: https://phabricator.services.mozilla.com/D235688 Differential Revision: https://phabricator.services.mozilla.com/D237076
This commit is contained in:
Sean
parent
941b037ac9
commit
3c8447886d
1 changed files with 127 additions and 123 deletions
|
|
@ -65,139 +65,143 @@ class API_AVAILABLE(macos(13.3)) MicrosoftEntraSSOUtils final {
|
||||||
}
|
}
|
||||||
- (void)authorizationController:(ASAuthorizationController*)controller
|
- (void)authorizationController:(ASAuthorizationController*)controller
|
||||||
didCompleteWithAuthorization:(ASAuthorization*)authorization {
|
didCompleteWithAuthorization:(ASAuthorization*)authorization {
|
||||||
if ([authorization.credential
|
ASAuthorizationSingleSignOnCredential* ssoCredential =
|
||||||
isKindOfClass:[ASAuthorizationSingleSignOnCredential class]]) {
|
[authorization.credential
|
||||||
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
isKindOfClass:[ASAuthorizationSingleSignOnCredential class]]
|
||||||
("SSORequestDelegate::didCompleteWithAuthorization: "
|
? (ASAuthorizationSingleSignOnCredential*)authorization.credential
|
||||||
"got ASAuthorizationSingleSignOnCredential"));
|
: nil;
|
||||||
|
|
||||||
ASAuthorizationSingleSignOnCredential* ssoCredential =
|
if (!ssoCredential) {
|
||||||
(ASAuthorizationSingleSignOnCredential*)authorization.credential;
|
|
||||||
|
|
||||||
NSHTTPURLResponse* authenticatedResponse =
|
|
||||||
ssoCredential.authenticatedResponse;
|
|
||||||
if (authenticatedResponse) {
|
|
||||||
NSDictionary* headers = authenticatedResponse.allHeaderFields;
|
|
||||||
NSMutableString* headersString = [NSMutableString string];
|
|
||||||
for (NSString* key in headers) {
|
|
||||||
[headersString appendFormat:@"%@: %@\n", key, headers[key]];
|
|
||||||
}
|
|
||||||
MOZ_LOG(
|
|
||||||
gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
|
||||||
("SSORequestDelegate::didCompleteWithAuthorization: "
|
|
||||||
"authenticatedResponse: \nStatus Code: %ld\nHeaders:\n%s",
|
|
||||||
(long)authenticatedResponse.statusCode, [headersString UTF8String]));
|
|
||||||
|
|
||||||
// An example format of ssoCookies:
|
|
||||||
// sso_cookies:
|
|
||||||
// {"device_headers":[
|
|
||||||
// {"header":{"x-ms-DeviceCredential”:”…”},”tenant_id”:”…”}],
|
|
||||||
// ”prt_headers":[{"header":{"x-ms-RefreshTokenCredential”:”…”},
|
|
||||||
// ”home_account_id”:”….”}]}
|
|
||||||
NSString* ssoCookies = headers[@"sso_cookies"];
|
|
||||||
if (ssoCookies) {
|
|
||||||
NSError* err = nil;
|
|
||||||
NSDictionary* ssoCookiesDict = [NSJSONSerialization
|
|
||||||
JSONObjectWithData:[ssoCookies
|
|
||||||
dataUsingEncoding:NSUTF8StringEncoding]
|
|
||||||
options:0
|
|
||||||
error:&err];
|
|
||||||
|
|
||||||
if (!err) {
|
|
||||||
NSMutableArray* allHeaders = [NSMutableArray array];
|
|
||||||
|
|
||||||
nsCString entraSuccessLabel;
|
|
||||||
if (ssoCookiesDict[@"device_headers"]) {
|
|
||||||
[allHeaders addObject:ssoCookiesDict[@"device_headers"]];
|
|
||||||
} else {
|
|
||||||
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
|
||||||
("SSORequestDelegate::didCompleteWithAuthorization: "
|
|
||||||
"Missing device_headers"));
|
|
||||||
entraSuccessLabel = "device_headers_missing"_ns;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ssoCookiesDict[@"prt_headers"]) {
|
|
||||||
[allHeaders addObject:ssoCookiesDict[@"prt_headers"]];
|
|
||||||
} else {
|
|
||||||
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
|
||||||
("SSORequestDelegate::didCompleteWithAuthorization: "
|
|
||||||
"Missing prt_headers"));
|
|
||||||
entraSuccessLabel = "prt_headers_missing"_ns;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (allHeaders.count == 0) {
|
|
||||||
entraSuccessLabel = "both_headers_missing"_ns;
|
|
||||||
}
|
|
||||||
|
|
||||||
// We would like to have both device_headers and prt_headers before
|
|
||||||
// attaching the headers
|
|
||||||
if (allHeaders.count == 2) {
|
|
||||||
// Append cookie headers retrieved from MS Broker
|
|
||||||
for (NSArray* headerArray in allHeaders) {
|
|
||||||
if (headerArray) {
|
|
||||||
for (NSDictionary* headerDict in headerArray) {
|
|
||||||
NSDictionary* headers = headerDict[@"header"];
|
|
||||||
if (headers) {
|
|
||||||
for (NSString* key in headers) {
|
|
||||||
NSString* value = headers[key];
|
|
||||||
if (value) {
|
|
||||||
nsAutoString nsKey;
|
|
||||||
nsAutoString nsValue;
|
|
||||||
mozilla::CopyNSStringToXPCOMString(key, nsKey);
|
|
||||||
mozilla::CopyNSStringToXPCOMString(value, nsValue);
|
|
||||||
mCallback->AddRequestHeader(
|
|
||||||
NS_ConvertUTF16toUTF8(nsKey),
|
|
||||||
NS_ConvertUTF16toUTF8(nsValue));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
mozilla::glean::network_sso::entra_success.Get("success"_ns).Add(1);
|
|
||||||
} else {
|
|
||||||
mozilla::glean::network_sso::entra_success.Get(entraSuccessLabel)
|
|
||||||
.Add(1);
|
|
||||||
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
|
||||||
("SSORequestDelegate::didCompleteWithAuthorization: "
|
|
||||||
"sso_cookies has missing headers"));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
|
||||||
("SSORequestDelegate::didCompleteWithAuthorization: "
|
|
||||||
"Failed to parse sso_cookies: %s",
|
|
||||||
[[err localizedDescription] UTF8String]));
|
|
||||||
mozilla::glean::network_sso::entra_success.Get("invalid_cookie"_ns)
|
|
||||||
.Add(1);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
|
||||||
("SSORequestDelegate::didCompleteWithAuthorization: "
|
|
||||||
"sso_cookies is not present"));
|
|
||||||
mozilla::glean::network_sso::entra_success.Get("invalid_cookie"_ns)
|
|
||||||
.Add(1);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
|
||||||
("SSORequestDelegate::didCompleteWithAuthorization: "
|
|
||||||
"authenticatedResponse is nil"));
|
|
||||||
mozilla::glean::network_sso::entra_success.Get("invalid_cookie"_ns)
|
|
||||||
.Add(1);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
||||||
("SSORequestDelegate::didCompleteWithAuthorization: "
|
("SSORequestDelegate::didCompleteWithAuthorization: "
|
||||||
"should have ASAuthorizationSingleSignOnCredential"));
|
"should have ASAuthorizationSingleSignOnCredential"));
|
||||||
mozilla::glean::network_sso::entra_success.Get("no_credential"_ns).Add(1);
|
mozilla::glean::network_sso::entra_success.Get("no_credential"_ns).Add(1);
|
||||||
|
[self invokeCallbackOnMainThread];
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NSHTTPURLResponse* authenticatedResponse =
|
||||||
|
ssoCredential.authenticatedResponse;
|
||||||
|
if (!authenticatedResponse) {
|
||||||
|
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
||||||
|
("SSORequestDelegate::didCompleteWithAuthorization: "
|
||||||
|
"authenticatedResponse is nil"));
|
||||||
|
mozilla::glean::network_sso::entra_success.Get("invalid_cookie"_ns).Add(1);
|
||||||
|
[self invokeCallbackOnMainThread];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
NSDictionary* headers = authenticatedResponse.allHeaderFields;
|
||||||
|
NSMutableString* headersString = [NSMutableString string];
|
||||||
|
for (NSString* key in headers) {
|
||||||
|
[headersString appendFormat:@"%@: %@\n", key, headers[key]];
|
||||||
|
}
|
||||||
|
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
||||||
|
("SSORequestDelegate::didCompleteWithAuthorization: "
|
||||||
|
"authenticatedResponse: \nStatus Code: %ld\nHeaders:\n%s",
|
||||||
|
(long)authenticatedResponse.statusCode, [headersString UTF8String]));
|
||||||
|
|
||||||
|
// An example format of ssoCookies:
|
||||||
|
// sso_cookies:
|
||||||
|
// {"device_headers":[
|
||||||
|
// {"header":{"x-ms-DeviceCredential”:”…”},”tenant_id”:”…”}],
|
||||||
|
// ”prt_headers":[{"header":{"x-ms-RefreshTokenCredential”:”…”},
|
||||||
|
// ”home_account_id”:”….”}]}
|
||||||
|
NSString* ssoCookies = headers[@"sso_cookies"];
|
||||||
|
if (!ssoCookies) {
|
||||||
|
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
||||||
|
("SSORequestDelegate::didCompleteWithAuthorization: "
|
||||||
|
"authenticatedResponse is nil"));
|
||||||
|
mozilla::glean::network_sso::entra_success.Get("invalid_cookie"_ns).Add(1);
|
||||||
|
[self invokeCallbackOnMainThread];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
NSError* err = nil;
|
||||||
|
NSDictionary* ssoCookiesDict = [NSJSONSerialization
|
||||||
|
JSONObjectWithData:[ssoCookies dataUsingEncoding:NSUTF8StringEncoding]
|
||||||
|
options:0
|
||||||
|
error:&err];
|
||||||
|
|
||||||
|
if (err) {
|
||||||
|
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
||||||
|
("SSORequestDelegate::didCompleteWithAuthorization: Error parsing "
|
||||||
|
"JSON: %s",
|
||||||
|
[[err localizedDescription] UTF8String]));
|
||||||
|
mozilla::glean::network_sso::entra_success.Get("invalid_cookie"_ns).Add(1);
|
||||||
|
[self invokeCallbackOnMainThread];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
NSMutableArray* allHeaders = [NSMutableArray array];
|
||||||
|
nsCString entraSuccessLabel;
|
||||||
|
|
||||||
|
if (ssoCookiesDict[@"device_headers"]) {
|
||||||
|
[allHeaders addObject:ssoCookiesDict[@"device_headers"]];
|
||||||
|
} else {
|
||||||
|
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
||||||
|
("SSORequestDelegate::didCompleteWithAuthorization: "
|
||||||
|
"Missing device_headers"));
|
||||||
|
entraSuccessLabel = "device_headers_missing"_ns;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ssoCookiesDict[@"prt_headers"]) {
|
||||||
|
[allHeaders addObject:ssoCookiesDict[@"prt_headers"]];
|
||||||
|
} else {
|
||||||
|
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
||||||
|
("SSORequestDelegate::didCompleteWithAuthorization: "
|
||||||
|
"Missing prt_headers"));
|
||||||
|
entraSuccessLabel = "prt_headers_missing"_ns;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (allHeaders.count == 0) {
|
||||||
|
entraSuccessLabel = "both_headers_missing"_ns;
|
||||||
|
}
|
||||||
|
|
||||||
|
// We would like to have both device_headers and prt_headers before
|
||||||
|
// attaching the headers
|
||||||
|
if (allHeaders.count != 2) {
|
||||||
|
MOZ_LOG(gMacOSWebAuthnServiceLog, mozilla::LogLevel::Debug,
|
||||||
|
("SSORequestDelegate::didCompleteWithAuthorization: "
|
||||||
|
"sso_cookies has missing headers"));
|
||||||
|
mozilla::glean::network_sso::entra_success.Get(entraSuccessLabel).Add(1);
|
||||||
|
[self invokeCallbackOnMainThread];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Append cookie headers retrieved from MS Broker
|
||||||
|
for (NSArray* headerArray in allHeaders) {
|
||||||
|
if (!headerArray) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for (NSDictionary* headerDict in headerArray) {
|
||||||
|
NSDictionary* headers = headerDict[@"header"];
|
||||||
|
if (!headers) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for (NSString* key in headers) {
|
||||||
|
NSString* value = headers[key];
|
||||||
|
if (!value) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
nsAutoString nsKey;
|
||||||
|
nsAutoString nsValue;
|
||||||
|
mozilla::CopyNSStringToXPCOMString(key, nsKey);
|
||||||
|
mozilla::CopyNSStringToXPCOMString(value, nsValue);
|
||||||
|
mCallback->AddRequestHeader(NS_ConvertUTF16toUTF8(nsKey),
|
||||||
|
NS_ConvertUTF16toUTF8(nsValue));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mozilla::glean::network_sso::entra_success.Get("success"_ns).Add(1);
|
||||||
|
|
||||||
|
[self invokeCallbackOnMainThread];
|
||||||
|
}
|
||||||
|
- (void)invokeCallbackOnMainThread {
|
||||||
NS_DispatchToMainThread(NS_NewRunnableFunction(
|
NS_DispatchToMainThread(NS_NewRunnableFunction(
|
||||||
"SSORequestDelegate::didCompleteWithAuthorization failure",
|
"SSORequestDelegate::didCompleteWithAuthorization failure",
|
||||||
[callback(mCallback)]() {
|
[callback(mCallback)]() { callback->InvokeCallback(); }));
|
||||||
MOZ_ASSERT(NS_IsMainThread());
|
|
||||||
callback->InvokeCallback();
|
|
||||||
}));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)authorizationController:(ASAuthorizationController*)controller
|
- (void)authorizationController:(ASAuthorizationController*)controller
|
||||||
didCompleteWithError:(NSError*)error {
|
didCompleteWithError:(NSError*)error {
|
||||||
nsAutoString errorDescription;
|
nsAutoString errorDescription;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue