Skip to content

uptake read constrained text buffer #357

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

Merged
merged 5 commits into from
Feb 17, 2023
Merged

uptake read constrained text buffer #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8400dcf
uptake read constrained text buffer
pjfanning Feb 14, 2023
5438ee6
add a few tests
pjfanning Feb 16, 2023
1fd4bb5
Ion support moved to its own issue
pjfanning Feb 16, 2023
1bdba23
smile test
pjfanning Feb 16, 2023
11085ea
protobuf test
pjfanning Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions avro/src/test/java/com/fasterxml/jackson/dataformat/avro/RoundtripTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.fasterxml.jackson.core.JsonGenerator;

import com.fasterxml.jackson.core.StreamReadConstraints;
import com.fasterxml.jackson.databind.*;

public class RoundtripTest extends MapTest
Expand Down Expand Up @@ -69,14 +70,8 @@ public void testCharSequences() throws Exception
input.id = "123";
input.name = "John";

byte[] avroData = null;
try {
avroData = writ.writeValueAsBytes(input);
assertNotNull(avroData);
} catch (Exception e) {
e.printStackTrace();
throw e;
}
byte[] avroData = writ.writeValueAsBytes(input);
assertNotNull(avroData);

CharSeqBean output = mapper.reader(CHARSEQ_SCHEMA)
.forType(CharSeqBean.class).readValue(avroData);
Expand All @@ -85,4 +80,29 @@ public void testCharSequences() throws Exception
assertEquals(input.id, output.id);
assertEquals(input.name, output.name);
}

public void testCharSequencesLowStringLimit() throws Exception
{
AvroFactory factory = AvroFactory.builder()
.streamReadConstraints(StreamReadConstraints.builder().maxStringLength(1).build())
.build();
ObjectMapper mapper = new AvroMapper(factory)
.enable(JsonGenerator.Feature.IGNORE_UNKNOWN);
ObjectWriter writ = mapper.writer(CHARSEQ_SCHEMA);

CharSeqBean input = new CharSeqBean();
input.id = "123";
input.name = "John";

byte[] avroData = writ.writeValueAsBytes(input);
assertNotNull(avroData);

try {
mapper.reader(CHARSEQ_SCHEMA)
.forType(CharSeqBean.class).readValue(avroData);
fail("expected IllegalStateException");
} catch (IllegalStateException ise) {
assertEquals("String length (3) exceeds the maximum length (1)", ise.getMessage());
}
}
}
2 changes: 1 addition & 1 deletion cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ public CBORParser(IOContext ctxt, int parserFeatures, int cborFeatures,
_inputPtr = start;
_inputEnd = end;
_bufferRecyclable = bufferRecyclable;
_textBuffer = ctxt.constructTextBuffer();
_textBuffer = ctxt.constructReadConstrainedTextBuffer();
DupDetector dups = JsonParser.Feature.STRICT_DUPLICATE_DETECTION.enabledIn(parserFeatures)
? DupDetector.rootDetector(this) : null;
_streamReadContext = CBORReadContext.createRootContext(dups);
Expand Down
4 changes: 4 additions & 0 deletions cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/CBORTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ protected CBORMapper cborMapper() {
return new CBORMapper(cborFactory());
}

protected CBORMapper cborMapper(CBORFactory cborFactory) {
return new CBORMapper(cborFactory);
}

protected CBORFactory cborFactory() {
return new CBORFactory();
}
Expand Down
25 changes: 25 additions & 0 deletions cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/seq/ReadTreesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import java.util.List;

import com.fasterxml.jackson.core.StreamReadConstraints;
import com.fasterxml.jackson.databind.*;

import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
import com.fasterxml.jackson.dataformat.cbor.CBORTestBase;

public class ReadTreesTest extends CBORTestBase
Expand Down Expand Up @@ -62,4 +64,27 @@ public void testReadTreeSequence() throws Exception
/* not differ)
/**********************************************************
*/

public void testReadTreeSequenceLowStringLimit() throws Exception
{
final byte[] INPUT = concat(
cborDoc(a2q("{\"id\":1, \"value\":137 }")),
cborDoc(a2q("{\"id\":2, \"value\":256 }\n")),
cborDoc(a2q("{\"id\":3, \"value\":-89 }"))
);

CBORFactory cborFactory = cborFactoryBuilder()
.streamReadConstraints(StreamReadConstraints.builder().maxStringLength(1).build())
.build();
try (MappingIterator<JsonNode> it = cborMapper(cborFactory).readerFor(JsonNode.class)
.readValues(INPUT)) {
assertTrue(it.hasNextValue());
try {
it.nextValue();
fail("expected IllegalStateException");
} catch (IllegalStateException ise) {
assertEquals("String length (2) exceeds the maximum length (1)", ise.getMessage());
}
}
}
}
2 changes: 1 addition & 1 deletion protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public ProtobufParser(IOContext ctxt, int parserFeatures,
_inputPtr = start;
_inputEnd = end;
_bufferRecyclable = bufferRecyclable;
_textBuffer = ctxt.constructTextBuffer();
_textBuffer = ctxt.constructReadConstrainedTextBuffer();
_parsingContext = ProtobufReadContext.createRootContext();

_tokenInputRow = -1;
Expand Down
26 changes: 26 additions & 0 deletions protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/ReadSimpleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.StreamReadConstraints;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
Expand Down Expand Up @@ -357,4 +359,28 @@ public void testSkipUnknown() throws Exception
assertEquals(input.x, result.x);
assertEquals(input.y, result.y);
}

