3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 08:50:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

proxy: fix error page (#3020)

Browse source 
* fix error page

* proxy: fix error page

* share dashboard code

* fix test
This commit is contained in:
Caleb Doxsey 2022-02-09 09:14:24 -07:00 • committed by GitHub
parent 8f6fddebd1
commit 0898dd4f34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
authenticate/handlers.go
View file

@ -33,7 +33,6 @@ import (
"github.com/pomerium/pomerium/pkg/grpc/directory"
"github.com/pomerium/pomerium/pkg/grpc/session"
"github.com/pomerium/pomerium/pkg/grpc/user"
"github.com/pomerium/pomerium/ui"
)
// Handler returns the authenticate service's handler chain.
@ -80,7 +79,7 @@ func (a *Authenticate) Mount(r *mux.Router) {
}
func (a *Authenticate) mountDashboard(r *mux.Router) {
sr := r.PathPrefix("/.pomerium").Subrouter()
sr := httputil.DashboardSubrouter(r)
c := cors.New(cors.Options{
AllowOriginRequestFunc: func(r *http.Request, _ string) bool {
state := a.state.Load()
@ -108,19 +107,6 @@ func (a *Authenticate) mountDashboard(r *mux.Router) {
handlers.DeviceEnrolled(authenticateURL, a.state.Load().sharedKey).ServeHTTP(w, r)
return nil
}))
for _, fileName := range []string{
"apple-touch-icon.png",
"favicon-16x16.png",
"favicon-32x32.png",
"favicon.ico",
"index.css",
"index.js",
} {
fileName := fileName
sr.Path("/" + fileName).Handler(httputil.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
return ui.ServeFile(w, r, fileName)
}))
}
cr := sr.PathPrefix("/callback").Subrouter()
cr.Use(func(h http.Handler) http.Handler {