Dry up signing roundtrip tests #198
Merged
Conversation
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
ghost
self-requested a review
ghost
self-assigned this
Generated by 🚫 Danger |
Jonathan-Airside
previously approved these changes
Feb 6, 2020
ghost
previously approved these changes
Feb 7, 2020
Tests/JWSRSATests.swift
Outdated
Comment on lines
132
to
133
| let algKidHeader = "{\"alg\":\"\(algorithm.rawValue)\",\"kid\":\"kid\"}" | ||
| let kidAlgHeader = "{\"kid\":\"kid\",\"alg\":\"\(algorithm.rawValue)\"}" |
There was a problem hiding this comment.
I think you could make these string literals a little cleaner to read by using extended string delimiters. Your call whether it's worth the trade off for noisier string interpolation.
Something like
let algKidHeader = #"{"alg":"\#(algorithm.rawValue)","kid":"kid"}"#There was a problem hiding this comment.
Agreed 👍 But since we have lots and lots of such strings throughout the project, I tracked #202.
Tests/JWSRSATests.swift
Outdated
| @@ -149,7 +128,19 @@ class JWSRSATests: RSACryptoTestCase { | |||
| let verifier = Verifier(verifyingAlgorithm: algorithm, publicKey: publicKeyAlice2048!) | |||
|
|
|||
| XCTAssertTrue(secondJWS.isValid(for: verifier!)) | |||
| XCTAssertEqual(String(data: jws.header.data(), encoding: .utf8), "{\"alg\":\"\(algorithm.rawValue)\"}") | |||
| if withKid { | |||
There was a problem hiding this comment.
This if statement wants to be a guard. If you move the check from line 144 up above the branch then an early return wouldn't matter, right?
ghost
mentioned this pull request
ghost
dismissed stale reviews from Jonathan-Airside and themself
via
c549b43
|
@nathan-mohemian Please re-review! (I also ran |
|
Kudos, SonarCloud Quality Gate passed!
|
|
SonarCloud Quality Gate failed.
|
ghost
reviewed
Feb 14, 2020
ghost
approved these changes
Feb 14, 2020
ghost
pushed a commit
that referenced
this pull request
Feb 14, 2020
* Rename asymmetric algorithm * Rename symmetric algorithm * Refactor algorithm enums * Sketch out new encryption flow * Refactor encryption flow * Fix reference to old rsa encrypter * Remove dummy keywrap mode * Fix and extendcompression tests * Add key management mode tests * Adapt rsa tests * Add alg check test * Disable space linter rule for now * Adap AES tests * Add license headers to new files * Make sonarqube happy * Do full Sonarqube analysis in pull requests (#201) * Do sonarqube analysis after test * Log fastlane contents * Remove deletion of coverage report * Update sonar config to point to sonarcloud * Trigger analysis * Exclude tests from duplication calculation * Remove loggign * Dry up signing roundtrip tests (#198) * Dry up tests * Use guard in test helper * Format code * Redo mode creation * REname key encryption mode implementations * Final cleanup * Commit something * Revert "Commit something" This reverts commit 91266d4.
ghost
pushed a commit
that referenced
this pull request
Feb 17, 2020
* Restructure JWE encryption flow (#203) * Rename asymmetric algorithm * Rename symmetric algorithm * Refactor algorithm enums * Sketch out new encryption flow * Refactor encryption flow * Fix reference to old rsa encrypter * Remove dummy keywrap mode * Fix and extendcompression tests * Add key management mode tests * Adapt rsa tests * Add alg check test * Disable space linter rule for now * Adap AES tests * Add license headers to new files * Make sonarqube happy * Do full Sonarqube analysis in pull requests (#201) * Do sonarqube analysis after test * Log fastlane contents * Remove deletion of coverage report * Update sonar config to point to sonarcloud * Trigger analysis * Exclude tests from duplication calculation * Remove loggign * Dry up signing roundtrip tests (#198) * Dry up tests * Use guard in test helper * Format code * Redo mode creation * REname key encryption mode implementations * Final cleanup * Commit something * Revert "Commit something" This reverts commit 91266d4. * Restructure JWE decryption flow (#208) * Replicate encryption flow for decryption * Fix tests * Split rsa mode in two types * Replace deprecated decrypter calls in tests * Remove todos * Add documentation * Update alg documentation * Fix typos * Add key types to doc * Change access modifiers back
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #189. We had two helper functions that did basically the same. Dried those up.