Trusted entitlements: Add Signature type to process new signature response format#1109
Merged
tonidero merged 3 commits intoJun 30, 2023
Merged
Conversation
Codecov Report
@@ Coverage Diff @@
## main #1109 +/- ##
==========================================
+ Coverage 85.12% 85.13% +0.01%
==========================================
Files 183 184 +1
Lines 6493 6538 +45
Branches 917 927 +10
==========================================
+ Hits 5527 5566 +39
Misses 601 601
- Partials 365 371 +6
|
tonidero
commented
Jun 29, 2023
| } | ||
| } | ||
|
|
||
| override fun equals(other: Any?): Boolean { |
Contributor
Author
There was a problem hiding this comment.
When using ByteArray, data classes default equals don't seem to work well, so we need to override the equals and hashCode methods
NachoSoto
approved these changes
Jun 29, 2023
Comment on lines
+20
to
+24
| val startByte: Int | ||
| get() = values().copyOfRange(0, ordinal).sumOf { it.size } | ||
|
|
||
| val endByte: Int | ||
| get() = startByte + size |
| import androidx.annotation.VisibleForTesting | ||
|
|
||
| @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) | ||
| internal enum class SignatureComponent(val size: Int) { |
Contributor
There was a problem hiding this comment.
Is it possible in Kotlin to make this a nested type of Signature? So this becomes Signature.Component?
Contributor
Author
There was a problem hiding this comment.
Yeah we can do that 👍
Comment on lines
+31
to
+37
| data class Signature( | ||
| val intermediateKey: ByteArray, | ||
| val intermediateKeyExpiration: ByteArray, | ||
| val intermediateKeySignature: ByteArray, | ||
| val salt: ByteArray, | ||
| val payload: ByteArray, | ||
| ) { |
Contributor
There was a problem hiding this comment.
I love this abstraction.
| internal fun fromString(signature: String): Signature { | ||
| val signatureBytes = Base64.decode(signature, Base64.DEFAULT) | ||
| val expectedSize = SignatureComponent.totalSize | ||
| if (signatureBytes.size != expectedSize) { |
| val signatureBytes = Base64.decode(signature, Base64.DEFAULT) | ||
| val expectedSize = SignatureComponent.totalSize | ||
| if (signatureBytes.size != expectedSize) { | ||
| throw InvalidSignatureSizeException( |
Contributor
There was a problem hiding this comment.
I guess it will be important than the SigningManager catches this, right? If only Kotlin had checked exceptions...
Contributor
Author
There was a problem hiding this comment.
Yeah, it would be great to have that 😞
…ike Signature.Component
tonidero
added a commit
that referenced
this pull request
Jul 12, 2023
**This is an automatic release.** ### New Features * `Trusted Entitlements`: made API stable (#1105) via NachoSoto (@NachoSoto) This new feature prevents MitM attacks between the SDK and the RevenueCat server. With verification enabled, the SDK ensures that the response created by the server was not modified by a third-party, and the entitlements received are exactly what was sent. This is 100% opt-in. `EntitlementInfos` have a new `VerificationResult` property, which will indicate the validity of the responses when this feature is enabled. ```kotlin fun configureRevenueCat() { val configuration = PurchasesConfiguration.Builder(context, apiKey) .entitlementVerificationMode(EntitlementVerificationMode.INFORMATIONAL) .build() Purchases.configure(configuration) } ``` ### Experimental features * Add await offerings (#1096) via Cesar de la Vega (@vegaro) ### Bugfixes * Fix issue updating customer info on app open (#1128) via Toni Rico (@tonidero) ### Dependency Updates * Bump fastlane-plugin-revenuecat_internal from `13773d2` to `b2108fb` (#1095) via dependabot[bot] (@dependabot[bot]) ### Other Changes * [PurchaseTester] Add option to purchase an arbitrary product id (#1099) via Mark Villacampa (@MarkVillacampa) * Fix release path after module refactor (#1129) via Toni Rico (@tonidero) * Fix load shedder integration tests (#1125) via Toni Rico (@tonidero) * Trusted entitlements: New trusted entitlements signature format (#1117) via Toni Rico (@tonidero) * Fix integration tests and change to a different project (#1123) via Toni Rico (@tonidero) * Move files into src/main/kotlin (#1122) via Cesar de la Vega (@vegaro) * Remove public module (#1113) via Cesar de la Vega (@vegaro) * Remove common module (#1106) via Cesar de la Vega (@vegaro) * Fix flaky integration tests: Wait for coroutines to finish before continuing (#1120) via Toni Rico (@tonidero) * Move amazon module into purchases (#1112) via Cesar de la Vega (@vegaro) * Trusted entitlements: Add IntermediateSignatureHelper to handle intermediate signature verification process (#1110) via Toni Rico (@tonidero) * Trusted entitlements: Add Signature type to process new signature response format (#1109) via Toni Rico (@tonidero) * [EXTERNAL] Add `awaitCustomerInfo` / coroutines tests to `TrustedEntitlementsInformationalModeIntegrationTest` (#1077) via @pablo-guardiola (#1107) via Toni Rico (@tonidero) * Remove feature:google module (#1104) via Cesar de la Vega (@vegaro) * Remove identity module (#1103) via Cesar de la Vega (@vegaro) * Remove subscriber attributes module (#1102) via Cesar de la Vega (@vegaro) * Delete utils module (#1098) via Cesar de la Vega (@vegaro) * Remove strings module (#1097) via Cesar de la Vega (@vegaro) * Update CHANGELOG.md to include external contribution (#1100) via Cesar de la Vega (@vegaro) * [EXTERNAL] Add missing `fetchPolicy` parameter to `awaitCustomerInfo` API (#1086) via @pablo-guardiola (#1090) via Toni Rico (@tonidero) --------- Co-authored-by: revenuecat-ops <ops@revenuecat.com> Co-authored-by: Toni Rico <antonio.rico.diez@revenuecat.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
First PR for SDK-3200
This adds the new
Signaturetype which will encode the different fields that are part of the new signature format. This is currently unused and will be used in future PRs.