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: Accepted Media Types settings validation #32478

Merged
merged 8 commits into from
Jun 14, 2024

Conversation

hugocostadev
Copy link
Contributor

@hugocostadev hugocostadev commented May 23, 2024

Proposed changes (including videos or screenshots)

The setting Accepted Media Types in the File Upload menu was not working as expected since an Empty setting or wildcard * value should allow all types of files if they are not in the Blocked settings

Issue(s)

fix #31906
fix #31692

Steps to test or reproduce

  1. Login to rocket chat.
  2. Set "Accepted Media Types" setting in "File Upload" with * or leave it empty
  3. Try sending any file that is not in the Blocked List
  4. The file is not uploaded

Further comments

https://rocketchat.atlassian.net/browse/CONN-214

@hugocostadev hugocostadev requested review from a team as code owners May 23, 2024 13:41
Copy link
Contributor

dionisio-bot bot commented May 23, 2024

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

Copy link

changeset-bot bot commented May 23, 2024

🦋 Changeset detected

Latest commit: b7e8cd5

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

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status 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

Copy link

codecov bot commented May 23, 2024

Codecov Report

Attention: Patch coverage is 93.33333% with 1 line in your changes missing coverage. Please review.

Project coverage is 56.50%. Comparing base (afa560d) to head (b7e8cd5).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32478      +/-   ##
===========================================
+ Coverage    56.43%   56.50%   +0.07%     
===========================================
  Files         2455     2455              
  Lines        54098    54100       +2     
  Branches     11149    11149              
===========================================
+ Hits         30529    30570      +41     
+ Misses       20909    20878      -31     
+ Partials      2660     2652       -8     
Flag Coverage Δ
e2e 56.23% <40.00%> (+0.04%) ⬆️
unit 72.08% <92.85%> (+0.16%) ⬆️

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

Copy link
Contributor

@KevLehman KevLehman left a comment

Choose a reason for hiding this comment

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

This one should have API tests

@hugocostadev
Copy link
Contributor Author

This one should have API tests

I created tests for the function that I changed and that's being used in frontend and backend.
I agree that would be good to have api tests for that endpoint, I can do it, but I have others priorities in the moment. So would take a while

@casalsgh casalsgh requested a review from KevLehman June 5, 2024 11:03
rique223
rique223 previously approved these changes Jun 11, 2024
apps/meteor/app/utils/lib/restrictions.ts Outdated Show resolved Hide resolved
@hugocostadev hugocostadev dismissed stale reviews from KevLehman and matheusbsilva137 June 13, 2024 18:37

out of scope

@hugocostadev hugocostadev added the stat: QA assured Means it has been tested and approved by a company insider label Jun 13, 2024
@hugocostadev hugocostadev added this to the 6.10 milestone Jun 14, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 14, 2024
@kodiakhq kodiakhq bot merged commit 97eaa17 into develop Jun 14, 2024
46 of 49 checks passed
@kodiakhq kodiakhq bot deleted the fix/fileUploadValidation branch June 14, 2024 11:09
gabriellsh added a commit that referenced this pull request Jun 18, 2024
…retention

* 'develop' of github.com:RocketChat/Rocket.Chat:
  fix: Not possible to edit room without proper permission with retention policy enabled (#32547)
  feat: Apps-Engine Deno Runtime update (#31821)
  feat: E2EE room setup header (#32446)
  fix: E2EE thread main message reactivity (#32381)
  chore: Add telemetry to CI so we can get a better understanding of resource usage (#32113)
  fix: Long katex strings breaking overflow in x axis (#32609)
  fix: Force highlighted code language registration (#32507)
  fix: sidebar last message E2EE (#32431)
  chore: remove message column on moderation console (#32432)
  fix: Accepted Media Types settings validation (#32478)
This was referenced Jun 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Media Type Not Accepted Can't upload ovpn file
5 participants