public void testStringArraySimpleLowLimit() throws Exception
{
ProtobufSchema schema = ProtobufSchemaLoader.std.parse(PROTOC_STRINGS);
ProtobufFactory protobufFactory = ProtobufFactory.builder()
.streamReadConstraints(StreamReadConstraints.builder().maxStringLength(1).build())
.build();
ProtobufMapper protobufMapper = ProtobufMapper.builder(protobufFactory).build();
final ObjectWriter w = protobufMapper.writerFor(Strings.class)
.with(schema);
Strings input = new Strings("Dogs", "like", "Baco\u00F1");
byte[] bytes = w.writeValueAsBytes(input);
assertNotNull(bytes);
assertEquals(20, bytes.length);

try {
protobufMapper.readerFor(Strings.class).with(schema).readValue(bytes);
fail("Expected JsonMappingException");
} catch (JsonMappingException jme) {
String message = jme.getMessage();
assertTrue("unexpected message: " + message,
message.startsWith("String length (4) exceeds the maximum length (1)"));
}
}
}
2 changes: 1 addition & 1 deletion smile/src/main/java/com/fasterxml/jackson/dataformat/smile/SmileParserBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public SmileParserBase(IOContext ctxt, int parserFeatures, int formatFeatures,
? DupDetector.rootDetector(this) : null;
_streamReadContext = JsonReadContext.createRootContext(dups);

_textBuffer = ctxt.constructTextBuffer();
_textBuffer = ctxt.constructReadConstrainedTextBuffer();
_smileBufferRecycler = _smileBufferRecycler();
}

Expand Down
31 changes: 31 additions & 0 deletions smile/src/test/java/com/fasterxml/jackson/dataformat/smile/async/SimpleStringArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.core.StreamReadConstraints;
import com.fasterxml.jackson.dataformat.smile.SmileFactory;
import com.fasterxml.jackson.dataformat.smile.SmileGenerator;
import com.fasterxml.jackson.dataformat.smile.SmileParser;
Expand Down Expand Up @@ -109,6 +110,36 @@ public void testLongAsciiStrings() throws IOException
_testStrings(f, input, data, 1, 1);
}

public void testLongAsciiStringsLowStringLimit() throws IOException
{
final String[] input = new String[] {
// ~100 chars for long(er) content
String.format("%s %s %s %s %s %s %s %s %s %s %s %s",
str0to9,str0to9,"...",str0to9,"/", str0to9,
str0to9,"",str0to9,str0to9,"...",str0to9),
LONG_ASCII
};
SmileFactory f = SmileFactory.builder()
.streamReadConstraints(StreamReadConstraints.builder().maxStringLength(10).build())
.enable(SmileParser.Feature.REQUIRE_HEADER)
.enable(SmileGenerator.Feature.CHECK_SHARED_NAMES)
.enable(SmileGenerator.Feature.CHECK_SHARED_STRING_VALUES)
.build();
byte[] data = _stringDoc(f, input);

AsyncReaderWrapper r = asyncForBytes(f, 1, data, 0);
// start with "no token"
assertNull(r.currentToken());
assertToken(JsonToken.START_ARRAY, r.nextToken());
assertToken(JsonToken.VALUE_STRING, r.nextToken());
try {
r.currentText();
fail("expected IllegalStateException");
} catch (IllegalStateException ise) {
assertEquals("String length (98) exceeds the maximum length (10)", ise.getMessage());
}
}

public void testLongUnicodeStrings() throws IOException
{
// ~100 chars for long(er) content
Expand Down