-
Notifications
You must be signed in to change notification settings - Fork 773
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
– The 5 required fields are exposes as params. – Token exchange now validates the ID Token iss, aud, and iat claims.
- Loading branch information
1 parent
98c8fbf
commit 100149e
Showing
6 changed files
with
271 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /*! @file OIDIDToken.h | ||
| @brief AppAuth iOS SDK | ||
| @copyright | ||
| Copyright 2017 Google Inc. All Rights Reserved. | ||
| @copydetails | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
| #import <Foundation/Foundation.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /*! @brief A convenience class that parses _but not validates_ and ID Token. | ||
| */ | ||
| @interface OIDIDToken : NSObject | ||
|
|
||
| /*! @internal | ||
| @brief Unavailable. Please use @c initWithAuthorizationResponse:. | ||
| */ | ||
| - (instancetype)init NS_UNAVAILABLE; | ||
|
|
||
| /*! @brief Parses the given ID Token string. | ||
| @param idToken The ID Token spring. | ||
| */ | ||
| - (nullable instancetype)initWithIDTokenString:(NSString *)idToken; | ||
|
|
||
| /*! @brief The header JWT values. | ||
| */ | ||
| @property(nonatomic, readonly) NSDictionary *header; | ||
|
|
||
| /*! @brief All ID Token claims. | ||
| */ | ||
| @property(nonatomic, readonly) NSDictionary *claims; | ||
|
|
||
| /*! @brief Issuer Identifier for the Issuer of the response. | ||
| @remarks iss | ||
| @see http://openid.net/specs/openid-connect-core-1_0.html#IDToken | ||
| */ | ||
| @property(nonatomic, readonly) NSURL *issuer; | ||
|
|
||
| /*! @brief Subject Identifier. | ||
| @remarks sub | ||
| @see http://openid.net/specs/openid-connect-core-1_0.html#IDToken | ||
| */ | ||
| @property(nonatomic, readonly) NSString *subject; | ||
|
|
||
| /*! @brief Audience(s) that this ID Token is intended for. | ||
| @remarks aud | ||
| @see http://openid.net/specs/openid-connect-core-1_0.html#IDToken | ||
| */ | ||
| @property(nonatomic, readonly) NSString *audience; | ||
|
|
||
| /*! @brief Expiration time on or after which the ID Token MUST NOT be accepted for processing. | ||
| @remarks exp | ||
| @see http://openid.net/specs/openid-connect-core-1_0.html#IDToken | ||
| */ | ||
| @property(nonatomic, readonly) NSDate *expiresAt; | ||
|
|
||
| /*! @brief Time at which the JWT was issued. | ||
| @remarks iat | ||
| @see http://openid.net/specs/openid-connect-core-1_0.html#IDToken | ||
| */ | ||
| @property(nonatomic, readonly) NSDate *issuedAt; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /*! @file OIDIDToken.m | ||
| @brief AppAuth iOS SDK | ||
| @copyright | ||
| Copyright 2017 Google Inc. All Rights Reserved. | ||
| @copydetails | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| #import "OIDIDToken.h" | ||
|
|
||
| /*! Field keys associated with an ID Token. */ | ||
| static NSString *const kIssKey = @"iss"; | ||
| static NSString *const kSubKey = @"sub"; | ||
| static NSString *const kAudKey = @"aud"; | ||
| static NSString *const kExpKey = @"exp"; | ||
| static NSString *const kIatKey = @"iat"; | ||
|
|
||
| #import "OIDFieldMapping.h" | ||
|
|
||
| @implementation OIDIDToken { | ||
| } | ||
|
|
||
| - (instancetype)initWithIDTokenString:(NSString *)idToken { | ||
| self = [super init]; | ||
| NSArray *sections = [idToken componentsSeparatedByString:@"."]; | ||
| if (sections.count > 1) { | ||
| _header = [[self class] parseJWTSection:sections[0]]; | ||
| _claims = [[self class] parseJWTSection:sections[1]]; | ||
| if (!_header || !_claims) { | ||
| return nil; | ||
| } | ||
|
|
||
| [OIDFieldMapping remainingParametersWithMap:[[self class] fieldMap] | ||
| parameters:_claims | ||
| instance:self]; | ||
|
|
||
| // Required fields. | ||
| if (!_issuer || !_audience || !_subject || !_expiresAt || !_issuedAt) { | ||
| return nil; | ||
| } | ||
|
|
||
| return self; | ||
| } | ||
| return nil; | ||
| } | ||
|
|
||
| /*! @brief Returns a mapping of incoming parameters to instance variables. | ||
| @return A mapping of incoming parameters to instance variables. | ||
| */ | ||
| + (NSDictionary<NSString *, OIDFieldMapping *> *)fieldMap { | ||
| static NSMutableDictionary<NSString *, OIDFieldMapping *> *fieldMap; | ||
| static dispatch_once_t onceToken; | ||
| dispatch_once(&onceToken, ^{ | ||
| fieldMap = [NSMutableDictionary dictionary]; | ||
|
|
||
| fieldMap[kIssKey] = | ||
| [[OIDFieldMapping alloc] initWithName:@"_issuer" | ||
| type:[NSURL class] | ||
| conversion:[OIDFieldMapping URLConversion]]; | ||
| fieldMap[kSubKey] = | ||
| [[OIDFieldMapping alloc] initWithName:@"_subject" type:[NSString class]]; | ||
| fieldMap[kAudKey] = | ||
| [[OIDFieldMapping alloc] initWithName:@"_audience" type:[NSString class]]; | ||
| fieldMap[kExpKey] = | ||
| [[OIDFieldMapping alloc] initWithName:@"_expiresAt" | ||
| type:[NSDate class] | ||
| conversion:^id _Nullable(NSObject *_Nullable value) { | ||
| if (![value isKindOfClass:[NSNumber class]]) { | ||
| return value; | ||
| } | ||
| NSNumber *valueAsNumber = (NSNumber *)value; | ||
| return [NSDate dateWithTimeIntervalSince1970:[valueAsNumber longLongValue]]; | ||
| }]; | ||
| fieldMap[kIatKey] = | ||
| [[OIDFieldMapping alloc] initWithName:@"_issuedAt" | ||
| type:[NSDate class] | ||
| conversion:^id _Nullable(NSObject *_Nullable value) { | ||
| if (![value isKindOfClass:[NSNumber class]]) { | ||
| return value; | ||
| } | ||
| NSNumber *valueAsNumber = (NSNumber *)value; | ||
| return [NSDate dateWithTimeIntervalSince1970:[valueAsNumber longLongValue]]; | ||
| }]; | ||
| }); | ||
| return fieldMap; | ||
| } | ||
|
|
||
| + (NSDictionary *)parseJWTSection:(NSString *)sectionString { | ||
| NSData *decodedData = [[self class] base64urlNoPaddingDecode:sectionString]; | ||
|
|
||
| // Parses JSON. | ||
| NSError *error; | ||
| id object = [NSJSONSerialization JSONObjectWithData:decodedData options:0 error:&error]; | ||
| if (error) { | ||
| NSLog(@"Error %@ parsing token payload %@", error, sectionString); | ||
| } | ||
| if ([object isKindOfClass:[NSDictionary class]]) { | ||
| return (NSDictionary *)object; | ||
| } | ||
|
|
||
| return nil; | ||
| } | ||
|
|
||
| + (NSData *)base64urlNoPaddingDecode:(NSString *)base64urlNoPaddingString { | ||
| NSMutableString *body = [base64urlNoPaddingString mutableCopy]; | ||
|
|
||
| // Converts base64url to base64. | ||
| NSRange range = NSMakeRange(0, base64urlNoPaddingString.length); | ||
| [body replaceOccurrencesOfString:@"-" withString:@"+" options:NSLiteralSearch range:range]; | ||
| [body replaceOccurrencesOfString:@"_" withString:@"/" options:NSLiteralSearch range:range]; | ||
|
|
||
| // Converts base64 no padding to base64 with padding | ||
| while (body.length % 4 != 0) { | ||
| [body appendString:@"="]; | ||
| } | ||
|
|
||
| // Decodes base64 string. | ||
| NSData *decodedData = [[NSData alloc] initWithBase64EncodedString:body options:0]; | ||
| return decodedData; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
|
|