self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 02:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix hiding of u2f-related things in web ui when u2f is disabled

Browse source
This commit is contained in:
jcj83429 2016-12-10 20:01:12 -08:00
parent 3543e99d34
commit f2e589ee53
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/auth/auth.go
View file

@ -175,6 +175,9 @@ func (a *AuthServer) GetDomainName() (string, error) {
}
func (a *AuthServer) GetU2FAppID() (string, error) {
if err := a.CheckU2FEnabled(); err != nil {
return "", err
}
return a.U2F.AppID, nil
}

5
lib/web/web.go
View file

@ -279,9 +279,10 @@ func (m *Handler) getSettings(w http.ResponseWriter, r *http.Request) (interface
}
u2fAppID, err := m.cfg.ProxyClient.GetU2FAppID()
if err != nil {
return nil, trace.Wrap(err)
settings.Auth.U2FAppID = ""
} else {
settings.Auth.U2FAppID = u2fAppID
}
settings.Auth.U2FAppID = u2fAppID
out, err := json.Marshal(settings)
if err != nil {
return nil, trace.Wrap(err)