Skip to content

Commit

Permalink
remove parameter for httpPingOnly
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Savintsev <[email protected]>
  • Loading branch information
dmitris committed Sep 27, 2023
1 parent bae3734 commit 5e303a3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cmd/timestamp-server/app/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ var serveCmd = &cobra.Command{
host := viper.GetString("host")
port := int(viper.GetUint("port"))
scheme := viper.GetStringSlice("scheme")
httpPingOnly := viper.GetBool("http-ping-only")
log.Logger.Debugf("httpPingOnly: %t", httpPingOnly)
server := server.NewRestAPIServer(host, port, scheme, httpPingOnly, readTimeout, writeTimeout)
defer func() {
if err := server.Shutdown(); err != nil {
Expand Down
9 changes: 5 additions & 4 deletions pkg/generated/restapi/configure_timestamp_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,14 @@ func (l *logAdapter) Print(v ...interface{}) {

// httpPingOnly custom middleware prohibits all entrypoints except
// "/ping" on the http (non-HTTPS) server.
func httpPingOnly(endpoint string) func(http.Handler) http.Handler {
func httpPingOnly() func(http.Handler) http.Handler {
const pingpath = "/ping"
f := func(h http.Handler) http.Handler {
fn := func(w http.ResponseWriter, r *http.Request) {
if r.URL.Scheme != "https" && !strings.EqualFold(r.URL.Path, endpoint) {
if r.URL.Scheme != "https" && !strings.EqualFold(r.URL.Path, pingpath) {
w.Header().Set("Content-Type", "text/plain")
w.WriteHeader(http.StatusNotFound)
w.Write([]byte("http server supports only the /ping entrypoint")) //nolint:errcheck
w.Write([]byte("http server supports only the " + pingpath + " entrypoint")) //nolint:errcheck
return
}
h.ServeHTTP(w, r)
Expand All @@ -130,7 +131,7 @@ func setupGlobalMiddleware(handler http.Handler) http.Handler {
returnHandler = middleware.Recoverer(returnHandler)
returnHandler = middleware.Heartbeat("/ping")(returnHandler)
if cmdparams.IsHTTPPingOnly {
returnHandler = httpPingOnly("/ping")(returnHandler)
returnHandler = httpPingOnly()(returnHandler)
}

handleCORS := cors.Default().Handler
Expand Down

0 comments on commit 5e303a3

Please sign in to comment.