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.

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

fix(e2ei): set ciphersuites when replacing KeyPackages (WPB-10238) 🍒 🍒 #2931

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 5, 2024

BugWPB-10238 [Android] When enabling e2ei after user is logged in, certificate generation fails

This PR was automatically cherry-picked based on the following PR:

Original PR description:


This PR was automatically cherry-picked based on the following PR:

Original PR description:



PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like SQPIT-764
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

After finding some issues on the backend, now it's mandatory to set the CipherSuite when replacing keypackages after E2EI.

Testing

Test Coverage (Optional)

  • I have added automated test to this contribution

How to Test

Briefly describe how this change was tested and if applicable the exact steps taken to verify that it works as expected.

Notes (Optional)

Specify here any other facts that you think are important for this issue.

Attachments (Optional)

Attachments like images, videos, etc. (drag and drop in the text box)


PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

…2921)

* Commit with unresolved merge conflicts

* resolve conflicts after cherry pick

---------

Co-authored-by: Mojtaba Chenani <[email protected]>
@mchenani mchenani enabled auto-merge August 5, 2024 09:32
Copy link

sonarqubecloud bot commented Aug 5, 2024

Copy link
Contributor Author

github-actions bot commented Aug 5, 2024

Test Results

3 149 tests  +2   3 044 ✔️ +2   3m 42s ⏱️ -20s
   540 suites ±0      105 💤 ±0 
   540 files   ±0          0 ±0 

Results for commit 8f126b6. ± Comparison against base commit 859dab6.

This pull request removes 14 and adds 16 tests. Note that renamed tests count towards both.
com.wire.kalium.util.string.NumberByteArrayTest ‑ givenA10000AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[js, browser]
com.wire.kalium.util.string.NumberByteArrayTest ‑ givenA10000AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[jvm]
com.wire.kalium.util.string.NumberByteArrayTest ‑ givenA1000AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[js, browser]
com.wire.kalium.util.string.NumberByteArrayTest ‑ givenA1000AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[jvm]
com.wire.kalium.util.string.NumberByteArrayTest ‑ givenA100AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[js, browser]
com.wire.kalium.util.string.NumberByteArrayTest ‑ givenA100AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[jvm]
com.wire.kalium.util.string.NumberByteArrayTest ‑ givenA10AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[js, browser]
com.wire.kalium.util.string.NumberByteArrayTest ‑ givenA10AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[jvm]
com.wire.kalium.util.string.NumberByteArrayTest ‑ givenA1AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[js, browser]
com.wire.kalium.util.string.NumberByteArrayTest ‑ givenA1AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[jvm]
…
com.wire.kalium.util.IntExtTests ‑ givenA10000AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[js, browser]
com.wire.kalium.util.IntExtTests ‑ givenA10000AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[jvm]
com.wire.kalium.util.IntExtTests ‑ givenA1000AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[js, browser]
com.wire.kalium.util.IntExtTests ‑ givenA1000AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[jvm]
com.wire.kalium.util.IntExtTests ‑ givenA100AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[js, browser]
com.wire.kalium.util.IntExtTests ‑ givenA100AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[jvm]
com.wire.kalium.util.IntExtTests ‑ givenA10AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[js, browser]
com.wire.kalium.util.IntExtTests ‑ givenA10AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[jvm]
com.wire.kalium.util.IntExtTests ‑ givenA1AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[js, browser]
com.wire.kalium.util.IntExtTests ‑ givenA1AsDecimal_whenConvertingToByteArray_HexStringIsEqualToTheExpected[jvm]
…

♻️ This comment has been updated with latest results.

Copy link
Contributor Author

github-actions bot commented Aug 5, 2024

🐰Bencher

ReportMon, August 5, 2024 at 09:46:55 UTC
Projectkalium
Branchfix/set-cs-when-replacing-keypackages-cherry-pick-cherry-pick
Testbedubuntu-latest

⚠️ WARNING: The following Measure does not have a Threshold. Without a Threshold, no Alerts will ever be generated!

  • Latency (latency)

Click here to create a new Threshold
For more information, see the Threshold documentation.
To only post results if a Threshold exists, set the --ci-only-thresholds CLI flag.

Click to view all benchmark results
BenchmarkLatencyLatency Results
nanoseconds (ns)
com.wire.kalium.benchmarks.logic.CoreLogicBenchmark.createObjectInFiles➖ (view plot)684,268.02
com.wire.kalium.benchmarks.logic.CoreLogicBenchmark.createObjectInMemory➖ (view plot)407,322,937.01
com.wire.kalium.benchmarks.persistence.MessagesNoPragmaTuneBenchmark.messageInsertionBenchmark➖ (view plot)927,219,095.83
com.wire.kalium.benchmarks.persistence.MessagesNoPragmaTuneBenchmark.queryMessagesBenchmark➖ (view plot)21,281,713.39

Bencher - Continuous Benchmarking
View Public Perf Page
Docs | Repo | Chat | Help

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 71.42857% with 2 lines in your changes missing coverage. Please review.

Project coverage is 52.53%. Comparing base (859dab6) to head (8f126b6).

Files Patch % Lines
...lium/logic/data/keypackage/KeyPackageRepository.kt 0.00% 1 Missing ⚠️
...um/network/api/v5/authenticated/KeyPackageApiV5.kt 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2931      +/-   ##
===========================================
- Coverage    52.54%   52.53%   -0.01%     
===========================================
  Files         1289     1289              
  Lines        49503    49508       +5     
  Branches      4598     4598              
===========================================
+ Hits         26009    26011       +2     
- Misses       21654    21657       +3     
  Partials      1840     1840              
Files Coverage Δ
...gic/data/conversation/MLSConversationRepository.kt 83.89% <100.00%> (+0.06%) ⬆️
...api/base/authenticated/keypackage/KeyPackageApi.kt 100.00% <ø> (ø)
...um/network/api/v0/authenticated/KeyPackageApiV0.kt 7.69% <ø> (ø)
...mmonMain/kotlin/com.wire.kalium.util/int/IntExt.kt 100.00% <100.00%> (ø)
...lium/logic/data/keypackage/KeyPackageRepository.kt 74.46% <0.00%> (ø)
...um/network/api/v5/authenticated/KeyPackageApiV5.kt 51.61% <0.00%> (-1.73%) ⬇️

... and 2 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 859dab6...8f126b6. Read the comment docs.

@datadog-wireapp
Copy link

Datadog Report

Branch report: fix/set-cs-when-replacing-keypackages-cherry-pick-cherry-pick
Commit report: 515b395
Test service: kalium-jvm

✅ 0 Failed, 3044 Passed, 105 Skipped, 13.35s Total Time

@mchenani mchenani added this pull request to the merge queue Aug 5, 2024
Merged via the queue into develop with commit 8d3c74f Aug 5, 2024
22 checks passed
@mchenani mchenani deleted the fix/set-cs-when-replacing-keypackages-cherry-pick-cherry-pick branch August 5, 2024 12:05
@echoes-hq echoes-hq bot added the echoes: unplanned Any work item that isn’t part of the product or technical roadmap. label Aug 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick PR is cherry-picking changes from another banch echoes: unplanned Any work item that isn’t part of the product or technical roadmap. 🚨 Potential breaking changes 👕 size: S type: bug / fix 🐞
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants