This is an automated email from the ASF dual-hosted git repository.
afs pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 571cdb440d GH-4377: Bound wire-string size in RDF Thrift
571cdb440d is described below
commit 571cdb440dba52304db01b17ec40698d18e1535b
Author: Andy Seaborne <[email protected]>
AuthorDate: Mon Nov 2 14:52:06 2026 +0000
GH-4377: Bound wire-string size in RDF Thrift
---
.../apache/jena/riot/system/PrintingStreamRDF.java | 2 +-
.../java/org/apache/jena/riot/thrift/TRDF.java | 22 ++++++++---
.../jena/riot/thrift/TestThriftStreamRDF.java | 44 +++++++++++++++-------
3 files changed, 49 insertions(+), 19 deletions(-)
diff --git
a/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
b/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
index 5b919ecda1..af5f8d262a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/PrintingStreamRDF.java
@@ -72,7 +72,7 @@ public class PrintingStreamRDF extends WriterStreamRDFPlain
*/
public PrintingStreamRDF(OutputStream out, PrefixMap prefixes) {
super(IO.wrapUTF8(out));
- if ( prefixMap != null )
+ if ( prefixes != null )
prefixMap.putAll(prefixes);
}
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
b/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
index 223ed440d0..b7dac60f34 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
@@ -31,6 +31,7 @@ import org.apache.jena.riot.thrift.wire.RDF_ANY;
import org.apache.jena.riot.thrift.wire.RDF_StreamRow;
import org.apache.jena.riot.thrift.wire.RDF_Term;
import org.apache.jena.riot.thrift.wire.RDF_UNDEF;
+import org.apache.thrift.TConfiguration;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TCompactProtocol;
import org.apache.thrift.protocol.TJSONProtocol;
@@ -42,7 +43,17 @@ import org.apache.thrift.transport.TTransport;
/** Support operations for RDF Thrift */
public class TRDF {
private static final int BUFSIZE_IN = 128*1024;
- private static final int BUFSIZE_OUT = 128*1024;;
+ private static final int BUFSIZE_OUT = 128*1024;
+
+ // Default values in TConfiguration : 100Mb, 16Mb, 64
+
+ // Max size of a read unit - an RDF Triple/Quad or result row.
+ private static final int maxMessageSize = 100_000;
+ // Only affects TFramedTransport, which we don't use.
+ private static final int maxFrameSize = 100_000;
+ private static final int recursionLimit = 16;
+
+ private static final TConfiguration thriftConfiguration = new
TConfiguration(maxMessageSize, maxFrameSize, recursionLimit);
public static InputStream ensureBuffered(InputStream input) {
if ( input instanceof BufferedInputStream )
@@ -67,7 +78,7 @@ public class TRDF {
public static TProtocol protocol(InputStream in) {
in = ensureBuffered(in);
try {
- TTransport transport = new TIOStreamTransport(in);
+ TTransport transport = new TIOStreamTransport(thriftConfiguration,
in);
transport.open();
TProtocol protocol = protocol(transport);
return protocol;
@@ -140,11 +151,12 @@ public class TRDF {
} else if ( row.isSetPrefixDecl() ) {
visitor.visit(row.getPrefixDecl());
} else {
- Log.warn(ThriftConvert.class, "visit: Unrecognized: "+row);
+ // Broken input or version mis-alignment.
+ Log.error(ThriftConvert.class, "visit: Unrecognized: "+row);
+ TRDF.exception("Unrecognized: RDF_StreamRow");
}
}
public static void exception(TException ex) { throw new
RiotThriftException(ex); }
-
+ private static void exception(String msg) { throw new
RiotThriftException(msg); }
}
-
diff --git
a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftStreamRDF.java
b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftStreamRDF.java
index 4bcd1ab2a3..86e960a38b 100644
---
a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftStreamRDF.java
+++
b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftStreamRDF.java
@@ -22,6 +22,7 @@
package org.apache.jena.riot.thrift;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -31,8 +32,11 @@ import java.util.Iterator;
import org.junit.jupiter.api.Test;
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
import org.apache.jena.atlas.iterator.Iter;
import org.apache.jena.atlas.lib.StrUtils;
+import org.apache.jena.atlas.logging.LogCtl;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
@@ -48,6 +52,10 @@ import org.apache.jena.sparql.core.Quad;
import org.apache.jena.sparql.graph.GraphFactory;
import org.apache.jena.sparql.sse.SSE;
import org.apache.jena.sparql.util.IsoMatcher;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.apache.thrift.protocol.TProtocol;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestThriftStreamRDF {
@@ -110,7 +118,6 @@ public class TestThriftStreamRDF {
byte[] bytes = out.toByteArray();
ByteArrayInputStream in = new ByteArrayInputStream(bytes);
-
Graph g2 = GraphFactory.createGraphMem();
RDFDataMgr.read(g2, in, Lang.RDFTHRIFT);
boolean b = IsoMatcher.isomorphic(graph, g2);
@@ -162,14 +169,31 @@ public class TestThriftStreamRDF {
termAsObject(dsg1, obj);
}
+ // Fake it.
+ //
bytes.fromhex("2c1c1c180575726e3a7300001c1c180575726e3a7000001c3c1880c2d72f"))
+ // "... 80 c2 d7 2f" is the declared string length of 100,000,000 bytes.
+
+ @Test public void faked_allocation() throws DecoderException {
+ byte[] bytes =
Hex.decodeHex("2c1c1c180575726e3a7300001c1c180575726e3a7000001c3c1880c2d72f");
+ TProtocol protocol = TRDF.protocol(new ByteArrayInputStream(bytes));
+ StreamRDF s = StreamRDFLib.sinkNull();
+ // ERROR ThriftConvert :: visit: Unrecognized: <RDF_StreamRow >
+ // then exception
+ Logger logger = LoggerFactory.getLogger(ThriftConvert.class);
+ LogCtl.withLevel(logger, "FATAL", ()->{
+ assertThrows(RiotThriftException.class, ()->{
+ ThriftRDF.protocolToStream(protocol,s);
+ });
+ });
+ }
+
static void sameTerms(Graph g1, Graph g2) {
assertEquals(g1.size() , g2.size() );
- // ** Java8
- //g1.find(null, null, null).forEachRemaining(t ->
assertTrue(g2.contains(t)));
- Iterator<Triple> iter = g1.find(null, null, null);
- while(iter.hasNext()) {
- Triple t = iter.next();
- g2.contains(t);
+ ExtendedIterator<Triple> iter = g1.find(null, null, null);
+ try {
+ iter.forEach(t -> assertTrue(g2.contains(t)));
+ } finally {
+ iter.close();
}
}
@@ -182,11 +206,5 @@ public class TestThriftStreamRDF {
}
fail("Failed to find "+term);
}
-
- // ** Java8
-// public static <T> Stream<T> stream(Iterator<? extends T> iterator) {
-// int characteristics = Spliterator.ORDERED | Spliterator.IMMUTABLE;
-// return
StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator,
characteristics), false);
-// }
}