Support source authentication using client certificates #454
+285
−43
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -125,11 +125,14 @@ func (l *Listener) Run(ctx context.Context) error { | |
| ErrorLog: stdlogger, | ||
| } | ||
|
|
||
| ctx, cancel := context.WithCancelCause(ctx) | ||
| defer cancel(nil) | ||
|
|
||
| var listeningFunc func() error | ||
| if l.useSocket { | ||
| listeningFunc, err = l.initSocketServer(server) | ||
| } else { | ||
| listeningFunc, err = l.initTcpServer(ctx, cancel, server) | ||
| } | ||
| if err != nil { | ||
| return err | ||
|
|
@@ -142,9 +145,12 @@ func (l *Listener) Run(ctx context.Context) error { | |
|
|
||
| select { | ||
| case <-ctx.Done(): | ||
| shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 3*time.Second) | ||
| defer shutdownCancel() | ||
| if err := server.Shutdown(shutdownCtx); err != nil { | ||
| return err | ||
| } | ||
| return context.Cause(ctx) | ||
|
|
||
| case err := <-serverErr: | ||
| return err | ||
|
|
@@ -153,13 +159,23 @@ func (l *Listener) Run(ctx context.Context) error { | |
|
|
||
| // initTcpServer configures the given HTTP(S) server for the configured TCP address and returns a function that | ||
| // starts serving. The caller is responsible for actually calling that function and for graceful shutdown. | ||
| func (l *Listener) initTcpServer(ctx context.Context, cancel context.CancelCauseFunc, server *http.Server) (func() error, error) { | ||
| conf := daemon.Config().Listener | ||
| tlsConfig, crlChecker, err := conf.GetTlsConfig() | ||
|
Member
There was a problem hiding this comment.
Member
There was a problem hiding this comment. Just saw that this was already addressed in d085910 shortly before I sent this review. Nevertheless, please make the API less dangerous: In the IGL, return an error if |
||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| go func() { | ||
| err := crlChecker.WatchAndReload(ctx, l.logger.SugaredLogger) | ||
| if ctx.Err() != nil || err == nil { | ||
| // WatchAndReload returning is expected (Context was cancelled externally or noop). | ||
| return | ||
| } | ||
| l.logger.Errorw("CRL watcher exited unexpectedly", zap.Error(err)) | ||
| cancel(fmt.Errorf("CRL watcher exited: %w", err)) | ||
| }() | ||
|
|
||
| var https string | ||
| if conf.TLSOptions.Enable { | ||
| https = "s" | ||
|
|
@@ -274,45 +290,98 @@ func (l *Listener) initSocketServer(server *http.Server) (fn func() error, retEr | |
| // up by the OS username of the connecting process via peer credentials. For TCP connections, HTTP Basic Auth is used. | ||
| // If no matching source is found, nil is returned and 401 is written to the response. | ||
| func (l *Listener) sourceFromAuthOrAbort(w http.ResponseWriter, r *http.Request) (src *config.Source) { | ||
| var errMsg string | ||
| errFunc := func(httpCode int, sendAuthHeader bool) *config.Source { | ||
| if sendAuthHeader { | ||
| w.Header().Set("WWW-Authenticate", `Basic realm="icinga-notifications source"`) | ||
| } | ||
| l.logger.Errorw("Error in sourceFromAuthOrAbort", zap.String("error", errMsg)) | ||
| w.WriteHeader(httpCode) | ||
| _, _ = fmt.Fprintln(w, errMsg) | ||
| return nil | ||
| } | ||
|
|
||
| if l.useSocket { | ||
| errMsg = "unix socket: " | ||
| value := r.Context().Value(peerUserLookupKey{}) | ||
| if value == nil { | ||
| errMsg += "no client certificate found" | ||
| return errFunc(http.StatusUnauthorized, false) | ||
| } | ||
|
|
||
| lookup, ok := value.(peerUserLookupFunc) | ||
| if !ok { | ||
| errMsg += "no lookup function present" | ||
| return errFunc(http.StatusUnauthorized, false) | ||
| } | ||
|
|
||
| username, err := lookup() | ||
| if err != nil { | ||
| errMsg += err.Error() | ||
| return errFunc(http.StatusUnauthorized, false) | ||
| } | ||
|
|
||
| src = l.runtimeConfig.GetSourceByUsername(username) | ||
| if src == nil { | ||
| errMsg += fmt.Sprintf("system user %q is not registered as a source username", username) | ||
| return errFunc(http.StatusUnauthorized, false) | ||
| } | ||
|
|
||
| l.logger.Debugw( | ||
| "Source is authenticated via socket connection", | ||
| zap.String("source_name", src.Name), | ||
| zap.String("username", username), | ||
| ) | ||
| } else { | ||
| authUser, authPass, authOk := r.BasicAuth() | ||
| if r.TLS != nil && len(r.TLS.VerifiedChains) > 0 { | ||
| // if VerifiedChains isn't empty, the request doesn't fall back to basic auth | ||
| errMsg = "tls cert: " | ||
| if authUser != "" || authPass != "" { | ||
| errMsg += " both client certificate and basic auth provided" | ||
| return errFunc(http.StatusBadRequest, false) | ||
| } | ||
|
|
||
| if len(r.TLS.VerifiedChains[0]) == 0 { | ||
| errMsg += "no verified chain found" | ||
| return errFunc(http.StatusUnauthorized, true) | ||
| } | ||
|
|
||
| clientCert := r.TLS.VerifiedChains[0][0] | ||
| if clientCert == nil { | ||
| errMsg += "no client certificate found" | ||
| return errFunc(http.StatusUnauthorized, true) | ||
| } | ||
|
|
||
| src = l.runtimeConfig.GetSourceByClientCertSubject(clientCert.Subject.String()) | ||
| if src == nil { | ||
| errMsg += "no matching source found" | ||
| return errFunc(http.StatusUnauthorized, true) | ||
| } | ||
|
|
||
| l.logger.Debugw( | ||
| "Source is authenticated via a TLS client certificate", | ||
| zap.String("source_name", src.Name), | ||
| zap.String("common_name", clientCert.Subject.CommonName), | ||
| ) | ||
| } else { | ||
| errMsg = "basic auth: " | ||
| if !authOk { | ||
| errMsg += "missing or malformed basic auth credentials" | ||
| return errFunc(http.StatusUnauthorized, true) | ||
| } | ||
|
|
||
| src = l.runtimeConfig.GetSourceFromCredentials(authUser, authPass, l.logger) | ||
| if src == nil { | ||
| errMsg += "expected valid icinga-notifications source basic auth credentials" | ||
| return errFunc(http.StatusUnauthorized, true) | ||
| } | ||
|
|
||
| l.logger.Debugw( | ||
| "Source is authenticated via HTTP Basic Auth", | ||
| zap.String("source_name", src.Name), | ||
| zap.String("username", authUser), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.