- Notifications
You must be signed in to change notification settings - Fork 25.5k
Add a size limit to outputs from mustache #114002
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
Changes from all commits
Commits
Show all changes
11 commits Select commit Hold shift + click to select a range
1ccee3f
Add a size limit to outputs from mustache
thecoop 7205dfc
Change size limit to 1MB default
thecoop 540b816
Merge branch 'main' into mustache-ooms
thecoop db3c1fe
Update docs/changelog/114002.yaml
thecoop 67ad56a
Exception can appear in different places in the stack
thecoop e0932e7
splotless
thecoop 3472240
Use underscores
thecoop 1764d2a
Update changelog
thecoop 125c22a
Missed one
thecoop 0b86c7a
Merge remote-tracking branch 'upstream/main' into mustache-ooms
thecoop facefa0
Add test
thecoop File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
pr: 114002 | ||
summary: Add a `mustache.max_output_size_bytes` setting to limit the length of results from mustache scripts | ||
area: Infra/Scripting | ||
type: enhancement | ||
issues: [] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions 69 server/src/main/java/org/elasticsearch/common/text/SizeLimitingStringWriter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the "Elastic License | ||
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
* Public License v 1"; you may not use this file except in compliance with, at | ||
* your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
* License v3.0 only", or the "Server Side Public License, v 1". | ||
*/ | ||
| ||
package org.elasticsearch.common.text; | ||
| ||
import org.elasticsearch.common.Strings; | ||
| ||
import java.io.StringWriter; | ||
| ||
/** | ||
* A {@link StringWriter} that throws an exception if the string exceeds a specified size. | ||
*/ | ||
public class SizeLimitingStringWriter extends StringWriter { | ||
| ||
public static class SizeLimitExceededException extends IllegalStateException { | ||
public SizeLimitExceededException(String message) { | ||
super(message); | ||
} | ||
} | ||
| ||
private final int sizeLimit; | ||
| ||
public SizeLimitingStringWriter(int sizeLimit) { | ||
this.sizeLimit = sizeLimit; | ||
} | ||
| ||
private void checkSizeLimit(int additionalChars) { | ||
int bufLen = getBuffer().length(); | ||
if (bufLen + additionalChars > sizeLimit) { | ||
throw new SizeLimitExceededException( | ||
Strings.format("String [%s...] has exceeded the size limit [%s]", getBuffer().substring(0, Math.min(bufLen, 20)), sizeLimit) | ||
); | ||
} | ||
} | ||
| ||
@Override | ||
public void write(int c) { | ||
checkSizeLimit(1); | ||
super.write(c); | ||
} | ||
| ||
// write(char[]) delegates to write(char[], int, int) | ||
| ||
@Override | ||
public void write(char[] cbuf, int off, int len) { | ||
checkSizeLimit(len); | ||
super.write(cbuf, off, len); | ||
} | ||
| ||
@Override | ||
public void write(String str) { | ||
checkSizeLimit(str.length()); | ||
super.write(str); | ||
} | ||
| ||
@Override | ||
public void write(String str, int off, int len) { | ||
checkSizeLimit(len); | ||
super.write(str, off, len); | ||
} | ||
| ||
// append(...) delegates to write(...) methods | ||
} |
29 changes: 29 additions & 0 deletions 29 server/src/test/java/org/elasticsearch/common/text/SizeLimitingStringWriterTests.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the "Elastic License | ||
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
* Public License v 1"; you may not use this file except in compliance with, at | ||
* your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
* License v3.0 only", or the "Server Side Public License, v 1". | ||
*/ | ||
| ||
package org.elasticsearch.common.text; | ||
| ||
import org.elasticsearch.test.ESTestCase; | ||
| ||
public class SizeLimitingStringWriterTests extends ESTestCase { | ||
public void testSizeIsLimited() { | ||
SizeLimitingStringWriter writer = new SizeLimitingStringWriter(10); | ||
| ||
writer.write("a".repeat(10)); | ||
| ||
// test all the methods | ||
expectThrows(SizeLimitingStringWriter.SizeLimitExceededException.class, () -> writer.write('a')); | ||
expectThrows(SizeLimitingStringWriter.SizeLimitExceededException.class, () -> writer.write("a")); | ||
expectThrows(SizeLimitingStringWriter.SizeLimitExceededException.class, () -> writer.write(new char[1])); | ||
expectThrows(SizeLimitingStringWriter.SizeLimitExceededException.class, () -> writer.write(new char[1], 0, 1)); | ||
expectThrows(SizeLimitingStringWriter.SizeLimitExceededException.class, () -> writer.append('a')); | ||
expectThrows(SizeLimitingStringWriter.SizeLimitExceededException.class, () -> writer.append("a")); | ||
expectThrows(SizeLimitingStringWriter.SizeLimitExceededException.class, () -> writer.append("a", 0, 1)); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.