GitHub/TPInAppReceipt
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Code clean up

Browse Source
This commit is contained in:
tikhop
2024-02-08 23:05:13 +01:00
parent 568094538e
commit ca7761cfe4
3 changed files with 31 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/Validation.swift
+27 -36
View File
@@ -10,7 +10,7 @@
import UIKit
#endif
#if os(watchOS)
#if canImport(WatchKit)
import WatchKit
#endif
@@ -100,8 +100,7 @@ public extension InAppReceipt
/// - throws: An error in the InAppReceipt domain, if verification fails
func verifyBundleVersion() throws
{
guard let v = Bundle.main.appVersion,
v == appVersion else
guard appVersion == Bundle.main.appVersion else
{
throw IARError.validationFailed(reason: .bundleVersionVerification)
}
@@ -113,17 +112,8 @@ public extension InAppReceipt
func verifySignature() throws
{
try checkAppleRootCertExistence()
// only check certificate chain of trust and signature validity after these version
if #available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 5.0, *)
{
#if DEBUG
try checkSignatureValidity()
#else
try checkChainOfTrust()
try checkSignatureValidity()
#endif
}
try checkSignatureValidity()
try checkChainOfTrust()
}
/// Verifies existence of Apple Root Certificate in bundle
@@ -131,14 +121,13 @@ public extension InAppReceipt
/// - throws: An error in the InAppReceipt domain, if Apple Root Certificate does not exist
fileprivate func checkAppleRootCertExistence() throws
{
guard let certPath = rootCertificatePath,
FileManager.default.fileExists(atPath: certPath) else
guard let rootCertificatePath,
FileManager.default.fileExists(atPath: rootCertificatePath) else
{
throw IARError.validationFailed(reason: .signatureValidation(.appleIncRootCertificateNotFound))
}
}
@available(OSX 10.12, iOS 10.0, tvOS 10.0, watchOS 5.0, *)
func checkChainOfTrust() throws
{
// Validate chain of trust of certificate
@@ -184,17 +173,17 @@ public extension InAppReceipt
policy,
&wwdcTrust)
guard worldwideDevCertVerifyStatus == errSecSuccess && wwdcTrust != nil else
guard worldwideDevCertVerifyStatus == errSecSuccess, let wwdcTrust else
{
throw IARError.validationFailed(reason: .signatureValidation(.invalidCertificateChainOfTrust))
}
// verify iTunes cert in the receipt is signed by worldwide developer cert, which is signed by Apple Root Cert
let iTunesCertVerifystatus = SecTrustCreateWithCertificates([iTunesCertSec, worldwideDevCertSec, rootCertSec] as AnyObject,
let iTunesCertVerifyStatus = SecTrustCreateWithCertificates([iTunesCertSec, worldwideDevCertSec, rootCertSec] as AnyObject,
policy,
&iTunesTrust)
guard iTunesCertVerifystatus == errSecSuccess && iTunesTrust != nil else
guard iTunesCertVerifyStatus == errSecSuccess, let iTunesTrust else
{
throw IARError.validationFailed(reason: .signatureValidation(.invalidCertificateChainOfTrust))
}
@@ -204,12 +193,12 @@ public extension InAppReceipt
if #available(OSX 10.14, iOS 12.0, tvOS 12.0, *)
{
var error: CFError?
guard SecTrustEvaluateWithError(wwdcTrust!, &error) else
guard SecTrustEvaluateWithError(wwdcTrust, &error) else
{
throw IARError.validationFailed(reason: .signatureValidation(.invalidCertificateChainOfTrust))
}
} else {
guard SecTrustEvaluate(wwdcTrust!, &secTrustResult) == errSecSuccess else
guard SecTrustEvaluate(wwdcTrust, &secTrustResult) == errSecSuccess else
{
throw IARError.validationFailed(reason: .signatureValidation(.invalidCertificateChainOfTrust))
}
@@ -218,12 +207,12 @@ public extension InAppReceipt
if #available(OSX 10.14, iOS 12.0, tvOS 12.0, *)
{
var error: CFError?
guard SecTrustEvaluateWithError(iTunesTrust!, &error) else
guard SecTrustEvaluateWithError(iTunesTrust, &error) else
{
throw IARError.validationFailed(reason: .signatureValidation(.invalidCertificateChainOfTrust))
}
} else {
guard SecTrustEvaluate(iTunesTrust!, &secTrustResult) == errSecSuccess else
guard SecTrustEvaluate(iTunesTrust, &secTrustResult) == errSecSuccess else
{
throw IARError.validationFailed(reason: .signatureValidation(.invalidCertificateChainOfTrust))
}
@@ -287,21 +276,23 @@ public extension InAppReceipt
fileprivate func guid() -> Data
{
#if os(watchOS)
var uuidBytes = WKInterfaceDevice.current().identifierForVendor!.uuid
return Data(bytes: &uuidBytes, count: MemoryLayout.size(ofValue: uuidBytes))
#elseif targetEnvironment(macCatalyst) || os(macOS)
#if targetEnvironment(macCatalyst) || os(macOS)
if let guid = getMacAddress()
{
return guid
}else{
assertionFailure("Failed to retrieve guid")
}
if let guid = getMacAddress()
{
return guid
}else{
assertionFailure("Failed to retrieve guid")
}
return Data() // Never get called
return Data() // Never get called
#else
#if canImport(WatchKit)
var uuidBytes = WKInterfaceDevice.current().identifierForVendor!.uuid
#elseif canImport(UIKit)
var uuidBytes = UIDevice.current.identifierForVendor!.uuid
#endif
return Data(bytes: &uuidBytes, count: MemoryLayout.size(ofValue: uuidBytes))
#endif
}
Tests/TPInAppReceiptTests/PerformanceTests.swift
+1 -1
View File
@@ -39,7 +39,7 @@ class PerformanceTests: XCTestCase
self.measure {
do
{
try receipt.verify()
try receipt.validate()
}catch{
XCTFail("Unable to verify: \(error)")
}
Tests/TPInAppReceiptTests/TPInAppReceiptTests.swift
+3 -13
View File
@@ -2,20 +2,11 @@ import XCTest
@testable import TPInAppReceipt
final class TPInAppReceiptTests: XCTestCase {
func testExample() {
// This is an example of a functional test case.
// Use XCTAssert and related functions to verify your tests produce the correct
// results.
}
func testCrashReceipts()
{
func testCrashReceipts() {
var r = try? InAppReceipt(receiptData: noOriginalPurchaseDateCrashReceipt)
}
func testNewReceipt()
{
func testNewReceipt() {
self.measure {
let r = try! InAppReceipt(receiptData: newReceipt)
print(r.creationDate)
@@ -23,8 +14,7 @@ final class TPInAppReceiptTests: XCTestCase {
}
func testLegacyReceipt()
{
func testLegacyReceipt() {
self.measure {
let r = try! InAppReceipt(receiptData: legacyReceipt)
}