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

Signing: removed API for loading key from a file #2638

Merged
merged 1 commit into from
Jun 13, 2023
+1 −46
Merged

Signing: removed API for loading key from a file #2638

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
12 changes: 0 additions & 12 deletions RevenueCat.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,6 @@
57E415F12846997B00EA5460 /* PurchasesAttributionDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57E415F02846997B00EA5460 /* PurchasesAttributionDataTests.swift */; };
57E415FF28469EAB00EA5460 /* PurchasesGetProductsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57E415FE28469EAB00EA5460 /* PurchasesGetProductsTests.swift */; };
57E6195028D291DC0093170C /* StoreKit2CachingProductsManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57E6194F28D291DC0093170C /* StoreKit2CachingProductsManagerTests.swift */; };
57E6C26C29722EDA001AFE98 /* invalid_certificate.cer in Resources */ = {isa = PBXBuildFile; fileRef = 57E6C26B29722EDA001AFE98 /* invalid_certificate.cer */; };
57E6C27C29723A94001AFE98 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57E6C27B29723A94001AFE98 /* Signing.swift */; };
57E6C27E29723F9E001AFE98 /* SigningTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57E6C27D29723F9E001AFE98 /* SigningTests.swift */; };
57E6C2C72975AAE1001AFE98 /* FileReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5759B407296DFA75002472D5 /* FileReader.swift */; };
Expand Down Expand Up @@ -1145,7 +1144,6 @@
57E415F02846997B00EA5460 /* PurchasesAttributionDataTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchasesAttributionDataTests.swift; sourceTree = "<group>"; };
57E415FE28469EAB00EA5460 /* PurchasesGetProductsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchasesGetProductsTests.swift; sourceTree = "<group>"; };
57E6194F28D291DC0093170C /* StoreKit2CachingProductsManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreKit2CachingProductsManagerTests.swift; sourceTree = "<group>"; };
57E6C26B29722EDA001AFE98 /* invalid_certificate.cer */ = {isa = PBXFileReference; lastKnownFileType = text; path = invalid_certificate.cer; sourceTree = "<group>"; };
57E6C27B29723A94001AFE98 /* Signing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Signing.swift; sourceTree = "<group>"; };
57E6C27D29723F9E001AFE98 /* SigningTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SigningTests.swift; sourceTree = "<group>"; };
57E9CF0E290B2A4B00EE12D1 /* CachingTrialOrIntroPriceEligibilityChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CachingTrialOrIntroPriceEligibilityChecker.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1638,7 +1636,6 @@
2DDE559824C8B5D100DCB087 /* Resources */ = {
isa = PBXGroup;
children = (
57E6C26A29722EC6001AFE98 /* public_keys */,
2DDE559924C8B5E300DCB087 /* receipts */,
);
path = Resources;
Expand Down Expand Up @@ -2329,14 +2326,6 @@
path = Responses;
sourceTree = "<group>";
};
57E6C26A29722EC6001AFE98 /* public_keys */ = {
isa = PBXGroup;
children = (
57E6C26B29722EDA001AFE98 /* invalid_certificate.cer */,
);
path = public_keys;
sourceTree = "<group>";
};
57F3C0C929B7A04D0004FD7E /* Security */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2919,7 +2908,6 @@
buildActionMask = 2147483647;
files = (
2D4D6AF624F7193700B656BE /* verifyReceiptSample1.txt in Resources */,
57E6C26C29722EDA001AFE98 /* invalid_certificate.cer in Resources */,
2D4D6AF724F7193700B656BE /* base64encodedreceiptsample1.txt in Resources */,
5774F9BE2805E71100997128 /* Fixtures in Resources */,
5791CE80273F26A000E50C4B /* base64encoded_sandboxReceipt.txt in Resources */,
Expand Down
17 changes: 0 additions & 17 deletions Sources/Security/Signing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,23 +161,6 @@ extension CryptoKit.Curve25519.Signing.PublicKey: SigningPublicKey {}

extension Signing {

/// Loads the key in `url` and returns a `PublicKey`
/// - Throws: ``ErrorCode/configurationError`` if the certificate couldn't be loaded.
@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
static func loadPublicKey(in url: URL) throws -> PublicKey {
let data: Data
do {
data = try Data(contentsOf: url)
} catch {
throw ErrorUtils.configurationError(
message: Strings.configure.public_key_could_not_be_found(fileName: url.relativeString).description,
underlyingError: error
)
}

return try Self.loadPublicKey(with: data)
}

/// Parses the binary `key` and returns a `PublicKey`
/// - Throws: ``ErrorCode/configurationError`` if the certificate couldn't be loaded.
@available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.2, *)
Expand Down
1 change: 0 additions & 1 deletion Tests/UnitTests/Resources/public_keys/invalid_certificate.cer
View file
Open in desktop

This file was deleted.

17 changes: 1 addition & 16 deletions Tests/UnitTests/Security/SigningTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,9 @@ class SigningTests: TestCase {
expect(key.rawRepresentation).toNot(beEmpty())
}

func testThrowsErrorIfPublicKeyFileDoesNotExist() throws {
let url = try XCTUnwrap(URL(string: "not_existing_file.cer"))

expect {
try Signing.loadPublicKey(in: url)
}.to(throwError { error in
expect(error).to(matchError(ErrorCode.configurationError))
expect(error.localizedDescription) == "There is an issue with your configuration. " +
"Check the underlying error for more details. Could not find public key 'not_existing_file.cer'"
})
}

func testThrowsErrorIfPublicKeyFileCannotBeParsed() throws {
let url = try XCTUnwrap(Bundle(for: Self.self).url(forResource: "invalid_certificate",
withExtension: "cer"))

expect {
try Signing.loadPublicKey(in: url)
try Signing.loadPublicKey(with: .init([1, 2, 3]))
}.to(throwError { error in
expect(error).to(matchError(ErrorCode.configurationError))
expect(error.localizedDescription) == "There is an issue with your configuration. " +
Expand Down