OPA filters: Reduce default buffer size for reading the requests' body (

#3257)

* OPA filters: Reduce default buffer size for reading the requests' body and expose it via command line and config

Signed-off-by: Magnus Jungsbluth <[email protected]>

config/config.go

@@ -284,13 +284,14 @@ type Config struct {
 	LuaModules *listFlag `yaml:"lua-modules"`
 	LuaSources *listFlag `yaml:"lua-sources"`
 
-	EnableOpenPolicyAgent               bool          `yaml:"enable-open-policy-agent"`
-	OpenPolicyAgentConfigTemplate       string        `yaml:"open-policy-agent-config-template"`
-	OpenPolicyAgentEnvoyMetadata        string        `yaml:"open-policy-agent-envoy-metadata"`
-	OpenPolicyAgentCleanerInterval      time.Duration `yaml:"open-policy-agent-cleaner-interval"`
-	OpenPolicyAgentStartupTimeout       time.Duration `yaml:"open-policy-agent-startup-timeout"`
-	OpenPolicyAgentMaxRequestBodySize   int64         `yaml:"open-policy-agent-max-request-body-size"`
-	OpenPolicyAgentMaxMemoryBodyParsing int64         `yaml:"open-policy-agent-max-memory-body-parsing"`
+	EnableOpenPolicyAgent                bool          `yaml:"enable-open-policy-agent"`
+	OpenPolicyAgentConfigTemplate        string        `yaml:"open-policy-agent-config-template"`
+	OpenPolicyAgentEnvoyMetadata         string        `yaml:"open-policy-agent-envoy-metadata"`
+	OpenPolicyAgentCleanerInterval       time.Duration `yaml:"open-policy-agent-cleaner-interval"`
+	OpenPolicyAgentStartupTimeout        time.Duration `yaml:"open-policy-agent-startup-timeout"`
+	OpenPolicyAgentRequestBodyBufferSize int64         `yaml:"open-policy-agent-request-body-buffer-size"`
+	OpenPolicyAgentMaxRequestBodySize    int64         `yaml:"open-policy-agent-max-request-body-size"`
+	OpenPolicyAgentMaxMemoryBodyParsing  int64         `yaml:"open-policy-agent-max-memory-body-parsing"`
 
 	PassiveHealthCheck mapFlags `yaml:"passive-health-check"`
 }
