Merge commit from fork

Add configurable resource limits to prevent potential DoS vectors
via connection/stream exhaustion on gRPC, HTTPS, and HTTPS/3 servers.

New configuration plugins:
- grpc_server: configure max_streams, max_connections
- https: configure max_connections
- https3: configure max_streams

Changes:
- Use netutil.LimitListener for connection limiting
- Use gRPC MaxConcurrentStreams and message size limits
- Add QUIC MaxIncomingStreams for HTTPS/3 stream limiting
- Set secure defaults: 256 max streams, 200 max connections
- Setting any limit to 0 means unbounded/fallback to previous impl

Defaults are applied automatically when plugins are omitted from
config.

Includes tests and integration tests.

Signed-off-by: Ville Vesilehto <ville@vesilehto.fi>
This commit is contained in:
Ville Vesilehto
2025-12-18 05:08:59 +02:00
committed by GitHub
parent 0fb05f225c
commit 0d8cbb1a6b
24 changed files with 1689 additions and 24 deletions

47
plugin/https3/README.md Normal file
View File

@@ -0,0 +1,47 @@
# https3
## Name
*https3* - configures DNS-over-HTTPS/3 (DoH3) server options.
## Description
The *https3* plugin allows you to configure parameters for the DNS-over-HTTPS/3 (DoH3) server to fine-tune the security posture and performance of the server. HTTPS/3 uses QUIC as the underlying transport.
This plugin can only be used once per HTTPS3 listener block.
## Syntax
```txt
https3 {
max_streams POSITIVE_INTEGER
}
```
* `max_streams` limits the number of concurrent QUIC streams per connection. This helps prevent unbounded streams on a single connection, exhausting server resources. The default value is 256 if not specified. Set to 0 to use underlying QUIC transport default.
## Examples
Set custom limits for maximum streams:
```
https3://.:443 {
tls cert.pem key.pem
https3 {
max_streams 50
}
whoami
}
```
Set values to 0 for QUIC transport default, matching CoreDNS behaviour before v1.14.0:
```
https3://.:443 {
tls cert.pem key.pem
https3 {
max_streams 0
}
whoami
}
```

63
plugin/https3/setup.go Normal file
View File

@@ -0,0 +1,63 @@
package https3
import (
"strconv"
"github.com/coredns/caddy"
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/plugin"
)
func init() {
caddy.RegisterPlugin("https3", caddy.Plugin{
ServerType: "dns",
Action: setup,
})
}
func setup(c *caddy.Controller) error {
err := parseDOH3(c)
if err != nil {
return plugin.Error("https3", err)
}
return nil
}
func parseDOH3(c *caddy.Controller) error {
config := dnsserver.GetConfig(c)
// Skip the "https3" directive itself
c.Next()
// Get any arguments on the "https3" line
args := c.RemainingArgs()
if len(args) > 0 {
return c.ArgErr()
}
// Process all nested directives in the block
for c.NextBlock() {
switch c.Val() {
case "max_streams":
args := c.RemainingArgs()
if len(args) != 1 {
return c.ArgErr()
}
val, err := strconv.Atoi(args[0])
if err != nil {
return c.Errf("invalid max_streams value '%s': %v", args[0], err)
}
if val < 0 {
return c.Errf("max_streams must be a non-negative integer: %d", val)
}
if config.MaxHTTPS3Streams != nil {
return c.Err("max_streams already defined for this server block")
}
config.MaxHTTPS3Streams = &val
default:
return c.Errf("unknown property '%s'", c.Val())
}
}
return nil
}

144
plugin/https3/setup_test.go Normal file
View File

@@ -0,0 +1,144 @@
package https3
import (
"fmt"
"strings"
"testing"
"github.com/coredns/caddy"
"github.com/coredns/coredns/core/dnsserver"
)
func TestSetup(t *testing.T) {
tests := []struct {
input string
shouldErr bool
expectedErrContent string
expectedMaxStreams *int
}{
// Valid configurations
{
input: `https3`,
shouldErr: false,
},
{
input: `https3 {
}`,
shouldErr: false,
},
{
input: `https3 {
max_streams 100
}`,
shouldErr: false,
expectedMaxStreams: intPtr(100),
},
// Zero values (unbounded)
{
input: `https3 {
max_streams 0
}`,
shouldErr: false,
expectedMaxStreams: intPtr(0),
},
// Error cases
{
input: `https3 {
max_streams
}`,
shouldErr: true,
expectedErrContent: "Wrong argument count",
},
{
input: `https3 {
max_streams abc
}`,
shouldErr: true,
expectedErrContent: "invalid max_streams value",
},
{
input: `https3 {
max_streams -1
}`,
shouldErr: true,
expectedErrContent: "must be a non-negative integer",
},
{
input: `https3 {
max_streams 100
max_streams 200
}`,
shouldErr: true,
expectedErrContent: "already defined",
},
{
input: `https3 {
unknown_option 123
}`,
shouldErr: true,
expectedErrContent: "unknown property",
},
{
input: `https3 extra_arg`,
shouldErr: true,
expectedErrContent: "Wrong argument count",
},
}
for i, test := range tests {
c := caddy.NewTestController("dns", test.input)
err := setup(c)
if test.shouldErr && err == nil {
t.Errorf("Test %d (%s): Expected error but got none", i, test.input)
continue
}
if !test.shouldErr && err != nil {
t.Errorf("Test %d (%s): Expected no error but got: %v", i, test.input, err)
continue
}
if test.shouldErr && test.expectedErrContent != "" {
if !strings.Contains(err.Error(), test.expectedErrContent) {
t.Errorf("Test %d (%s): Expected error containing '%s' but got: %v",
i, test.input, test.expectedErrContent, err)
}
continue
}
if !test.shouldErr {
config := dnsserver.GetConfig(c)
assertIntPtrValue(t, i, test.input, "MaxHTTPS3Streams", config.MaxHTTPS3Streams, test.expectedMaxStreams)
}
}
}
func intPtr(v int) *int {
return &v
}
func assertIntPtrValue(t *testing.T, testIndex int, testInput, fieldName string, actual, expected *int) {
t.Helper()
if actual == nil && expected == nil {
return
}
if (actual == nil) != (expected == nil) {
t.Errorf("Test %d (%s): Expected %s to be %v, but got %v",
testIndex, testInput, fieldName, formatNilableInt(expected), formatNilableInt(actual))
return
}
if *actual != *expected {
t.Errorf("Test %d (%s): Expected %s to be %d, but got %d",
testIndex, testInput, fieldName, *expected, *actual)
}
}
func formatNilableInt(v *int) string {
if v == nil {
return "nil"
}
return fmt.Sprintf("%d", *v)
}