Skip to content

Use the correct emitter in auth.TLSServer #25265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
espadolini merged 1 commit into from
Apr 27, 2023
Merged

Use the correct emitter in auth.TLSServer #25265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions lib/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,13 @@ func (a *Server) SetEmitter(emitter apievents.Emitter) {
a.emitter = emitter
}

// EmitAuditEvent implements [apievents.Emitter] by delegating to its dedicated
// emitter rather than falling back to the implementation from [Services] (using
// the audit log directly, which is almost never what you want).
func (a *Server) EmitAuditEvent(ctx context.Context, e apievents.AuditEvent) error {
return trace.Wrap(a.emitter.EmitAuditEvent(ctx, e))
}

// SetUsageReporter sets the server's usage reporter. Note that this is only
// safe to use before server start.
func (a *Server) SetUsageReporter(reporter usagereporter.UsageReporter) {
Expand Down
4 changes: 2 additions & 2 deletions lib/auth/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func NewTestServer(cfg TestServerConfig) (*TestServer, error) {
tlsCfg.APIConfig.AuditLog = authServer.AuditLog
}
if tlsCfg.APIConfig.Emitter == nil {
tlsCfg.APIConfig.Emitter = authServer.AuthServer.emitter
tlsCfg.APIConfig.Emitter = authServer.AuthServer
}
if tlsCfg.AcceptedUsage == nil {
tlsCfg.AcceptedUsage = authServer.AcceptedUsage
Expand Down Expand Up @@ -583,7 +583,7 @@ func (a *TestAuthServer) NewTestTLSServer() (*TestTLSServer, error) {
AuthServer: a.AuthServer,
Authorizer: a.Authorizer,
AuditLog: a.AuditLog,
Emitter: a.AuthServer.emitter,
Emitter: a.AuthServer,
}
srv, err := NewTestTLSServer(TestTLSServerConfig{
APIConfig: apiConfig,
Expand Down
2 changes: 1 addition & 1 deletion lib/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1714,7 +1714,7 @@ func (process *TeleportProcess) initAuthService() error {
Authorizer: authorizer,
AuditLog: process.auditLog,
PluginRegistry: process.PluginRegistry,
Emitter: checkingEmitter,
Emitter: authServer,
MetadataGetter: uploadHandler,
}

Expand Down