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.

Sign up for GitHub

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

Jump to bottom

Add a size limit to outputs from mustache #114002

Merged
merged 11 commits into from
Oct 8, 2024
Merged

Add a size limit to outputs from mustache #114002

merged 11 commits into from
Oct 8, 2024

Conversation

thecoop
Copy link
Member

@thecoop thecoop commented Oct 3, 2024

This limits the size of strings that could be created from mustache templates

@thecoop thecoop added >non-issue WIP :Core/Infra/Scripting Scripting abstractions, Painless, and Mustache labels Oct 3, 2024
@thecoop thecoop requested a review from a team as a code owner October 3, 2024 09:46
rjernst
rjernst reviewed Oct 3, 2024
View reviewed changes
Copy link
Member

@rjernst rjernst left a comment

Choose a reason for hiding this comment

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

Looks fine, but I think we should be much more restrictive in the size.

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MustacheScriptEngine.java Outdated Show resolved Hide resolved
server/src/main/java/org/elasticsearch/common/text/SizeLimitingStringWriter.java Outdated Show resolved Hide resolved
@thecoop thecoop added the v8.16.0 label Oct 4, 2024
@thecoop
Change size limit to 1MB default
7205dfc 
Add a setting to configure size limit
Add a test
@thecoop thecoop requested a review from a team as a code owner October 4, 2024 11:11
@thecoop thecoop removed the WIP label Oct 4, 2024
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

@elasticsearchmachine elasticsearchmachine added the Team:Core/Infra Meta label for core/infra team label Oct 4, 2024
@thecoop thecoop requested a review from a team October 4, 2024 11:48
@elasticsearchmachine
Copy link
Collaborator

Hi @thecoop, I've created a changelog YAML for you.

@thecoop thecoop requested a review from rjernst October 4, 2024 13:37
@thecoop thecoop requested review from rjernst and a team October 7, 2024 13:51
ldematte
ldematte approved these changes Oct 8, 2024
View reviewed changes
Copy link
Contributor

@ldematte ldematte left a comment

Choose a reason for hiding this comment

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

IDK if you want to have Ryan final opinion, but I see his concerns were addressed and looks good to me too.

@thecoop thecoop added the auto-backport Automatically create backport pull requests when merged label Oct 8, 2024
@thecoop
Copy link
Member Author

thecoop commented Oct 8, 2024

@elasticmachine rerun elasticsearch-ci/part-1

@thecoop
Copy link
Member Author

thecoop commented Oct 8, 2024

Test failures are #114296

@thecoop thecoop merged commit cbde7f4 into elastic:main Oct 8, 2024
14 of 16 checks passed
@thecoop thecoop deleted the mustache-ooms branch October 8, 2024 10:42
@thecoop thecoop mentioned this pull request Oct 8, 2024
Merged
thecoop added a commit to thecoop/elasticsearch that referenced this pull request Oct 8, 2024
@thecoop
Add a size limit to outputs from mustache (elastic#114002)
c645ab1
@elasticsearchmachine
Copy link
Collaborator

💚 Backport successful

Status Branch Result
✅ 8.x

thecoop added a commit that referenced this pull request Oct 8, 2024
@thecoop
Add a size limit to outputs from mustache (#114002) (#114297)
c1115d2 
Backport #114002 to 8.16
matthewabbott pushed a commit to matthewabbott/elasticsearch that referenced this pull request Oct 10, 2024
@thecoop @matthewabbott
Add a size limit to outputs from mustache (elastic#114002)
f2b903c
davidkyle pushed a commit to davidkyle/elasticsearch that referenced this pull request Oct 13, 2024
@thecoop @davidkyle
Add a size limit to outputs from mustache (elastic#114002)
abfe2aa
thecoop added a commit to thecoop/elasticsearch that referenced this pull request Oct 14, 2024
@thecoop
Backport elastic#114002 to 7.17
680dad3
@thecoop thecoop mentioned this pull request Oct 14, 2024
Merged
thecoop added a commit that referenced this pull request Oct 14, 2024
@thecoop
[7.17] Add a size limit to outputs from mustache (#114002) (#114705)
f9b6b57 
Backport #114002 to 7.17
rjernst added a commit to rjernst/elasticsearch that referenced this pull request Dec 26, 2024
@rjernst
Register mustache size limit setting
82bbe58 
In elastic#114002 the maximum size of a mustache script output was made
configurable. However, the setting was not registered. This commit
registers the setting so that it can be set in elasticsearch.yml.
@rjernst rjernst mentioned this pull request Dec 26, 2024
Merged
rjernst added a commit that referenced this pull request Dec 26, 2024
@rjernst
Register mustache size limit setting (#119291)
291edab 
In #114002 the maximum size of a mustache script output was made
configurable. However, the setting was not registered. This commit
registers the setting so that it can be set in elasticsearch.yml.
rjernst added a commit to rjernst/elasticsearch that referenced this pull request Dec 26, 2024
@rjernst
Register mustache size limit setting (elastic#119291)
45bbdd0 
In elastic#114002 the maximum size of a mustache script output was made
configurable. However, the setting was not registered. This commit
registers the setting so that it can be set in elasticsearch.yml.
rjernst added a commit to rjernst/elasticsearch that referenced this pull request Dec 26, 2024
@rjernst
Register mustache size limit setting (elastic#119291)
3707647 
In elastic#114002 the maximum size of a mustache script output was made
configurable. However, the setting was not registered. This commit
registers the setting so that it can be set in elasticsearch.yml.
elasticsearchmachine pushed a commit that referenced this pull request Dec 26, 2024
@rjernst
Register mustache size limit setting (#119291) (#119293)
68d4fa8 
In #114002 the maximum size of a mustache script output was made
configurable. However, the setting was not registered. This commit
registers the setting so that it can be set in elasticsearch.yml.
elasticsearchmachine pushed a commit that referenced this pull request Dec 27, 2024
@rjernst
[7.17] Register mustache size limit setting (#119291) (#119294)
1724fab 
* Register mustache size limit setting (#119291)

In #114002 the maximum size of a mustache script output was made
configurable. However, the setting was not registered. This commit
registers the setting so that it can be set in elasticsearch.yml.

* fix compile

* fix compile

* fix test compile

* fix license header
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ldematte ldematte ldematte approved these changes

@rjernst rjernst Awaiting requested review from rjernst

Assignees
No one assigned
Labels
auto-backport Automatically create backport pull requests when merged :Core/Infra/Scripting Scripting abstractions, Painless, and Mustache >enhancement Team:Core/Infra Meta label for core/infra team v8.16.0 v9.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@thecoop @elasticsearchmachine @rjernst @ldematte