Skip to content

Commit 0d92b10

Browse files
geoandgeoand
committed
Add option for setting max query params
Relates to: quarkusio/quarkus#47431
1 parent 7d5a726 commit 0d92b10

18 files changed

+148
-7
lines changed

‎vertx-core/src/main/generated/io/vertx/core/http/HttpServerOptionsConverter.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, HttpSer
8787
obj.setMaxFormBufferedBytes(((Number)member.getValue()).intValue());
8888
}
8989
break;
90+
case "maxQueryParams":
91+
if (member.getValue() instanceof Number) {
92+
obj.setMaxQueryParams(((Number)member.getValue()).intValue());
93+
}
94+
break;
9095
case "initialSettings":
9196
if (member.getValue() instanceof JsonObject) {
9297
obj.setInitialSettings(new io.vertx.core.http.Http2Settings((io.vertx.core.json.JsonObject)member.getValue()));
@@ -219,6 +224,7 @@ static void toJson(HttpServerOptions obj, java.util.Map<String, Object> json) {
219224
json.put("maxFormAttributeSize", obj.getMaxFormAttributeSize());
220225
json.put("maxFormFields", obj.getMaxFormFields());
221226
json.put("maxFormBufferedBytes", obj.getMaxFormBufferedBytes());
227+
json.put("maxQueryParams", obj.getMaxQueryParams());
222228
if (obj.getInitialSettings() != null) {
223229
json.put("initialSettings", obj.getInitialSettings().toJson());
224230
}

‎vertx-core/src/main/java/io/vertx/core/http/HttpServerConfig.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ private static TcpServerConfig defaultTcpServerConfig() {
6464
private int maxFormAttributeSize;
6565
private int maxFormFields;
6666
private int maxFormBufferedBytes;
67+
private int maxQueryParams;
6768
private boolean handle100ContinueAutomatically;
6869
private boolean strictThreadMode;
6970
private ObservabilityConfig observabilityConfig;
@@ -123,6 +124,7 @@ public HttpServerConfig(HttpServerOptions options) {
123124
this.maxFormAttributeSize = options.getMaxFormAttributeSize();
124125
this.maxFormFields = options.getMaxFormFields();
125126
this.maxFormBufferedBytes = options.getMaxFormBufferedBytes();
127+
this.maxQueryParams = options.getMaxQueryParams();
126128
this.handle100ContinueAutomatically = options.isHandle100ContinueAutomatically();
127129
this.strictThreadMode = options.getStrictThreadMode();
128130
this.observabilityConfig = observabilityConfig;
@@ -142,6 +144,7 @@ public HttpServerConfig() {
142144
this.maxFormAttributeSize = HttpServerOptions.DEFAULT_MAX_FORM_ATTRIBUTE_SIZE;
143145
this.maxFormFields = HttpServerOptions.DEFAULT_MAX_FORM_FIELDS;
144146
this.maxFormBufferedBytes = HttpServerOptions.DEFAULT_MAX_FORM_BUFFERED_SIZE;
147+
this.maxQueryParams = HttpServerOptions.DEFAULT_MAX_QUERY_PARAMS;
145148
this.handle100ContinueAutomatically = HttpServerOptions.DEFAULT_HANDLE_100_CONTINE_AUTOMATICALLY;
146149
this.strictThreadMode = HttpServerOptions.DEFAULT_STRICT_THREAD_MODE_STRICT;
147150
this.observabilityConfig = null;
@@ -164,6 +167,7 @@ public HttpServerConfig(HttpServerConfig other) {
164167
this.maxFormAttributeSize = other.maxFormAttributeSize;
165168
this.maxFormFields = other.maxFormFields;
166169
this.maxFormBufferedBytes = other.maxFormBufferedBytes;
170+
this.maxQueryParams = other.maxQueryParams;
167171
this.handle100ContinueAutomatically = other.handle100ContinueAutomatically;
168172
this.strictThreadMode = other.strictThreadMode;
169173
this.observabilityConfig = other.observabilityConfig != null ? new ObservabilityConfig(other.observabilityConfig) : null;
@@ -405,6 +409,24 @@ public int getMaxFormFields() {
405409
return maxFormFields;
406410
}
407411

412+
/**
413+
* @return Returns the maximum number of query params
414+
*/
415+
public int getMaxQueryParams() {
416+
return maxQueryParams;
417+
}
418+
419+
/**
420+
* Set the maximum number of query params
421+
*
422+
* @param maxQueryParams the new maximum
423+
* @return a reference to this, so the API can be used fluently
424+
*/
425+
public HttpServerConfig setMaxQueryParams(int maxQueryParams) {
426+
this.maxQueryParams = maxQueryParams;
427+
return this;
428+
}
429+
408430
/**
409431
* Set the maximum number of fields of a form. Set to {@code -1} to allow unlimited number of attributes
410432
*

‎vertx-core/src/main/java/io/vertx/core/http/HttpServerOptions.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ public class HttpServerOptions extends NetServerOptions {
101101
*/
102102
public static final int DEFAULT_MAX_FORM_BUFFERED_SIZE = 1024;
103103

104+
/**
105+
* Default max number of query params = 1024
106+
*/
107+
public static final int DEFAULT_MAX_QUERY_PARAMS = 1024;
108+
104109
/**
105110
* Default value of whether 100-Continue should be handled automatically = {@code false}
106111
*/
@@ -214,6 +219,7 @@ public class HttpServerOptions extends NetServerOptions {
214219
private int maxFormAttributeSize;
215220
private int maxFormFields;
216221
private int maxFormBufferedBytes;
222+
private int maxQueryParams;
217223
private Http1ServerConfig http1Config;
218224
private Http2ServerConfig http2Config;
219225
private WebSocketServerConfig webSocketConfig;
@@ -246,6 +252,7 @@ public HttpServerOptions(HttpServerOptions other) {
246252
this.maxFormAttributeSize = other.getMaxFormAttributeSize();
247253
this.maxFormFields = other.getMaxFormFields();
248254
this.maxFormBufferedBytes = other.getMaxFormBufferedBytes();
255+
this.maxQueryParams = other.getMaxQueryParams();
249256
this.compressionLevel = other.getCompressionLevel();
250257
this.compression = other.compression != null ? new CompressionConfig(other.compression) : new CompressionConfig();
251258
this.handle100ContinueAutomatically = other.handle100ContinueAutomatically;
@@ -287,6 +294,7 @@ private void init() {
287294
maxFormAttributeSize = DEFAULT_MAX_FORM_ATTRIBUTE_SIZE;
288295
maxFormFields = DEFAULT_MAX_FORM_FIELDS;
289296
maxFormBufferedBytes = DEFAULT_MAX_FORM_BUFFERED_SIZE;
297+
maxQueryParams = DEFAULT_MAX_QUERY_PARAMS;
290298
strictThreadMode = DEFAULT_STRICT_THREAD_MODE_STRICT;
291299
compression = new CompressionConfig();
292300
handle100ContinueAutomatically = DEFAULT_HANDLE_100_CONTINE_AUTOMATICALLY;
@@ -861,6 +869,24 @@ public HttpServerOptions setMaxFormBufferedBytes(int maxFormBufferedBytes) {
861869
return this;
862870
}
863871

872+
/**
873+
* @return Returns the maximum number of query params
874+
*/
875+
public int getMaxQueryParams() {
876+
return maxQueryParams;
877+
}
878+
879+
/**
880+
* Set the maximum number of query params
881+
*
882+
* @param maxQueryParams the new maximum
883+
* @return a reference to this, so the API can be used fluently
884+
*/
885+
public HttpServerOptions setMaxQueryParams(int maxQueryParams) {
886+
this.maxQueryParams = maxQueryParams;
887+
return this;
888+
}
889+
864890
/**
865891
* @return the initial HTTP/2 connection settings
866892
*/

‎vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerRequestImpl.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public class HttpServerRequestImpl extends HttpServerRequestInternal {
5252
private final int maxFormAttributeSize;
5353
private final int maxFormFields;
5454
private final int maxFormBufferedBytes;
55+
private final int maxQueryParams;
5556
private final Handler<HttpServerRequest> handler;
5657

5758
// Accessed on context thread
@@ -79,6 +80,7 @@ public HttpServerRequestImpl(Handler<HttpServerRequest> handler,
7980
int maxFormAttributeSize,
8081
int maxFormFields,
8182
int maxFormBufferedBytes,
83+
int maxQueryParams,
8284
String serverOrigin) {
8385
this.handler = handler;
8486
this.context = context;
@@ -89,6 +91,7 @@ public HttpServerRequestImpl(Handler<HttpServerRequest> handler,
8991
this.handle100ContinueAutomatically = handle100ContinueAutomatically;
9092
this.maxFormAttributeSize = maxFormAttributeSize;
9193
this.maxFormFields = maxFormFields;
94+
this.maxQueryParams = maxQueryParams;
9295
this.maxFormBufferedBytes = maxFormBufferedBytes;
9396
}
9497

@@ -397,7 +400,7 @@ public String getParamsCharset() {
397400
public MultiMap params(boolean semicolonIsNormalChar) {
398401
synchronized (connection) {
399402
if (params == null || semicolonIsNormalChar != semicolonIsNormalCharInParams) {
400-
params = HttpUtils.params(uri(), paramsCharset, semicolonIsNormalChar);
403+
params = HttpUtils.params(uri(), paramsCharset, maxQueryParams, semicolonIsNormalChar);
401404
semicolonIsNormalCharInParams = semicolonIsNormalChar;
402405
}
403406
return params;

‎vertx-core/src/main/java/io/vertx/core/http/impl/HttpUtils.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,11 @@ public static String absoluteURI(String serverOrigin, HttpServerRequest req) {
344344
}
345345

346346
public static MultiMap params(String uri, Charset charset, boolean semicolonIsNormalChar) {
347-
QueryStringDecoder queryStringDecoder = new QueryStringDecoder(uri, charset, true, 1024, semicolonIsNormalChar);
347+
return params(uri, charset, 1024, semicolonIsNormalChar);
348+
}
349+
350+
public static MultiMap params(String uri, Charset charset, int maxParams, boolean semicolonIsNormalChar) {
351+
QueryStringDecoder queryStringDecoder = new QueryStringDecoder(uri, charset, true, maxParams, semicolonIsNormalChar);
348352
Map<String, List<String>> prms = queryStringDecoder.parameters();
349353
MultiMap params = MultiMap.caseInsensitiveMultiMap();
350354
if (!prms.isEmpty()) {

‎vertx-core/src/main/java/io/vertx/core/http/impl/http1/Http1ServerConnection.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public class Http1ServerConnection extends Http1Connection implements HttpServer
7878
private final boolean eagerCreateRequestQueue;
7979
private final int maxFormAttributeSize;
8080
private final int maxFormFields;
81+
private final int maxQueryParams;
8182
private final int maxFormBufferedBytes;
8283
private final Http1ServerConfig serverConfig;
8384
private final boolean registerWebSocketWriteHandlers;
@@ -104,6 +105,7 @@ public Http1ServerConnection(ThreadingModel threadingModel,
104105
SslContextManager sslContextManager,
105106
int maxFormAttributeSize,
106107
int maxFormFields,
108+
int maxQueryParams,
107109
int maxFormBufferedBytes,
108110
Http1ServerConfig serverConfig,
109111
boolean registerWebSocketWriteHandlers,
@@ -119,6 +121,7 @@ public Http1ServerConnection(ThreadingModel threadingModel,
119121
this.streamContextSupplier = streamContextSupplier;
120122
this.maxFormAttributeSize = maxFormAttributeSize;
121123
this.maxFormFields = maxFormFields;
124+
this.maxQueryParams = maxQueryParams;
122125
this.maxFormBufferedBytes = maxFormBufferedBytes;
123126
this.serverConfig = serverConfig;
124127
this.registerWebSocketWriteHandlers = registerWebSocketWriteHandlers;
@@ -142,6 +145,10 @@ int maxFormFields() {
142145
return maxFormFields;
143146
}
144147

148+
int maxQueryParams() {
149+
return maxQueryParams;
150+
}
151+
145152
int maxFormBufferedBytes() {
146153
return maxFormBufferedBytes;
147154
}

‎vertx-core/src/main/java/io/vertx/core/http/impl/http1/Http1ServerRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ public String getParamsCharset() {
337337
@Override
338338
public MultiMap params(boolean semicolonIsNormalChar) {
339339
if (params == null || semicolonIsNormalChar != semicolonIsNormalCharInParams) {
340-
params = HttpUtils.params(uri(), paramsCharset, semicolonIsNormalChar);
340+
params = HttpUtils.params(uri(), paramsCharset, this.conn.maxQueryParams(), semicolonIsNormalChar);
341341
semicolonIsNormalCharInParams = semicolonIsNormalChar;
342342
}
343343
return params;

‎vertx-core/src/main/java/io/vertx/core/http/impl/quic/QuicHttpServer.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ private static class ConnectionHandler implements Handler<QuicConnection> {
143143
private final boolean handle100ContinueAutomatically;
144144
private final int maxFormAttributeSize;
145145
private final int maxFormFields;
146+
private final int maxQueryParams;
146147
private final int maxFormBufferedSize;
147148
private final Http3Settings localSettings;
148149
private final boolean logEnabled;
@@ -154,6 +155,7 @@ public ConnectionHandler(QuicServer transport,
154155
boolean handle100ContinueAutomatically,
155156
int maxFormAttributeSize,
156157
int maxFormFields,
158+
int maxQueryParams,
157159
int maxFormBufferedSize,
158160
Http3Settings localSettings,
159161
boolean logEnabled) {
@@ -164,6 +166,7 @@ public ConnectionHandler(QuicServer transport,
164166
this.handle100ContinueAutomatically = handle100ContinueAutomatically;
165167
this.maxFormAttributeSize = maxFormAttributeSize;
166168
this.maxFormFields = maxFormFields;
169+
this.maxQueryParams = maxQueryParams;
167170
this.maxFormBufferedSize = maxFormBufferedSize;
168171
this.localSettings = localSettings;
169172
this.logEnabled = logEnabled;
@@ -186,7 +189,7 @@ public void handle(QuicConnection connection) {
186189
http3Connection.streamHandler(stream -> {
187190
HttpServerRequestImpl request = new HttpServerRequestImpl(requestHandler, stream, stream.context(),
188191
handle100ContinueAutomatically, maxFormAttributeSize,
189-
maxFormFields, maxFormBufferedSize, serverOrigin);
192+
maxFormFields, maxFormBufferedSize, maxQueryParams, serverOrigin);
190193
request.init();
191194
});
192195

@@ -239,7 +242,9 @@ public Future<HttpServer> listen(ContextInternal current, SocketAddress address)
239242
quicConfig.setLogConfig(null);
240243

241244
quicServer.handler(new ConnectionHandler(quicServer, httpMetrics, requestHandler, connectionHandler,
242-
config.isHandle100ContinueAutomatically(), config.getMaxFormAttributeSize(), config.getMaxFormFields(), config.getMaxFormBufferedBytes(),
245+
config.isHandle100ContinueAutomatically(), config.getMaxFormAttributeSize(),
246+
config.getMaxFormFields(), config.getMaxQueryParams(),
247+
config.getMaxFormBufferedBytes(),
243248
http3Config.getInitialSettings() != null ? http3Config.getInitialSettings().copy() : new Http3Settings(), logEnabled));
244249
return quicServer
245250
.bind(current, address)

‎vertx-core/src/main/java/io/vertx/core/http/impl/tcp/HttpServerConnectionHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void handle(HttpServerConnection conn) {
101101
HttpServerConfig config = server.config;
102102
HttpServerRequestImpl request = new HttpServerRequestImpl(requestHandler, stream, stream.context(),
103103
config.isHandle100ContinueAutomatically(), config.getMaxFormAttributeSize(), config.getMaxFormFields(),
104-
config.getMaxFormBufferedBytes(), serverOrigin);
104+
config.getMaxFormBufferedBytes(), config.getMaxQueryParams(), serverOrigin);
105105
request.init();
106106
});
107107
}

‎vertx-core/src/main/java/io/vertx/core/http/impl/tcp/HttpServerConnectionInitializer.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ public class HttpServerConnectionInitializer {
6666
private final boolean handle100ContinueAutomatically;
6767
private final int maxFormAttributeSize;
6868
private final int maxFormFields;
69+
private final int maxQueryParams;
6970
private final int maxFormBufferedBytes;
7071
private final Http1ServerConfig http1Config;
7172
private final Http2ServerConfig http2Config;
@@ -91,6 +92,7 @@ public HttpServerConnectionInitializer(ContextInternal context,
9192
boolean handle100ContinueAutomatically,
9293
int maxFormAttributeSize,
9394
int maxFormFields,
95+
int maxQueryParams,
9496
int maxFormBufferedBytes,
9597
Http1ServerConfig http1Config,
9698
Http2ServerConfig http2Config,
@@ -157,6 +159,7 @@ public HttpServerConnectionInitializer(ContextInternal context,
157159
this.handle100ContinueAutomatically = handle100ContinueAutomatically;
158160
this.maxFormAttributeSize = maxFormAttributeSize;
159161
this.maxFormFields = maxFormFields;
162+
this.maxQueryParams = maxQueryParams;
160163
this.maxFormBufferedBytes = maxFormBufferedBytes;
161164
this.http1Config = http1Config;
162165
this.http2Config = http2Config;
@@ -305,6 +308,7 @@ public void configureHttp1Handler(ChannelPipeline pipeline, SslContextManager ss
305308
sslContextManager,
306309
maxFormAttributeSize,
307310
maxFormFields,
311+
maxQueryParams,
308312
maxFormBufferedBytes,
309313
http1Config,
310314
registerWebSocketWriteHandlers,

0 commit comments

Comments
 (0)