Skip to content

Error when the JSON object isn't a NSDictionary #399

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

Merged
WilliamDenniss merged 1 commit into from
Jun 1, 2019
Merged

Error when the JSON object isn't a NSDictionary #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions Source/OIDServiceDiscovery.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ - (nullable instancetype)initWithJSONData:(NSData *)serviceDiscoveryJSONData
description:jsonError.localizedDescription];
return nil;
}
if (![json isKindOfClass:[NSDictionary class]]) {
*error = [OIDErrorUtilities errorWithCode:OIDErrorCodeInvalidDiscoveryDocument
underlyingError:nil
description:@"Discovery document isn't a dictionary"];
return nil;
}

return [self initWithDictionary:json error:error];
}

Expand Down
16 changes: 16 additions & 0 deletions UnitTests/OIDServiceDiscoveryTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ + (NSURL *)googleDiscoveryAuthorizationEndpoint {
"ail_verified\",\"exp\",\"family_name\",\"given_name\",\"iat\",\"iss\",\"locale\",\"name\",\""
"picture\",\"sub\"]}";

static NSString *const kDiscoveryDocumentNotDictionary =
@"[\"code\",\"token\",\"id_token\",\"code token\",\"code id_token\",\"token id_token\",\"code to"
"ken id_token\",\"none\"]";

/*! @brief Tests that URLs are handled properly when converted from the dictionary's string
representation.
*/
Expand Down Expand Up @@ -222,6 +226,18 @@ - (void)testErrorWhenBadFormat {
XCTAssertEqual(error.code, OIDErrorCodeJSONDeserializationError, @"");
}

/*! @brief Tests that we get an error when the root JSON object isn't a dictionary.
*/
- (void)testErrorWhenRootObjectNotNSDictionary {
NSError *error;
OIDServiceDiscovery *discovery = [[OIDServiceDiscovery alloc] initWithJSON:kDiscoveryDocumentNotDictionary error:&error];
XCTAssertNil(discovery, @"When initializing a discovery document, it should not return an "
"instance if the root JSON object is not a NSDictionary.");
XCTAssertNotNil(error, @"There should be an error indicating we received bad JSON.");
XCTAssertEqualObjects(error.domain, OIDGeneralErrorDomain, @"");
XCTAssertEqual(error.code, OIDErrorCodeInvalidDiscoveryDocument, @"");
}

/*! @brief Tests that we get an error when the required fields aren't in the source dictionary.
*/
- (void)testErrorWhenMissingFields {
Expand Down