Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down Expand Up @@ -824,6 +825,7 @@ type Services struct {
services.HealthCheckConfig
services.BackendInfoService
services.VnetConfigService
events.MultipartHandler
services.Summarizer
}

Expand Down
4 changes: 3 additions & 1 deletion lib/auth/authtest/authtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,14 +261,15 @@ 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 {
localLog, err := events.NewAuditLog(events.AuditLogConfig{
DataDir: cfg.Dir,
ServerID: cfg.ClusterName,
Clock: cfg.Clock,
UploadHandler: eventstest.NewMemoryUploader(),
UploadHandler: uploadHandler,
})
if err != nil {
return nil, trace.Wrap(err)
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions lib/auth/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions lib/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading