Commit 5ac33d95 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Improve dashboard CORS support. Merge #125

parent c1eb005a

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ The format is based on [keep a changelog](http://keepachangelog.com/) and this p 
### Added

- Improve graceful shutdown behaviour by ensuring the server stops accepting connections before halting other components.

- Add User-Agent to the default list of accepted CORS request headers.

- Improve how the dashboard component is stopped when server shuts down.

- Improve dashboard CORS support by extending the list of allowed request headers.



## [1.2.0] - 2017-11-06

### Added

server/dashboard_accepter.go

+14 −5
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ type dashboardService struct { 
	version             string

	config              Config

	statsService        StatsService

	httpServer          *http.Server

	mux                 *mux.Router

	dashboardFilesystem http.FileSystem

}
@@ -59,11 +60,15 @@ func NewDashboardService(logger *zap.Logger, multiLogger *zap.Logger, version st 
	service.mux.HandleFunc("/v0/info", service.infoHandler).Methods("GET")

	service.mux.PathPrefix("/").Handler(http.FileServer(service.dashboardFilesystem)).Methods("GET") // Needs to be last.



	CORSHeaders := handlers.AllowedHeaders([]string{"Authorization", "Content-Type", "User-Agent"})

	CORSOrigins := handlers.AllowedOrigins([]string{"*"})



	handlerWithCORS := handlers.CORS(CORSHeaders, CORSOrigins)(service.mux)



	service.httpServer = &http.Server{Addr: fmt.Sprintf(":%d", config.GetDashboard().Port), Handler: handlerWithCORS}



	go func() {

		bindAddr := fmt.Sprintf(":%d", config.GetDashboard().Port)

		handlerWithCORS := handlers.CORS(handlers.AllowedOrigins([]string{"*"}))(service.mux)

		err := http.ListenAndServe(bindAddr, handlerWithCORS)

		if err != nil {

		if err := service.httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {

			multiLogger.Fatal("Dashboard listener failed", zap.Error(err))

		}

	}()
@@ -76,7 +81,11 @@ func NewDashboardService(logger *zap.Logger, multiLogger *zap.Logger, version st 
	return service

}



func (s *dashboardService) Stop() {}

func (s *dashboardService) Stop() {

	if err := s.httpServer.Shutdown(nil); err != nil {

		s.logger.Error("Dashboard listener shutdown failed", zap.Error(err))

	}

}



func (s *dashboardService) statusHandler(w http.ResponseWriter, r *http.Request) {

	w.Header().Set("Content-Type", "application/json; charset=utf-8")