@@ -513,6 +514,7 @@ func NewConfig() *Config {
 	flag.DurationVar(&cfg.OpenPolicyAgentCleanerInterval, "open-policy-agent-cleaner-interval", openpolicyagent.DefaultCleanIdlePeriod, "Duration in seconds to wait before cleaning up unused opa instances")
 	flag.DurationVar(&cfg.OpenPolicyAgentStartupTimeout, "open-policy-agent-startup-timeout", openpolicyagent.DefaultOpaStartupTimeout, "Maximum duration in seconds to wait for the open policy agent to start up")
 	flag.Int64Var(&cfg.OpenPolicyAgentMaxRequestBodySize, "open-policy-agent-max-request-body-size", openpolicyagent.DefaultMaxRequestBodySize, "Maximum number of bytes from a http request body that are passed as input to the policy")
+	flag.Int64Var(&cfg.OpenPolicyAgentRequestBodyBufferSize, "open-policy-agent-request-body-buffer-size", openpolicyagent.DefaultRequestBodyBufferSize, "Read buffer size for the request body")
 	flag.Int64Var(&cfg.OpenPolicyAgentMaxMemoryBodyParsing, "open-policy-agent-max-memory-body-parsing", openpolicyagent.DefaultMaxMemoryBodyParsing, "Total number of bytes used to parse http request bodies across all requests. Once the limit is met, requests will be rejected.")
 
 	// TLS client certs
@@ -926,13 +928,14 @@ func (c *Config) ToOptions() skipper.Options {
 		LuaModules: c.LuaModules.values,
 		LuaSources: c.LuaSources.values,
 
-		EnableOpenPolicyAgent:               c.EnableOpenPolicyAgent,
-		OpenPolicyAgentConfigTemplate:       c.OpenPolicyAgentConfigTemplate,
-		OpenPolicyAgentEnvoyMetadata:        c.OpenPolicyAgentEnvoyMetadata,
-		OpenPolicyAgentCleanerInterval:      c.OpenPolicyAgentCleanerInterval,
-		OpenPolicyAgentStartupTimeout:       c.OpenPolicyAgentStartupTimeout,
-		OpenPolicyAgentMaxRequestBodySize:   c.OpenPolicyAgentMaxRequestBodySize,
-		OpenPolicyAgentMaxMemoryBodyParsing: c.OpenPolicyAgentMaxMemoryBodyParsing,
+		EnableOpenPolicyAgent:                c.EnableOpenPolicyAgent,
+		OpenPolicyAgentConfigTemplate:        c.OpenPolicyAgentConfigTemplate,
+		OpenPolicyAgentEnvoyMetadata:         c.OpenPolicyAgentEnvoyMetadata,
+		OpenPolicyAgentCleanerInterval:       c.OpenPolicyAgentCleanerInterval,
+		OpenPolicyAgentStartupTimeout:        c.OpenPolicyAgentStartupTimeout,
+		OpenPolicyAgentMaxRequestBodySize:    c.OpenPolicyAgentMaxRequestBodySize,
+		OpenPolicyAgentRequestBodyBufferSize: c.OpenPolicyAgentRequestBodyBufferSize,
+		OpenPolicyAgentMaxMemoryBodyParsing:  c.OpenPolicyAgentMaxMemoryBodyParsing,
 
 		PassiveHealthCheck: c.PassiveHealthCheck.values,
 	}

config/config_test.go

@@ -163,6 +163,7 @@ func defaultConfig(with func(*Config)) *Config {
 		OpenPolicyAgentStartupTimeout:           30 * time.Second,
 		OpenPolicyAgentMaxRequestBodySize:       openpolicyagent.DefaultMaxRequestBodySize,
 		OpenPolicyAgentMaxMemoryBodyParsing:     openpolicyagent.DefaultMaxMemoryBodyParsing,
+		OpenPolicyAgentRequestBodyBufferSize:    openpolicyagent.DefaultRequestBodyBufferSize,
 	}
 	with(cfg)
 	return cfg

filters/openpolicyagent/openpolicyagent.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"google.golang.org/protobuf/proto"
 	"io"
 	"net/http"
 	"os"
@@ -14,6 +13,8 @@ import (
 	"text/template"
 	"time"
 
+	"google.golang.org/protobuf/proto"
+
 	ext_authz_v3_core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	"github.com/google/uuid"
 	"github.com/open-policy-agent/opa/ast"
@@ -44,9 +45,9 @@ const (
 	defaultShutdownGracePeriod = 30 * time.Second
 	DefaultOpaStartupTimeout   = 30 * time.Second
 
-	DefaultMaxRequestBodySize   = 1 << 20 // 1 MB
-	DefaultMaxMemoryBodyParsing = 100 * DefaultMaxRequestBodySize
-	defaultBodyBufferSize       = 8192 * 1024
+	DefaultMaxRequestBodySize    = 1 << 20 // 1 MB
+	DefaultMaxMemoryBodyParsing  = 100 * DefaultMaxRequestBodySize
+	DefaultRequestBodyBufferSize = 8 * 1024 // 8 KB
 
 	spanNameEval = "open-policy-agent"
 )
@@ -129,7 +130,7 @@ func NewOpenPolicyAgentRegistry(opts ...func(*OpenPolicyAgentRegistry) error) *O
 		lastused:            make(map[*OpenPolicyAgentInstance]time.Time),
 		quit:                make(chan struct{}),
 		maxRequestBodyBytes: DefaultMaxMemoryBodyParsing,
-		bodyReadBufferSize:  defaultBodyBufferSize,
+		bodyReadBufferSize:  DefaultRequestBodyBufferSize,
 	}
 
 	for _, opt := range opts {

filters/openpolicyagent/openpolicyagent_test.go

@@ -5,14 +5,15 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	pbstruct "google.golang.org/protobuf/types/known/structpb"
 	"io"
 	"net/http"
 	"os"
 	"strconv"
 	"testing"
 	"time"
 
+	pbstruct "google.golang.org/protobuf/types/known/structpb"
+
 	"github.com/open-policy-agent/opa/ast"
 
 	ext_authz_v3_core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
@@ -250,7 +251,7 @@ func TestOpaEngineStartFailureWithTimeout(t *testing.T) {
 	cfg, err := NewOpenPolicyAgentConfig(WithConfigTemplate(config), WithStartupTimeout(1*time.Second))
 	assert.NoError(t, err)
 
-	engine, err := registry.new(inmem.New(), config, *cfg, "testfilter", "test", DefaultMaxRequestBodySize, defaultBodyBufferSize)
+	engine, err := registry.new(inmem.New(), config, *cfg, "testfilter", "test", DefaultMaxRequestBodySize, DefaultRequestBodyBufferSize)
 	assert.NoError(t, err)
 
 	ctx, cancel := context.WithTimeout(context.Background(), cfg.startupTimeout)
@@ -533,7 +534,7 @@ func TestBodyExtraction(t *testing.T) {
 			msg:            "Read body ",
 			body:           `{ "welcome": "world" }`,
 			maxBodySize:    1024,
-			readBodyBuffer: defaultBodyBufferSize,
+			readBodyBuffer: DefaultRequestBodyBufferSize,
 			bodyInPolicy:   `{ "welcome": "world" }`,
 		},
 		{

skipper.go

@@ -933,13 +933,14 @@ type Options struct {
 	// filters.
 	LuaSources []string
 
-	EnableOpenPolicyAgent               bool
-	OpenPolicyAgentConfigTemplate       string
-	OpenPolicyAgentEnvoyMetadata        string
-	OpenPolicyAgentCleanerInterval      time.Duration
-	OpenPolicyAgentStartupTimeout       time.Duration
-	OpenPolicyAgentMaxRequestBodySize   int64
-	OpenPolicyAgentMaxMemoryBodyParsing int64
+	EnableOpenPolicyAgent                bool
+	OpenPolicyAgentConfigTemplate        string
+	OpenPolicyAgentEnvoyMetadata         string
+	OpenPolicyAgentCleanerInterval       time.Duration
+	OpenPolicyAgentStartupTimeout        time.Duration
+	OpenPolicyAgentMaxRequestBodySize    int64
+	OpenPolicyAgentRequestBodyBufferSize int64
+	OpenPolicyAgentMaxMemoryBodyParsing  int64
 
 	PassiveHealthCheck map[string]string
 }
@@ -1877,6 +1878,7 @@ func run(o Options, sig chan os.Signal, idleConnsCH chan struct{}) error {
 		opaRegistry = openpolicyagent.NewOpenPolicyAgentRegistry(
 			openpolicyagent.WithMaxRequestBodyBytes(o.OpenPolicyAgentMaxRequestBodySize),
 			openpolicyagent.WithMaxMemoryBodyParsing(o.OpenPolicyAgentMaxMemoryBodyParsing),
+			openpolicyagent.WithReadBodyBufferSize(o.OpenPolicyAgentRequestBodyBufferSize),
 			openpolicyagent.WithCleanInterval(o.OpenPolicyAgentCleanerInterval),
 			openpolicyagent.WithTracer(tracer))
 		defer opaRegistry.Close()