mirror of
https://github.com/gravitational/teleport.git
synced 2026-09-24 16:17:11 +08:00
Alias the "u2f" second factor mode to "webauthn", effectively sunsetting U2F in favor of WebAuthn. The change effectively disables "U2F mode" server-side, making Teleport use WebAuthn instead. This is in line with our compatibility promise, as Teleport 8.x clients are already WebAuthn-capable (and thus have no problems talking to the cluster). I have cleaned up a good chunk of U2F references in lib/web and lib/client, plus a few other places. Changes on lib/auth are just the necessary to get the tests back to good standing. There is more work to be done, but this seems enough for a single PR. #10375 * Remove "Disabled" field from types.Webauthn * Update generated protos * Treat second_factor "u2f" as "webauthn" * Remove references to Webauthn.Disabled * Remove U2F from lib/web/ * Remove U2F from lib/client/ * Remove U2F from lib/auth/ (partially) * Fix issues after rebase on master * Fix typo
103 lines
3.2 KiB
Go
103 lines
3.2 KiB
Go
/*
|
|
Copyright 2015 Gravitational, Inc.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package web
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/gravitational/teleport/api/client/proto"
|
|
wanlib "github.com/gravitational/teleport/lib/auth/webauthn"
|
|
"github.com/gravitational/teleport/lib/client"
|
|
"github.com/gravitational/teleport/lib/httplib"
|
|
"github.com/gravitational/teleport/lib/services"
|
|
"github.com/gravitational/trace"
|
|
"github.com/julienschmidt/httprouter"
|
|
)
|
|
|
|
// changePasswordReq is a request to change user password
|
|
type changePasswordReq struct {
|
|
// OldPassword is user current password
|
|
OldPassword []byte `json:"old_password"`
|
|
// NewPassword is user new password
|
|
NewPassword []byte `json:"new_password"`
|
|
// SecondFactorToken is user 2nd factor token
|
|
SecondFactorToken string `json:"second_factor_token"`
|
|
// WebauthnAssertionResponse is a Webauthn response
|
|
WebauthnAssertionResponse *wanlib.CredentialAssertionResponse `json:"webauthnAssertionResponse"`
|
|
}
|
|
|
|
// changePassword updates users password based on the old password.
|
|
func (h *Handler) changePassword(w http.ResponseWriter, r *http.Request, p httprouter.Params, ctx *SessionContext) (interface{}, error) {
|
|
var req *changePasswordReq
|
|
if err := httplib.ReadJSON(r, &req); err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
|
|
clt, err := ctx.GetClient()
|
|
if err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
|
|
servicedReq := services.ChangePasswordReq{
|
|
User: ctx.GetUser(),
|
|
OldPassword: req.OldPassword,
|
|
NewPassword: req.NewPassword,
|
|
SecondFactorToken: req.SecondFactorToken,
|
|
WebauthnResponse: req.WebauthnAssertionResponse,
|
|
}
|
|
|
|
if err := clt.ChangePassword(servicedReq); err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
|
|
return OK(), nil
|
|
}
|
|
|
|
// createAuthenticateChallengeWithPassword verifies given password for the authenticated user
|
|
// and on success returns MFA challenges for the users registered devices.
|
|
func (h *Handler) createAuthenticateChallengeWithPassword(w http.ResponseWriter, r *http.Request, _ httprouter.Params, ctx *SessionContext) (interface{}, error) {
|
|
var req client.MFAChallengeRequest
|
|
if err := httplib.ReadJSON(r, &req); err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
|
|
clt, err := ctx.GetClient()
|
|
if err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
|
|
chal, err := clt.CreateAuthenticateChallenge(r.Context(), &proto.CreateAuthenticateChallengeRequest{
|
|
Request: &proto.CreateAuthenticateChallengeRequest_UserCredentials{UserCredentials: &proto.UserCredentials{
|
|
Username: ctx.GetUser(),
|
|
Password: []byte(req.Pass),
|
|
}},
|
|
})
|
|
if err != nil && trace.IsAccessDenied(err) {
|
|
// logout in case of access denied
|
|
logoutErr := h.logout(w, ctx)
|
|
if logoutErr != nil {
|
|
return nil, trace.Wrap(logoutErr)
|
|
}
|
|
}
|
|
|
|
if err != nil {
|
|
return nil, trace.Wrap(err)
|
|
}
|
|
|
|
return client.MakeAuthenticateChallenge(chal), nil
|
|
}
|