8000 fix: make rate_limiter respect multitenancy (backport #24634) by mergify[bot] · Pull Request #24635 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: make rate_limiter respect multitenancy (backport #24634) #24635

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

Merged
merged 2 commits into from
Jan 31, 2024

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Jan 31, 2024

This is an automatic backport of pull request #24634 done by Mergify.
Cherry-pick of a25e68a has failed:

On branch mergify/bp/version-14-hotfix/pr-24634
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit a25e68a763.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/rate_limiter.py
	modified:   frappe/utils/password.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/core/doctype/server_script/test_server_script.py
	both modified:   frappe/core/doctype/user/user.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* fix: make rate_limiter respect multitenancy

* fix: lower rate limit window for password reset

* refactor: Use redis_wrapper

(cherry picked from commit a25e68a)

# Conflicts:
#	frappe/core/doctype/server_script/test_server_script.py
#	frappe/core/doctype/user/user.py
@mergify mergify bot requested a review from a team January 31, 2024 09:18
@mergify mergify bot added the conflicts label Jan 31, 2024
@mergify mergify bot requested review from ankush and removed request for a team January 31, 2024 09:18
@mergify mergify bot assigned ankush Jan 31, 2024
@ankush ankush enabled auto-merge (squash) January 31, 2024 10:23
@ankush ankush merged commit e49a5a0 into version-14-hotfix Jan 31, 2024
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-24634 branch January 31, 2024 10:40
frappe-pr-bot pushed a commit that referenced this pull request Feb 6, 2024
# [14.65.0](v14.64.0...v14.65.0) (2024-02-06)

### Bug Fixes

* Allow int fields to be unique ([#24750](#24750)) ([#24755](#24755)) ([7f19ea2](7f19ea2))
* Check if header/footer html exists before trying to extract ([c1dc4b9](c1dc4b9))
* Custom Script runs twice ([a70de37](a70de37))
* data import table UI fix ([d3d3354](d3d3354))
* do not allow to set if_owner & report perm together ([40a0065](40a0065))
* enable syntax highlighting for `PythonExpression` code fields ([#24669](#24669)) ([#24670](#24670)) ([666040c](666040c))
* Enqueue deletion of dynamic link after comitting ([#24674](#24674)) ([9eb9878](9eb9878))
* Extract header/footer html into `content` to simplify things ([2d11989](2d11989))
* **js:** Handle hidden virtual fields ([#24405](#24405)) ([#24691](#24691)) ([50c18ab](50c18ab))
* Make as_iterator work when there are no child queries ([#24748](#24748)) ([40d5741](40d5741))
* make rate_limiter respect multitenancy (backport [#24634](#24634)) ([#24635](#24635)) ([e49a5a0](e49a5a0))
* Missing `footer_html ` declaration ([d75dfef](d75dfef))
* outgoing email account handlng (backport [#24656](#24656)) ([#24685](#24685)) ([9ba3c9e](9ba3c9e))
* short circuit private files perm check ([b2d105a](b2d105a))
* show folders in Google Drive Picker ([e5f1137](e5f1137)), closes [#23096](#23096)
* Show proper error message for prepared report failure ([#24733](#24733)) ([#24736](#24736)) ([379d893](379d893))
* Skip fulltext indexes during sync ([#24728](#24728)) ([#24732](#24732)) ([1a8e049](1a8e049))
* Translate Letterhead information string ([00c4b77](00c4b77))
* typeerror in onboarding_tours.js ([7cca45f](7cca45f))
* Use `TEXT` type for Webhook URLs to support large URLs (backport [#24761](#24761)) ([#24762](#24762)) ([e5ff86a](e5ff86a))
* virtual fields are never writable ([#24693](#24693)) ([#24695](#24695)) ([22e26f6](22e26f6))

### Features

* Dynamic headers/footers & fix disappearing header ([343ac16](343ac16))
* Include letterhead scripts in print (html) ([5321e5d](5321e5d))

### Performance Improvements

* optional faster perm check for files (backport [#24624](#24624)) ([#24630](#24630)) ([6778fe2](6778fe2))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.65.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0