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

Jump to bottom

Fix: Credential's Expiration time #136

Merged
merged 6 commits into from
Jan 9, 2023
Merged

Fix: Credential's Expiration time #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd300f0
Fix expiration
waahm7 Jan 7, 2023
3c091d3
Fix parsing
waahm7 Jan 9, 2023
074403b
test change
waahm7 Jan 9, 2023
9699e6d
remove test change
waahm7 Jan 9, 2023
19ef4c4
Add UInt64.max + 10 test as well
waahm7 Jan 9, 2023
efb74b5
remove line break
waahm7 Jan 9, 2023
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
19 changes: 13 additions & 6 deletions Source/AwsCommonRuntimeKit/auth/credentials/Credentials.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ public final class Credentials {
/// - secret: value for the secret access key field
/// - sessionToken: (Optional) security token associated with the credentials
/// - expiration: (Optional) Point in time after which credentials will no longer be valid.
/// For credentials that do not expire, use nil. Timezone is always UTC.
/// For credentials that do not expire, use nil.
/// If expiration.timeIntervalSince1970 is greater than UInt64.max, it will be converted to nil.
/// - allocator: (Optional) allocator to override.
/// - Throws: CommonRuntimeError.crtError
public init(accessKey: String,
Expand All @@ -30,7 +31,8 @@ public final class Credentials {
allocator: Allocator = defaultAllocator) throws {

let expirationTimeout: UInt64
if let expiration = expiration {
if let expiration = expiration,
expiration.timeIntervalSince1970 < Double(UInt64.max) {
expirationTimeout = UInt64(expiration.timeIntervalSince1970)
} else {
expirationTimeout = UInt64.max
Expand Down Expand Up @@ -77,11 +79,16 @@ public final class Credentials {
return token.toOptionalString()
}

/// Gets the expiration timeout in seconds from the `aws_credentials` instance
/// Gets the expiration timeout from the `aws_credentials` instance
///
/// - Returns:`UInt64`: The timeout in seconds of when the credentials expire
public func getExpiration() -> Date {
return Date(timeIntervalSince1970: TimeInterval(aws_credentials_get_expiration_timepoint_seconds(rawValue)))
/// - Returns:`Data?`: The timeout in seconds of when the credentials expire.
/// It will return nil if credentials never expire
public func getExpiration() -> Date? {
let seconds = aws_credentials_get_expiration_timepoint_seconds(rawValue)
if seconds == UInt64.max {
return nil
}
return Date(timeIntervalSince1970: TimeInterval(seconds))
}

deinit {
Expand Down
35 changes: 33 additions & 2 deletions Test/AwsCommonRuntimeKitTests/auth/CredentialsTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,26 @@ class CredentialsTests: XCBaseTestCase {
XCTAssertEqual(accessKey, credentials.getAccessKey())
XCTAssertEqual(secret, credentials.getSecret())
XCTAssertEqual(sessionToken, credentials.getSessionToken())
XCTAssertEqual(UInt64(expiration.timeIntervalSince1970), UInt64(credentials.getExpiration().timeIntervalSince1970))
XCTAssertEqual(UInt64(expiration.timeIntervalSince1970), UInt64(credentials.getExpiration()!.timeIntervalSince1970))

}

func testCreateAWSCredentialsInfinity() async throws {
let accessKey = "AccessKey"
let secret = "Secret"
let sessionToken = "Token"
let expiration = Date(timeIntervalSince1970: (Double) (UInt64.max))

let credentials = try Credentials(accessKey: accessKey, secret: secret, sessionToken: sessionToken, expiration: expiration)

XCTAssertEqual(accessKey, credentials.getAccessKey())
XCTAssertEqual(secret, credentials.getSecret())
XCTAssertEqual(sessionToken, credentials.getSessionToken())
XCTAssertNil(credentials.getExpiration())

let expiration2 = Date(timeIntervalSince1970: (Double) (UInt64.max)+10)
let credentials2 = try Credentials(accessKey: accessKey, secret: secret, sessionToken: sessionToken, expiration: expiration2)
XCTAssertNil(credentials2.getExpiration())
}

func testCreateAWSCredentialsWithoutSessionToken() async throws {
Expand All @@ -29,8 +48,20 @@ class CredentialsTests: XCBaseTestCase {
XCTAssertEqual(accessKey, credentials.getAccessKey())
XCTAssertEqual(secret, credentials.getSecret())
XCTAssertEqual(credentials.getSessionToken(), nil)
XCTAssertEqual(UInt64(expiration.timeIntervalSince1970), UInt64(credentials.getExpiration().timeIntervalSince1970))
XCTAssertEqual(UInt64(expiration.timeIntervalSince1970), UInt64(credentials.getExpiration()!.timeIntervalSince1970))

}

func testCreateAWSCredentialsWithoutExpiration() async throws {
let accessKey = "AccessKey"
let secret = "Secret"

let credentials = try Credentials(accessKey: accessKey, secret: secret, sessionToken: nil)

XCTAssertEqual(accessKey, credentials.getAccessKey())
XCTAssertEqual(secret, credentials.getSecret())
XCTAssertEqual(credentials.getSessionToken(), nil)
XCTAssertNil(credentials.getExpiration())
}

func testCreateAWSCredentialsWithoutAccessKeyThrows() async {
Expand Down