From 76a9f4d3de22abe469bb2558c819b8b2fac858f2 Mon Sep 17 00:00:00 2001
From: Bartosz Leper <bartosz.leper@goteleport.com>
Date: Wed, 6 Aug 2025 15:49:17 +0200
Subject: [PATCH 1/2] Fix the test auth server's upload handler

---
 lib/auth/authtest/authtest.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/auth/authtest/authtest.go b/lib/auth/authtest/authtest.go
index df8ad14fd46a3..42048ac7e5dcc 100644
--- a/lib/auth/authtest/authtest.go
+++ b/lib/auth/authtest/authtest.go
@@ -261,6 +261,7 @@ func NewAuthServer(cfg AuthServerConfig) (*AuthServer, error) {
 	// Wrap backend in sanitizer like in production.
 	srv.Backend = backend.NewSanitizer(b)
 
+	uploadHandler := eventstest.NewMemoryUploader()
 	if cfg.AuditLog != nil {
 		srv.AuditLog = cfg.AuditLog
 	} else {
@@ -268,7 +269,7 @@ func NewAuthServer(cfg AuthServerConfig) (*AuthServer, error) {
 			DataDir:       cfg.Dir,
 			ServerID:      cfg.ClusterName,
 			Clock:         cfg.Clock,
-			UploadHandler: eventstest.NewMemoryUploader(),
+			UploadHandler: uploadHandler,
 		})
 		if err != nil {
 			return nil, trace.Wrap(err)
@@ -321,6 +322,7 @@ func NewAuthServer(cfg AuthServerConfig) (*AuthServer, error) {
 		AccessLists:            accessLists,
 		FIPS:                   cfg.FIPS,
 		KeyStoreConfig:         cfg.KeystoreConfig,
+		MultipartHandler:       uploadHandler,
 	},
 		WithClock(cfg.Clock),
 		// Reduce auth.Server bcrypt costs when testing.

From 7780e777ae5f2a3b2885645bd8e1003a8732d981 Mon Sep 17 00:00:00 2001
From: Bartosz Leper <bartosz.leper@goteleport.com>
Date: Fri, 15 Aug 2025 23:03:50 +0200
Subject: [PATCH 2/2] Backport the MultipartHandler field

---
 lib/auth/auth.go       | 2 ++
 lib/auth/init.go       | 3 +++
 lib/service/service.go | 1 +
 3 files changed, 6 insertions(+)

diff --git a/lib/auth/auth.go b/lib/auth/auth.go
index 2bf3e8437b92b..7a1772dcdf6da 100644
--- a/lib/auth/auth.go
+++ b/lib/auth/auth.go
@@ -580,6 +580,7 @@ func NewServer(cfg *InitConfig, opts ...ServerOption) (*Server, error) {
 		HealthCheckConfig:               cfg.HealthCheckConfig,
 		BackendInfoService:              cfg.BackendInfo,
 		VnetConfigService:               cfg.VnetConfigService,
+		MultipartHandler:                cfg.MultipartHandler,
 		Summarizer:                      cfg.Summarizer,
 	}
 
@@ -824,6 +825,7 @@ type Services struct {
 	services.HealthCheckConfig
 	services.BackendInfoService
 	services.VnetConfigService
+	events.MultipartHandler
 	services.Summarizer
 }
 
diff --git a/lib/auth/init.go b/lib/auth/init.go
index a240dea1ef43f..85815704d9240 100644
--- a/lib/auth/init.go
+++ b/lib/auth/init.go
@@ -374,6 +374,9 @@ type InitConfig struct {
 	// VnetConfigService manages the VNet config resource.
 	VnetConfigService services.VnetConfigService
 
+	// MultipartHandler handles multipart uploads.
+	MultipartHandler events.MultipartHandler
+
 	// Summarizer manages summary inference configuration resources.
 	Summarizer services.Summarizer
 
diff --git a/lib/service/service.go b/lib/service/service.go
index c9bc43d38cab0..8377065703667 100644
--- a/lib/service/service.go
+++ b/lib/service/service.go
@@ -2268,6 +2268,7 @@ func (process *TeleportProcess) initAuthService() error {
 			AccessMonitoringEnabled:   cfg.Auth.IsAccessMonitoringEnabled(),
 			Clock:                     cfg.Clock,
 			HTTPClientForAWSSTS:       cfg.Auth.HTTPClientForAWSSTS,
+			MultipartHandler:          uploadHandler,
 			Tracer:                    process.TracingProvider.Tracer(teleport.ComponentAuth),
 			Logger:                    logger,
 			SessionSummarizerProvider: sessionSummarizerProvider,