Skip to content

fix: imported fixes 06-11-26 - #40889

Merged
julio-rocketchat merged 4 commits into
developfrom
imported-fixes-06-11-26
Jun 11, 2026
Merged

fix: imported fixes 06-11-26#40889
julio-rocketchat merged 4 commits into
developfrom
imported-fixes-06-11-26

Conversation

@julio-rocketchat

@julio-rocketchat julio-rocketchat commented Jun 11, 2026

Copy link
Copy Markdown
Member

Proposed changes (including videos or screenshots)

All approvals have already been given in the private fork.

Issue(s)

VLN-297, VLN-386, VLN-406, VLN-400

Steps to test or reproduce

N/A

Further comments

@coderabbitai ignore

@julio-rocketchat
julio-rocketchat requested a review from a team as a code owner June 11, 2026 11:44
@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@changeset-bot

changeset-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 38d54ab

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 3 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3 issues found across 16 files

Reply with feedback, questions, or to request a fix.

Re-trigger cubic

Comment thread apps/meteor/server/lib/rooms/roomTypes/livechat.ts
Comment thread apps/meteor/app/apple/lib/handleIdentityToken.spec.ts
Comment thread apps/meteor/app/apple/lib/handleIdentityToken.spec.ts
@codecov

codecov Bot commented Jun 11, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 88.11189% with 34 lines in your changes missing coverage. Please review.
✅ Project coverage is 70.05%. Comparing base (6bd9182) to head (38d54ab).
⚠️ Report is 2 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #40889      +/-   ##
===========================================
+ Coverage    69.94%   70.05%   +0.11%     
===========================================
  Files         3353     3355       +2     
  Lines       128812   129162     +350     
  Branches     22274    22343      +69     
===========================================
+ Hits         90092    90488     +396     
+ Misses       35431    35381      -50     
- Partials      3289     3293       +4     
Flag Coverage Δ
e2e 59.24% <ø> (+0.02%) ⬆️
e2e-api 46.21% <5.55%> (-0.03%) ⬇️
unit 69.99% <89.64%> (+0.16%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@hacktron-app hacktron-app Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1 issue found across 1 file

Severity Count
CRITICAL 1

View full scan results

Comment thread apps/meteor/app/file-upload/server/lib/FileUpload.ts
@julio-rocketchat julio-rocketchat added this to the 8.6.0 milestone Jun 11, 2026
@rc-layne

rc-layne Bot commented Jun 11, 2026

Copy link
Copy Markdown

Warning

These are security findings reported by the security scanners configured in Layne. Findings may contain false positives - review them and fix what makes sense.

Layne found 1 high issue in this PR.

View 1 finding(s)
Severity Scanner File Rule Description
🟠 High semgrep apps/meteor/app/apple/lib/handleIdentityToken.ts:42 app.config.semgrep.rules.rocketchat.ssrf-validation-bypass-without-justification SSRF validation is disabled. Ensure the URL is not user-controlled or is restricted to a known-safe allowlist.

@julio-rocketchat

Copy link
Copy Markdown
Member Author

/layne exception-approve LAYNE-2ddd92cdd5a7448f reason: hardcoded URL

@rc-layne

rc-layne Bot commented Jun 11, 2026

Copy link
Copy Markdown

✅ Exception recorded for LAYNE-2ddd92cdd5a7448f by @julio-rocketchat: "hardcoded URL". Re-running scan...

@julio-rocketchat julio-rocketchat added the stat: QA assured Means it has been tested and approved by a company insider label Jun 11, 2026
@dionisio-bot dionisio-bot Bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 11, 2026
@julio-rocketchat
julio-rocketchat merged commit 1a9ced9 into develop Jun 11, 2026
48 checks passed
@julio-rocketchat
julio-rocketchat deleted the imported-fixes-06-11-26 branch June 11, 2026 14:17
@julio-rocketchat

Copy link
Copy Markdown
Member Author

/patch

dionisio-bot Bot pushed a commit that referenced this pull request Jun 11, 2026
Co-authored-by: Matheus Cardoso <matheus@cardo.so>
@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Pull request #40891 added to Project: "Patch 8.5.1"

@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 8.4.4

dionisio-bot Bot pushed a commit that referenced this pull request Jun 11, 2026
Co-authored-by: Matheus Cardoso <matheus@cardo.so>
@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Pull request #40892 added to Project: "Patch 8.4.4"

@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 8.3.6

@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-8.3.6-40889
git cherry-pick 1a9ced99bc8985699700f128257cd632bcc13706
// solve the conflict
git push

after that just run /backport 8.3.6 again

julio-rocketchat added a commit that referenced this pull request Jun 11, 2026
Co-authored-by: Matheus Cardoso <matheus@cardo.so>
julio-rocketchat added a commit that referenced this pull request Jun 11, 2026
Co-authored-by: Matheus Cardoso <matheus@cardo.so>
@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 8.2.6

@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Pull request #40895 added to Project: "Patch 8.2.6"

@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 8.1.6

@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-8.1.6-40889
git cherry-pick 1a9ced99bc8985699700f128257cd632bcc13706
// solve the conflict
git push

after that just run /backport 8.1.6 again

julio-rocketchat added a commit that referenced this pull request Jun 11, 2026
Co-authored-by: Matheus Cardoso <matheus@cardo.so>
@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 8.1.6

@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Pull request #40896 added to Project: "Patch 8.1.6"

@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 8.0.7

@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-8.0.7-40889
git cherry-pick 1a9ced99bc8985699700f128257cd632bcc13706
// solve the conflict
git push

after that just run /backport 8.0.7 again

julio-rocketchat added a commit that referenced this pull request Jun 11, 2026
Co-authored-by: Matheus Cardoso <matheus@cardo.so>
@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 8.0.7

@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Pull request #40897 added to Project: "Patch 8.0.7"

@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 7.13.9

@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-7.13.9-40889
git cherry-pick 1a9ced99bc8985699700f128257cd632bcc13706
// solve the conflict
git push

after that just run /backport 7.13.9 again

julio-rocketchat added a commit that referenced this pull request Jun 11, 2026
Co-authored-by: Matheus Cardoso <matheus@cardo.so>
@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 7.13.9

@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Pull request #40898 added to Project: "Patch 7.13.9"

@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 7.10.13

@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-7.10.13-40889
git cherry-pick 1a9ced99bc8985699700f128257cd632bcc13706
// solve the conflict
git push

after that just run /backport 7.10.13 again

julio-rocketchat added a commit that referenced this pull request Jun 11, 2026
Co-authored-by: Matheus Cardoso <matheus@cardo.so>
@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 7.10.13

1 similar comment
@julio-rocketchat

Copy link
Copy Markdown
Member Author

/backport 7.10.13

@dionisio-bot

dionisio-bot Bot commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Pull request #40899 added to Project: "Patch 7.10.13"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-security-review stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants