diff --git a/api/api.go b/api/api.go index 89c5900..e7237dd 100644 --- a/api/api.go +++ b/api/api.go @@ -12,8 +12,8 @@ import ( "strings" ) -func CurrentUser(c *gin.Context) *model.Auth { - return c.MustGet("user").(*model.Auth) +func CurrentUser(c *gin.Context) *model.User { + return c.MustGet("user").(*model.User) } func ErrHandler(c *gin.Context, err error) { diff --git a/api/system/install.go b/api/system/install.go index 49340fd..94fc52c 100644 --- a/api/system/install.go +++ b/api/system/install.go @@ -61,8 +61,8 @@ func InstallNginxUI(c *gin.Context) { pwd, _ := bcrypt.GenerateFromPassword([]byte(json.Password), bcrypt.DefaultCost) - u := query.Auth - err = u.Create(&model.Auth{ + u := query.User + err = u.Create(&model.User{ Name: json.Username, Password: string(pwd), }) diff --git a/api/user/2fa.go b/api/user/2fa.go new file mode 100644 index 0000000..0becf48 --- /dev/null +++ b/api/user/2fa.go @@ -0,0 +1,156 @@ +package user + +import ( + "encoding/base64" + "fmt" + "github.com/0xJacky/Nginx-UI/api" + "github.com/0xJacky/Nginx-UI/internal/cache" + "github.com/0xJacky/Nginx-UI/internal/passkey" + "github.com/0xJacky/Nginx-UI/internal/user" + "github.com/0xJacky/Nginx-UI/model" + "github.com/0xJacky/Nginx-UI/query" + "github.com/gin-gonic/gin" + "github.com/go-webauthn/webauthn/webauthn" + "github.com/google/uuid" + "net/http" + "strings" + "time" +) + +type Status2FA struct { + Enabled bool `json:"enabled"` + OTPStatus bool `json:"otp_status"` + PasskeyStatus bool `json:"passkey_status"` +} + +func get2FAStatus(c *gin.Context) (status Status2FA) { + // when accessing the node from the main cluster, there is no user in the context + u, ok := c.Get("user") + if ok { + userPtr := u.(*model.User) + status.OTPStatus = userPtr.EnabledOTP() + status.PasskeyStatus = userPtr.EnabledPasskey() && passkey.Enabled() + status.Enabled = status.OTPStatus || status.PasskeyStatus + } + return +} + +func Get2FAStatus(c *gin.Context) { + c.JSON(http.StatusOK, get2FAStatus(c)) +} + +func SecureSessionStatus(c *gin.Context) { + status2FA := get2FAStatus(c) + if !status2FA.Enabled { + c.JSON(http.StatusOK, gin.H{ + "status": false, + }) + return + } + + ssid := c.GetHeader("X-Secure-Session-ID") + if ssid == "" { + ssid = c.Query("X-Secure-Session-ID") + } + if ssid == "" { + c.JSON(http.StatusOK, gin.H{ + "status": false, + }) + return + } + + u := api.CurrentUser(c) + + c.JSON(http.StatusOK, gin.H{ + "status": user.VerifySecureSessionID(ssid, u.ID), + }) +} + +func Start2FASecureSessionByOTP(c *gin.Context) { + var json struct { + OTP string `json:"otp"` + RecoveryCode string `json:"recovery_code"` + } + if !api.BindAndValid(c, &json) { + return + } + u := api.CurrentUser(c) + if !u.EnabledOTP() { + c.JSON(http.StatusBadRequest, gin.H{ + "message": "User has not configured OTP as 2FA", + }) + return + } + + if json.OTP == "" && json.RecoveryCode == "" { + c.JSON(http.StatusBadRequest, LoginResponse{ + Message: "The user has enabled OTP as 2FA", + }) + return + } + + if err := user.VerifyOTP(u, json.OTP, json.RecoveryCode); err != nil { + c.JSON(http.StatusBadRequest, LoginResponse{ + Message: "Invalid OTP or recovery code", + }) + return + } + + sessionId := user.SetSecureSessionID(u.ID) + + c.JSON(http.StatusOK, gin.H{ + "session_id": sessionId, + }) +} + +func BeginStart2FASecureSessionByPasskey(c *gin.Context) { + if !passkey.Enabled() { + api.ErrHandler(c, fmt.Errorf("WebAuthn settings are not configured")) + return + } + webauthnInstance := passkey.GetInstance() + u := api.CurrentUser(c) + options, sessionData, err := webauthnInstance.BeginLogin(u) + if err != nil { + api.ErrHandler(c, err) + return + } + passkeySessionID := uuid.NewString() + cache.Set(passkeySessionID, sessionData, passkeyTimeout) + c.JSON(http.StatusOK, gin.H{ + "session_id": passkeySessionID, + "options": options, + }) +} + +func FinishStart2FASecureSessionByPasskey(c *gin.Context) { + if !passkey.Enabled() { + api.ErrHandler(c, fmt.Errorf("WebAuthn settings are not configured")) + return + } + passkeySessionID := c.GetHeader("X-Passkey-Session-ID") + sessionDataBytes, ok := cache.Get(passkeySessionID) + if !ok { + api.ErrHandler(c, fmt.Errorf("session not found")) + return + } + sessionData := sessionDataBytes.(*webauthn.SessionData) + webauthnInstance := passkey.GetInstance() + u := api.CurrentUser(c) + credential, err := webauthnInstance.FinishLogin(u, *sessionData, c.Request) + if err != nil { + api.ErrHandler(c, err) + return + } + rawID := strings.TrimRight(base64.StdEncoding.EncodeToString(credential.ID), "=") + p := query.Passkey + _, _ = p.Where(p.RawID.Eq(rawID)).Updates(&model.Passkey{ + LastUsedAt: time.Now().Unix(), + }) + + sessionId := user.SetSecureSessionID(u.ID) + + c.JSON(http.StatusOK, gin.H{ + "session_id": sessionId, + }) +} diff --git a/api/user/auth.go b/api/user/auth.go index 40b8602..28d618c 100644 --- a/api/user/auth.go +++ b/api/user/auth.go @@ -8,6 +8,7 @@ import ( "github.com/0xJacky/Nginx-UI/settings" "github.com/gin-gonic/gin" "github.com/pkg/errors" + "math/rand/v2" "net/http" "sync" "time" @@ -67,7 +68,8 @@ func Login(c *gin.Context) { u, err := user.Login(json.Name, json.Password) if err != nil { - // time.Sleep(5 * time.Second) + random := time.Duration(rand.Int() % 10) + time.Sleep(random * time.Second) switch { case errors.Is(err, user.ErrPasswordIncorrect): c.JSON(http.StatusForbidden, LoginResponse{ diff --git a/api/user/otp.go b/api/user/otp.go index 49e1cb5..26ee335 100644 --- a/api/user/otp.go +++ b/api/user/otp.go @@ -1,228 +1,147 @@ package user import ( - "bytes" - "crypto/sha1" - "encoding/base64" - "encoding/hex" - "fmt" - "github.com/0xJacky/Nginx-UI/api" - "github.com/0xJacky/Nginx-UI/internal/crypto" - "github.com/0xJacky/Nginx-UI/internal/user" - "github.com/0xJacky/Nginx-UI/model" - "github.com/0xJacky/Nginx-UI/query" - "github.com/0xJacky/Nginx-UI/settings" - "github.com/gin-gonic/gin" - "github.com/pquerna/otp" - "github.com/pquerna/otp/totp" - "image/jpeg" - "net/http" - "strings" + "bytes" + "crypto/sha1" + "encoding/base64" + "encoding/hex" + "fmt" + "github.com/0xJacky/Nginx-UI/api" + "github.com/0xJacky/Nginx-UI/internal/crypto" + "github.com/0xJacky/Nginx-UI/query" + "github.com/0xJacky/Nginx-UI/settings" + "github.com/gin-gonic/gin" + "github.com/pquerna/otp" + "github.com/pquerna/otp/totp" + "image/jpeg" + "net/http" + "strings" ) func GenerateTOTP(c *gin.Context) { - u := api.CurrentUser(c) - - issuer := fmt.Sprintf("Nginx UI %s", settings.ServerSettings.Name) - issuer = strings.TrimSpace(issuer) - - otpOpts := totp.GenerateOpts{ - Issuer: issuer, - AccountName: u.Name, - Period: 30, // seconds - Digits: otp.DigitsSix, - Algorithm: otp.AlgorithmSHA1, - } - otpKey, err := totp.Generate(otpOpts) - if err != nil { - api.ErrHandler(c, err) - return - } - - qrCode, err := otpKey.Image(512, 512) - if err != nil { - api.ErrHandler(c, err) - return - } - - // Encode the image to a buffer - var buf []byte - buffer := bytes.NewBuffer(buf) - err = jpeg.Encode(buffer, qrCode, nil) - if err != nil { - fmt.Println("Error encoding image:", err) - return - } - - // Convert the buffer to a base64 string - base64Str := "data:image/jpeg;base64," + base64.StdEncoding.EncodeToString(buffer.Bytes()) - - c.JSON(http.StatusOK, gin.H{ - "secret": otpKey.Secret(), - "qr_code": base64Str, - }) + u := api.CurrentUser(c) + + issuer := fmt.Sprintf("Nginx UI %s", settings.ServerSettings.Name) + issuer = strings.TrimSpace(issuer) + + otpOpts := totp.GenerateOpts{ + Issuer: issuer, + AccountName: u.Name, + Period: 30, // seconds + Digits: otp.DigitsSix, + Algorithm: otp.AlgorithmSHA1, + } + otpKey, err := totp.Generate(otpOpts) + if err != nil { + api.ErrHandler(c, err) + return + } + + qrCode, err := otpKey.Image(512, 512) + if err != nil { + api.ErrHandler(c, err) + return + } + + // Encode the image to a buffer + var buf []byte + buffer := bytes.NewBuffer(buf) + err = jpeg.Encode(buffer, qrCode, nil) + if err != nil { + fmt.Println("Error encoding image:", err) + return + } + + // Convert the buffer to a base64 string + base64Str := "data:image/jpeg;base64," + base64.StdEncoding.EncodeToString(buffer.Bytes()) + + c.JSON(http.StatusOK, gin.H{ + "secret": otpKey.Secret(), + "qr_code": base64Str, + }) } func EnrollTOTP(c *gin.Context) { - cUser := api.CurrentUser(c) - if cUser.EnabledOTP() { - c.JSON(http.StatusBadRequest, gin.H{ - "message": "User already enrolled", - }) - return - } - - if settings.ServerSettings.Demo { - c.JSON(http.StatusBadRequest, gin.H{ - "message": "This feature is disabled in demo mode", - }) - return - } - - var json struct { - Secret string `json:"secret" binding:"required"` - Passcode string `json:"passcode" binding:"required"` - } - if !api.BindAndValid(c, &json) { - return - } - - if ok := totp.Validate(json.Passcode, json.Secret); !ok { - c.JSON(http.StatusNotAcceptable, gin.H{ - "message": "Invalid passcode", - }) - return - } - - ciphertext, err := crypto.AesEncrypt([]byte(json.Secret)) - if err != nil { - api.ErrHandler(c, err) - return - } - - u := query.Auth - _, err = u.Where(u.ID.Eq(cUser.ID)).Update(u.OTPSecret, ciphertext) - if err != nil { - api.ErrHandler(c, err) - return - } - - recoveryCode := sha1.Sum(ciphertext) - - c.JSON(http.StatusOK, gin.H{ - "message": "ok", - "recovery_code": hex.EncodeToString(recoveryCode[:]), - }) + cUser := api.CurrentUser(c) + if cUser.EnabledOTP() { + c.JSON(http.StatusBadRequest, gin.H{ + "message": "User already enrolled", + }) + return + } + + if settings.ServerSettings.Demo { + c.JSON(http.StatusBadRequest, gin.H{ + "message": "This feature is disabled in demo mode", + }) + return + } + + var json struct { + Secret string `json:"secret" binding:"required"` + Passcode string `json:"passcode" binding:"required"` + } + if !api.BindAndValid(c, &json) { + return + } + + if ok := totp.Validate(json.Passcode, json.Secret); !ok { + c.JSON(http.StatusNotAcceptable, gin.H{ + "message": "Invalid passcode", + }) + return + } + + ciphertext, err := crypto.AesEncrypt([]byte(json.Secret)) + if err != nil { + api.ErrHandler(c, err) + return + } + + u := query.User + _, err = u.Where(u.ID.Eq(cUser.ID)).Update(u.OTPSecret, ciphertext) + if err != nil { + api.ErrHandler(c, err) + return + } + + recoveryCode := sha1.Sum(ciphertext) + + c.JSON(http.StatusOK, gin.H{ + "message": "ok", + "recovery_code": hex.EncodeToString(recoveryCode[:]), + }) } func ResetOTP(c *gin.Context) { - var json struct { - RecoveryCode string `json:"recovery_code"` - } - if !api.BindAndValid(c, &json) { - return - } - recoverCode, err := hex.DecodeString(json.RecoveryCode) - if err != nil { - api.ErrHandler(c, err) - return - } - cUser := api.CurrentUser(c) - k := sha1.Sum(cUser.OTPSecret) - if !bytes.Equal(k[:], recoverCode) { - c.JSON(http.StatusBadRequest, gin.H{ - "message": "Invalid recovery code", - }) - return - } - - u := query.Auth - _, err = u.Where(u.ID.Eq(cUser.ID)).UpdateSimple(u.OTPSecret.Null()) - if err != nil { - api.ErrHandler(c, err) - return - } - - c.JSON(http.StatusOK, gin.H{ - "message": "ok", - }) -} - -func OTPStatus(c *gin.Context) { - status := false - u, ok := c.Get("user") - if ok { - status = u.(*model.Auth).EnabledOTP() - } - c.JSON(http.StatusOK, gin.H{ - "status": status, - }) -} - -func SecureSessionStatus(c *gin.Context) { - u, ok := c.Get("user") - if !ok || !u.(*model.Auth).EnabledOTP() { - c.JSON(http.StatusOK, gin.H{ - "status": false, - }) - return - } - ssid := c.GetHeader("X-Secure-Session-ID") - if ssid == "" { - ssid = c.Query("X-Secure-Session-ID") - } - if ssid == "" { - c.JSON(http.StatusOK, gin.H{ - "status": false, - }) - return - } - - if user.VerifySecureSessionID(ssid, u.(*model.Auth).ID) { - c.JSON(http.StatusOK, gin.H{ - "status": true, - }) - return - } - - c.JSON(http.StatusOK, gin.H{ - "status": false, - }) -} - -func StartSecure2FASession(c *gin.Context) { - var json struct { - OTP string `json:"otp"` - RecoveryCode string `json:"recovery_code"` - } - if !api.BindAndValid(c, &json) { - return - } - u := api.CurrentUser(c) - if !u.EnabledOTP() { - c.JSON(http.StatusBadRequest, gin.H{ - "message": "User not configured with 2FA", - }) - return - } - - if json.OTP == "" && json.RecoveryCode == "" { - c.JSON(http.StatusBadRequest, LoginResponse{ - Message: "The user has enabled 2FA", - }) - return - } - - if err := user.VerifyOTP(u, json.OTP, json.RecoveryCode); err != nil { - c.JSON(http.StatusBadRequest, LoginResponse{ - Message: "Invalid 2FA or recovery code", - }) - return - } - - sessionId := user.SetSecureSessionID(u.ID) - - c.JSON(http.StatusOK, gin.H{ - "session_id": sessionId, - }) + var json struct { + RecoveryCode string `json:"recovery_code"` + } + if !api.BindAndValid(c, &json) { + return + } + recoverCode, err := hex.DecodeString(json.RecoveryCode) + if err != nil { + api.ErrHandler(c, err) + return + } + cUser := api.CurrentUser(c) + k := sha1.Sum(cUser.OTPSecret) + if !bytes.Equal(k[:], recoverCode) { + c.JSON(http.StatusBadRequest, gin.H{ + "message": "Invalid recovery code", + }) + return + } + + u := query.User + _, err = u.Where(u.ID.Eq(cUser.ID)).UpdateSimple(u.OTPSecret.Null()) + if err != nil { + api.ErrHandler(c, err) + return + } + + c.JSON(http.StatusOK, gin.H{ + "message": "ok", + }) } diff --git a/api/user/passkey.go b/api/user/passkey.go new file mode 100644 index 0000000..a79174d --- /dev/null +++ b/api/user/passkey.go @@ -0,0 +1,195 @@ +package user + +import ( + "encoding/base64" + "fmt" + "github.com/0xJacky/Nginx-UI/api" + "github.com/0xJacky/Nginx-UI/internal/cache" + "github.com/0xJacky/Nginx-UI/internal/cosy" + "github.com/0xJacky/Nginx-UI/internal/logger" + "github.com/0xJacky/Nginx-UI/internal/passkey" + "github.com/0xJacky/Nginx-UI/internal/user" + "github.com/0xJacky/Nginx-UI/model" + "github.com/0xJacky/Nginx-UI/query" + "github.com/gin-gonic/gin" + "github.com/go-webauthn/webauthn/webauthn" + "github.com/google/uuid" + "github.com/spf13/cast" + "gorm.io/gorm" + "net/http" + "strings" + "time" +) + +const passkeyTimeout = 30 * time.Second + +func buildCachePasskeyRegKey(id int) string { + return fmt.Sprintf("passkey-reg-%d", id) +} + +func GetPasskeyConfigStatus(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "status": passkey.Enabled(), + }) +} + +func BeginPasskeyRegistration(c *gin.Context) { + u := api.CurrentUser(c) + + webauthnInstance := passkey.GetInstance() + + options, sessionData, err := webauthnInstance.BeginRegistration(u) + if err != nil { + api.ErrHandler(c, err) + return + } + cache.Set(buildCachePasskeyRegKey(u.ID), sessionData, passkeyTimeout) + + c.JSON(http.StatusOK, options) +} + +func FinishPasskeyRegistration(c *gin.Context) { + cUser := api.CurrentUser(c) + webauthnInstance := passkey.GetInstance() + sessionDataBytes, ok := cache.Get(buildCachePasskeyRegKey(cUser.ID)) + if !ok { + api.ErrHandler(c, fmt.Errorf("session not found")) + return + } + + sessionData := sessionDataBytes.(*webauthn.SessionData) + credential, err := webauthnInstance.FinishRegistration(cUser, *sessionData, c.Request) + if err != nil { + api.ErrHandler(c, err) + return + } + cache.Del(buildCachePasskeyRegKey(cUser.ID)) + + rawId := strings.TrimRight(base64.StdEncoding.EncodeToString(credential.ID), "=") + passkeyName := c.Query("name") + p := query.Passkey + err = p.Create(&model.Passkey{ + UserID: cUser.ID, + Name: passkeyName, + RawID: rawId, + Credential: credential, + LastUsedAt: time.Now().Unix(), + }) + if err != nil { + api.ErrHandler(c, err) + return + } + + c.JSON(http.StatusOK, gin.H{ + "message": "ok", + }) +} + +func BeginPasskeyLogin(c *gin.Context) { + if !passkey.Enabled() { + api.ErrHandler(c, fmt.Errorf("WebAuthn settings are not configured")) + return + } + webauthnInstance := passkey.GetInstance() + options, sessionData, err := webauthnInstance.BeginDiscoverableLogin() + if err != nil { + api.ErrHandler(c, err) + return + } + sessionID := uuid.NewString() + cache.Set(sessionID, sessionData, passkeyTimeout) + + c.JSON(http.StatusOK, gin.H{ + "session_id": sessionID, + "options": options, + }) +} + +func FinishPasskeyLogin(c *gin.Context) { + if !passkey.Enabled() { + api.ErrHandler(c, fmt.Errorf("WebAuthn settings are not configured")) + return + } + sessionId := c.GetHeader("X-Passkey-Session-ID") + sessionDataBytes, ok := cache.Get(sessionId) + if !ok { + api.ErrHandler(c, fmt.Errorf("session not found")) + return + } + webauthnInstance := passkey.GetInstance() + sessionData := sessionDataBytes.(*webauthn.SessionData) + var outUser *model.User + _, err := webauthnInstance.FinishDiscoverableLogin( + func(rawID, userHandle []byte) (user webauthn.User, err error) { + encodeRawID := strings.TrimRight(base64.StdEncoding.EncodeToString(rawID), "=") + u := query.User + logger.Debug("[WebAuthn] Discoverable Login", cast.ToInt(string(userHandle))) + + p := query.Passkey + _, _ = p.Where(p.RawID.Eq(encodeRawID)).Updates(&model.Passkey{ + LastUsedAt: time.Now().Unix(), + }) + + outUser, err = u.FirstByID(cast.ToInt(string(userHandle))) + return outUser, err + }, *sessionData, c.Request) + if err != nil { + api.ErrHandler(c, err) + return + } + + b := query.BanIP + clientIP := c.ClientIP() + // login success, clear banned record + _, _ = b.Where(b.IP.Eq(clientIP)).Delete() + + logger.Info("[User Login]", outUser.Name) + token, err := user.GenerateJWT(outUser) + if err != nil { + c.JSON(http.StatusInternalServerError, LoginResponse{ + Message: err.Error(), + }) + return + } + + c.JSON(http.StatusOK, LoginResponse{ + Code: LoginSuccess, + Message: "ok", + Token: token, + // SecureSessionID: secureSessionID, + }) +} + +func GetPasskeyList(c *gin.Context) { + u := api.CurrentUser(c) + p := query.Passkey + passkeys, err := p.Where(p.UserID.Eq(u.ID)).Find() + if err != nil { + api.ErrHandler(c, err) + return + } + + if len(passkeys) == 0 { + passkeys = make([]*model.Passkey, 0) + } + + c.JSON(http.StatusOK, passkeys) +} + +func UpdatePasskey(c *gin.Context) { + u := api.CurrentUser(c) + cosy.Core[model.Passkey](c). + SetValidRules(gin.H{ + "name": "required", + }).GormScope(func(tx *gorm.DB) *gorm.DB { + return tx.Where("user_id", u.ID) + }).Modify() +} + +func DeletePasskey(c *gin.Context) { + u := api.CurrentUser(c) + cosy.Core[model.Passkey](c). + GormScope(func(tx *gorm.DB) *gorm.DB { + return tx.Where("user_id", u.ID) + }).PermanentlyDelete() +} diff --git a/api/user/router.go b/api/user/router.go index 67d9f1b..a53f34d 100644 --- a/api/user/router.go +++ b/api/user/router.go @@ -8,8 +8,13 @@ func InitAuthRouter(r *gin.RouterGroup) { r.POST("/login", Login) r.DELETE("/logout", Logout) + r.GET("/begin_passkey_login", BeginPasskeyLogin) + r.POST("/finish_passkey_login", FinishPasskeyLogin) + r.GET("/casdoor_uri", GetCasdoorUri) r.POST("/casdoor_callback", CasdoorCallback) + + r.GET("/passkeys/config", GetPasskeyConfigStatus) } func InitManageUserRouter(r *gin.RouterGroup) { @@ -22,11 +27,20 @@ func InitManageUserRouter(r *gin.RouterGroup) { } func InitUserRouter(r *gin.RouterGroup) { - r.GET("/otp_status", OTPStatus) + r.GET("/2fa_status", Get2FAStatus) + r.GET("/2fa_secure_session/status", SecureSessionStatus) + r.POST("/2fa_secure_session/otp", Start2FASecureSessionByOTP) + r.GET("/2fa_secure_session/passkey", BeginStart2FASecureSessionByPasskey) + r.POST("/2fa_secure_session/passkey", FinishStart2FASecureSessionByPasskey) + r.GET("/otp_secret", GenerateTOTP) r.POST("/otp_enroll", EnrollTOTP) r.POST("/otp_reset", ResetOTP) - r.GET("/otp_secure_session_status", SecureSessionStatus) - r.POST("/otp_secure_session", StartSecure2FASession) + r.GET("/begin_passkey_register", BeginPasskeyRegistration) + r.POST("/finish_passkey_register", FinishPasskeyRegistration) + + r.GET("/passkeys", GetPasskeyList) + r.POST("/passkeys/:id", UpdatePasskey) + r.DELETE("/passkeys/:id", DeletePasskey) } diff --git a/api/user/user.go b/api/user/user.go index bd8c4ac..4080dce 100644 --- a/api/user/user.go +++ b/api/user/user.go @@ -13,13 +13,13 @@ import ( ) func GetUsers(c *gin.Context) { - cosy.Core[model.Auth](c).SetFussy("name").PagingList() + cosy.Core[model.User](c).SetFussy("name").PagingList() } func GetUser(c *gin.Context) { id := cast.ToInt(c.Param("id")) - u := query.Auth + u := query.User user, err := u.FirstByID(id) @@ -43,7 +43,7 @@ func AddUser(c *gin.Context) { return } - u := query.Auth + u := query.User pwd, err := bcrypt.GenerateFromPassword([]byte(json.Password), bcrypt.DefaultCost) if err != nil { @@ -52,7 +52,7 @@ func AddUser(c *gin.Context) { } json.Password = string(pwd) - user := model.Auth{ + user := model.User{ Name: json.Name, Password: json.Password, } @@ -84,14 +84,14 @@ func EditUser(c *gin.Context) { return } - u := query.Auth + u := query.User user, err := u.FirstByID(userId) if err != nil { api.ErrHandler(c, err) return } - edit := &model.Auth{ + edit := &model.User{ Name: json.Name, } @@ -124,9 +124,9 @@ func DeleteUser(c *gin.Context) { }) return } - cosy.Core[model.Auth](c).Destroy() + cosy.Core[model.User](c).Destroy() } func RecoverUser(c *gin.Context) { - cosy.Core[model.Auth](c).Recover() + cosy.Core[model.User](c).Recover() } diff --git a/app.example.ini b/app.example.ini index ec86357..661accf 100644 --- a/app.example.ini +++ b/app.example.ini @@ -17,6 +17,7 @@ CertRenewalInterval = 7 RecursiveNameservers = SkipInstallation = false Name = +InsecureSkipVerify = false [nginx] AccessLogPath = /var/log/nginx/access.log @@ -59,3 +60,8 @@ MaxAttempts = 10 [crypto] Secret = secret2 + +[webauthn] +RPDisplayName = +RPID = +RPOrigins = diff --git a/app/components.d.ts b/app/components.d.ts index 55eaaa2..f6e12d6 100644 --- a/app/components.d.ts +++ b/app/components.d.ts @@ -81,6 +81,8 @@ declare module 'vue' { OTPInputOTPInput: typeof import('./src/components/OTPInput/OTPInput.vue')['default'] OTPOTPAuthorization: typeof import('./src/components/OTP/OTPAuthorization.vue')['default'] PageHeaderPageHeader: typeof import('./src/components/PageHeader/PageHeader.vue')['default'] + PasskeyPasskeyRegistration: typeof import('./src/components/Passkey/PasskeyRegistration.vue')['default'] + ReactiveFromNowReactiveFromNow: typeof import('./src/components/ReactiveFromNow/ReactiveFromNow.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] SensitiveStringSensitiveString: typeof import('./src/components/SensitiveString/SensitiveString.vue')['default'] diff --git a/app/package.json b/app/package.json index 0bb8979..1113c1b 100644 --- a/app/package.json +++ b/app/package.json @@ -14,6 +14,7 @@ "@0xjacky/vue-github-button": "^3.1.1", "@ant-design/icons-vue": "^7.0.1", "@formkit/auto-animate": "^0.8.2", + "@simplewebauthn/browser": "^10.0.0", "@vue/reactivity": "^3.5.5", "@vue/shared": "^3.5.5", "@vueuse/components": "^11.0.3", @@ -46,6 +47,7 @@ }, "devDependencies": { "@antfu/eslint-config-vue": "^0.43.1", + "@simplewebauthn/types": "^10.0.0", "@types/lodash": "^4.17.7", "@types/nprogress": "^0.2.3", "@types/sortablejs": "^1.15.8", @@ -67,7 +69,7 @@ "less": "^4.2.0", "postcss": "^8.4.47", "tailwindcss": "^3.4.11", - "typescript": "5.5.4", + "typescript": "5.3.3", "unplugin-auto-import": "^0.18.3", "unplugin-vue-components": "^0.27.4", "unplugin-vue-define-options": "^1.5.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 096a19e..180e105 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -13,10 +13,13 @@ importers: version: 3.1.1 '@ant-design/icons-vue': specifier: ^7.0.1 - version: 7.0.1(vue@3.5.5(typescript@5.5.4)) + version: 7.0.1(vue@3.5.5(typescript@5.3.3)) '@formkit/auto-animate': specifier: ^0.8.2 version: 0.8.2 + '@simplewebauthn/browser': + specifier: ^10.0.0 + version: 10.0.0 '@vue/reactivity': specifier: ^3.5.5 version: 3.5.5 @@ -25,13 +28,13 @@ importers: version: 3.5.5 '@vueuse/components': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.5(typescript@5.5.4)) + version: 11.0.3(vue@3.5.5(typescript@5.3.3)) '@vueuse/core': specifier: ^11.0.3 - version: 11.0.3(vue@3.5.5(typescript@5.5.4)) + version: 11.0.3(vue@3.5.5(typescript@5.3.3)) '@vueuse/integrations': specifier: ^11.0.3 - version: 11.0.3(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(sortablejs@1.15.3)(universal-cookie@7.2.0)(vue@3.5.5(typescript@5.5.4)) + version: 11.0.3(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(sortablejs@1.15.3)(universal-cookie@7.2.0)(vue@3.5.5(typescript@5.3.3)) '@xterm/addon-attach': specifier: ^0.11.0 version: 0.11.0(@xterm/xterm@5.5.0) @@ -43,7 +46,7 @@ importers: version: 5.5.0 ant-design-vue: specifier: ^4.2.4 - version: 4.2.4(vue@3.5.5(typescript@5.5.4)) + version: 4.2.4(vue@3.5.5(typescript@5.3.3)) apexcharts: specifier: ^3.53.0 version: 3.53.0 @@ -67,10 +70,10 @@ importers: version: 0.2.0 pinia: specifier: ^2.2.2 - version: 2.2.2(typescript@5.5.4)(vue@3.5.5(typescript@5.5.4)) + version: 2.2.2(typescript@5.3.3)(vue@3.5.5(typescript@5.3.3)) pinia-plugin-persistedstate: specifier: ^3.2.3 - version: 3.2.3(pinia@2.2.2(typescript@5.5.4)(vue@3.5.5(typescript@5.5.4))) + version: 3.2.3(pinia@2.2.2(typescript@5.3.3)(vue@3.5.5(typescript@5.3.3))) reconnecting-websocket: specifier: ^4.4.0 version: 4.4.0 @@ -85,29 +88,32 @@ importers: version: 0.3.6 vue: specifier: ^3.5.5 - version: 3.5.5(typescript@5.5.4) + version: 3.5.5(typescript@5.3.3) vue-router: specifier: ^4.4.5 - version: 4.4.5(vue@3.5.5(typescript@5.5.4)) + version: 4.4.5(vue@3.5.5(typescript@5.3.3)) vue3-ace-editor: specifier: 2.2.4 - version: 2.2.4(ace-builds@1.36.2)(vue@3.5.5(typescript@5.5.4)) + version: 2.2.4(ace-builds@1.36.2)(vue@3.5.5(typescript@5.3.3)) vue3-apexcharts: specifier: 1.5.3 - version: 1.5.3(apexcharts@3.53.0)(vue@3.5.5(typescript@5.5.4)) + version: 1.5.3(apexcharts@3.53.0)(vue@3.5.5(typescript@5.3.3)) vue3-gettext: specifier: 3.0.0-beta.6 - version: 3.0.0-beta.6(@vue/compiler-sfc@3.5.5)(typescript@5.5.4)(vue@3.5.5(typescript@5.5.4)) + version: 3.0.0-beta.6(@vue/compiler-sfc@3.5.5)(typescript@5.3.3)(vue@3.5.5(typescript@5.3.3)) vue3-otp-input: specifier: ^0.5.21 - version: 0.5.21(vue@3.5.5(typescript@5.5.4)) + version: 0.5.21(vue@3.5.5(typescript@5.3.3)) vuedraggable: specifier: ^4.1.0 - version: 4.1.0(vue@3.5.5(typescript@5.5.4)) + version: 4.1.0(vue@3.5.5(typescript@5.3.3)) devDependencies: '@antfu/eslint-config-vue': specifier: ^0.43.1 - version: 0.43.1(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.5.4) + version: 0.43.1(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.3.3) + '@simplewebauthn/types': + specifier: ^10.0.0 + version: 10.0.0 '@types/lodash': specifier: ^4.17.7 version: 4.17.7 @@ -119,16 +125,16 @@ importers: version: 1.15.8 '@typescript-eslint/eslint-plugin': specifier: ^6.21.0 - version: 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4) + version: 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3) '@typescript-eslint/parser': specifier: ^6.21.0 - version: 6.21.0(eslint@8.57.0)(typescript@5.5.4) + version: 6.21.0(eslint@8.57.0)(typescript@5.3.3) '@vitejs/plugin-vue': specifier: ^5.1.3 - version: 5.1.3(vite@5.4.5(@types/node@22.5.5)(less@4.2.0))(vue@3.5.5(typescript@5.5.4)) + version: 5.1.3(vite@5.4.5(@types/node@22.5.5)(less@4.2.0))(vue@3.5.5(typescript@5.3.3)) '@vitejs/plugin-vue-jsx': specifier: ^4.0.1 - version: 4.0.1(vite@5.4.5(@types/node@22.5.5)(less@4.2.0))(vue@3.5.5(typescript@5.5.4)) + version: 4.0.1(vite@5.4.5(@types/node@22.5.5)(less@4.2.0))(vue@3.5.5(typescript@5.3.3)) '@vue/compiler-sfc': specifier: ^3.5.5 version: 3.5.5 @@ -146,13 +152,13 @@ importers: version: 8.57.0 eslint-import-resolver-alias: specifier: ^1.1.2 - version: 1.1.2(eslint-plugin-import@2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0)) + version: 1.1.2(eslint-plugin-import@2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0)) eslint-import-resolver-typescript: specifier: ^3.6.3 - version: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0) + version: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0) eslint-plugin-import: specifier: ^2.30.0 - version: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0) + version: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0) eslint-plugin-regex: specifier: ^1.10.0 version: 1.10.0(eslint@8.57.0) @@ -172,26 +178,26 @@ importers: specifier: ^3.4.11 version: 3.4.11 typescript: - specifier: 5.5.4 - version: 5.5.4 + specifier: 5.3.3 + version: 5.3.3 unplugin-auto-import: specifier: ^0.18.3 - version: 0.18.3(@vueuse/core@11.0.3(vue@3.5.5(typescript@5.5.4)))(rollup@4.21.3)(webpack-sources@3.2.3) + version: 0.18.3(@vueuse/core@11.0.3(vue@3.5.5(typescript@5.3.3)))(rollup@4.21.3)(webpack-sources@3.2.3) unplugin-vue-components: specifier: ^0.27.4 - version: 0.27.4(@babel/parser@7.25.6)(rollup@4.21.3)(vue@3.5.5(typescript@5.5.4))(webpack-sources@3.2.3) + version: 0.27.4(@babel/parser@7.25.6)(rollup@4.21.3)(vue@3.5.5(typescript@5.3.3))(webpack-sources@3.2.3) unplugin-vue-define-options: specifier: ^1.5.1 - version: 1.5.1(rollup@4.21.3)(vue@3.5.5(typescript@5.5.4))(webpack-sources@3.2.3) + version: 1.5.1(rollup@4.21.3)(vue@3.5.5(typescript@5.3.3))(webpack-sources@3.2.3) vite: specifier: ^5.4.5 version: 5.4.5(@types/node@22.5.5)(less@4.2.0) vite-svg-loader: specifier: ^5.1.0 - version: 5.1.0(vue@3.5.5(typescript@5.5.4)) + version: 5.1.0(vue@3.5.5(typescript@5.3.3)) vue-tsc: specifier: ^2.1.6 - version: 2.1.6(typescript@5.5.4) + version: 2.1.6(typescript@5.3.3) packages: @@ -684,6 +690,12 @@ packages: '@simonwep/pickr@1.8.2': resolution: {integrity: sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==} + '@simplewebauthn/browser@10.0.0': + resolution: {integrity: sha512-hG0JMZD+LiLUbpQcAjS4d+t4gbprE/dLYop/CkE01ugU/9sKXflxV5s0DRjdz3uNMFecatRfb4ZLG3XvF8m5zg==} + + '@simplewebauthn/types@10.0.0': + resolution: {integrity: sha512-SFXke7xkgPRowY2E+8djKbdEznTVnD5R6GO7GPTthpHrokLvNKw8C3lFZypTxLI7KkCfGPfhtqB3d7OVGGa9jQ==} + '@stylistic/eslint-plugin-js@0.0.4': resolution: {integrity: sha512-W1rq2xxlFNhgZZJO+L59wtvlDI0xARYxx0WD8EeWNBO7NDybUSYSozCIcY9XvxQbTAsEXBjwqokeYm0crt7RxQ==} @@ -2908,6 +2920,11 @@ packages: resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} engines: {node: '>= 0.4'} + typescript@5.3.3: + resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + engines: {node: '>=14.17'} + hasBin: true + typescript@5.5.4: resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==} engines: {node: '>=14.17'} @@ -3178,20 +3195,20 @@ snapshots: '@ant-design/icons-svg@4.4.2': {} - '@ant-design/icons-vue@7.0.1(vue@3.5.5(typescript@5.5.4))': + '@ant-design/icons-vue@7.0.1(vue@3.5.5(typescript@5.3.3))': dependencies: '@ant-design/colors': 6.0.0 '@ant-design/icons-svg': 4.4.2 - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) - '@antfu/eslint-config-basic@0.43.1(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.5.4)': + '@antfu/eslint-config-basic@0.43.1(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.3.3)': dependencies: '@stylistic/eslint-plugin-js': 0.0.4 eslint: 8.57.0 - eslint-plugin-antfu: 0.43.1(eslint@8.57.0)(typescript@5.5.4) + eslint-plugin-antfu: 0.43.1(eslint@8.57.0)(typescript@5.3.3) eslint-plugin-eslint-comments: 3.2.0(eslint@8.57.0) eslint-plugin-html: 7.1.0 - eslint-plugin-import: eslint-plugin-i@2.28.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0) + eslint-plugin-import: eslint-plugin-i@2.28.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0) eslint-plugin-jsdoc: 46.10.1(eslint@8.57.0) eslint-plugin-jsonc: 2.16.0(eslint@8.57.0) eslint-plugin-markdown: 3.0.1(eslint@8.57.0) @@ -3199,7 +3216,7 @@ snapshots: eslint-plugin-no-only-tests: 3.3.0 eslint-plugin-promise: 6.6.0(eslint@8.57.0) eslint-plugin-unicorn: 48.0.1(eslint@8.57.0) - eslint-plugin-unused-imports: 3.2.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0) + eslint-plugin-unused-imports: 3.2.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0) eslint-plugin-yml: 1.14.0(eslint@8.57.0) jsonc-eslint-parser: 2.4.0 yaml-eslint-parser: 1.2.3 @@ -3211,25 +3228,25 @@ snapshots: - supports-color - typescript - '@antfu/eslint-config-ts@0.43.1(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.5.4)': + '@antfu/eslint-config-ts@0.43.1(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.3.3)': dependencies: - '@antfu/eslint-config-basic': 0.43.1(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.5.4) - '@stylistic/eslint-plugin-ts': 0.0.4(eslint@8.57.0)(typescript@5.5.4) - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4) - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.4) + '@antfu/eslint-config-basic': 0.43.1(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.3.3) + '@stylistic/eslint-plugin-ts': 0.0.4(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.3.3) eslint: 8.57.0 - eslint-plugin-jest: 27.9.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4) - typescript: 5.5.4 + eslint-plugin-jest: 27.9.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack - jest - supports-color - '@antfu/eslint-config-vue@0.43.1(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.5.4)': + '@antfu/eslint-config-vue@0.43.1(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.3.3)': dependencies: - '@antfu/eslint-config-basic': 0.43.1(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.5.4) - '@antfu/eslint-config-ts': 0.43.1(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.5.4) + '@antfu/eslint-config-basic': 0.43.1(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.3.3) + '@antfu/eslint-config-ts': 0.43.1(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0)(typescript@5.3.3) eslint: 8.57.0 eslint-plugin-vue: 9.28.0(eslint@8.57.0) local-pkg: 0.4.3 @@ -3651,6 +3668,12 @@ snapshots: core-js: 3.38.1 nanopop: 2.4.2 + '@simplewebauthn/browser@10.0.0': + dependencies: + '@simplewebauthn/types': 10.0.0 + + '@simplewebauthn/types@10.0.0': {} + '@stylistic/eslint-plugin-js@0.0.4': dependencies: acorn: 8.12.1 @@ -3660,15 +3683,15 @@ snapshots: esutils: 2.0.3 graphemer: 1.4.0 - '@stylistic/eslint-plugin-ts@0.0.4(eslint@8.57.0)(typescript@5.5.4)': + '@stylistic/eslint-plugin-ts@0.0.4(eslint@8.57.0)(typescript@5.3.3)': dependencies: '@stylistic/eslint-plugin-js': 0.0.4 '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.5.4) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) eslint: 8.57.0 graphemer: 1.4.0 - typescript: 5.5.4 + typescript: 5.3.3 transitivePeerDependencies: - supports-color @@ -3717,13 +3740,13 @@ snapshots: '@types/web-bluetooth@0.0.20': {} - '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4)': + '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.3.3) '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.5.4) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.7 eslint: 8.57.0 @@ -3731,22 +3754,22 @@ snapshots: ignore: 5.3.2 natural-compare: 1.4.0 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.5.4) + ts-api-utils: 1.3.0(typescript@5.3.3) optionalDependencies: - typescript: 5.5.4 + typescript: 5.3.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4)': + '@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3)': dependencies: '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.4) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3) '@typescript-eslint/visitor-keys': 6.21.0 debug: 4.3.7 eslint: 8.57.0 optionalDependencies: - typescript: 5.5.4 + typescript: 5.3.3 transitivePeerDependencies: - supports-color @@ -3760,15 +3783,15 @@ snapshots: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 - '@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.5.4)': + '@typescript-eslint/type-utils@6.21.0(eslint@8.57.0)(typescript@5.3.3)': dependencies: - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.4) - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) debug: 4.3.7 eslint: 8.57.0 - ts-api-utils: 1.3.0(typescript@5.5.4) + ts-api-utils: 1.3.0(typescript@5.3.3) optionalDependencies: - typescript: 5.5.4 + typescript: 5.3.3 transitivePeerDependencies: - supports-color @@ -3776,7 +3799,7 @@ snapshots: '@typescript-eslint/types@6.21.0': {} - '@typescript-eslint/typescript-estree@5.62.0(typescript@5.5.4)': + '@typescript-eslint/typescript-estree@5.62.0(typescript@5.3.3)': dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 @@ -3784,13 +3807,13 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.3 - tsutils: 3.21.0(typescript@5.5.4) + tsutils: 3.21.0(typescript@5.3.3) optionalDependencies: - typescript: 5.5.4 + typescript: 5.3.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@6.21.0(typescript@5.5.4)': + '@typescript-eslint/typescript-estree@6.21.0(typescript@5.3.3)': dependencies: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 @@ -3799,20 +3822,20 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.3 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.5.4) + ts-api-utils: 1.3.0(typescript@5.3.3) optionalDependencies: - typescript: 5.5.4 + typescript: 5.3.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.5.4)': + '@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.3.3)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.5.4) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.3) eslint: 8.57.0 eslint-scope: 5.1.1 semver: 7.6.3 @@ -3820,14 +3843,14 @@ snapshots: - supports-color - typescript - '@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.5.4)': + '@typescript-eslint/utils@6.21.0(eslint@8.57.0)(typescript@5.3.3)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.5.4) + '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.3.3) eslint: 8.57.0 semver: 7.6.3 transitivePeerDependencies: @@ -3846,20 +3869,20 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.5(@types/node@22.5.5)(less@4.2.0))(vue@3.5.5(typescript@5.5.4))': + '@vitejs/plugin-vue-jsx@4.0.1(vite@5.4.5(@types/node@22.5.5)(less@4.2.0))(vue@3.5.5(typescript@5.3.3))': dependencies: '@babel/core': 7.25.2 '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2) '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.25.2) vite: 5.4.5(@types/node@22.5.5)(less@4.2.0) - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@5.1.3(vite@5.4.5(@types/node@22.5.5)(less@4.2.0))(vue@3.5.5(typescript@5.5.4))': + '@vitejs/plugin-vue@5.1.3(vite@5.4.5(@types/node@22.5.5)(less@4.2.0))(vue@3.5.5(typescript@5.3.3))': dependencies: vite: 5.4.5(@types/node@22.5.5)(less@4.2.0) - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) '@volar/language-core@2.4.5': dependencies: @@ -3873,7 +3896,7 @@ snapshots: path-browserify: 1.0.1 vscode-uri: 3.0.8 - '@vue-macros/common@1.14.0(rollup@4.21.3)(vue@3.5.5(typescript@5.5.4))': + '@vue-macros/common@1.14.0(rollup@4.21.3)(vue@3.5.5(typescript@5.3.3))': dependencies: '@babel/types': 7.25.6 '@rollup/pluginutils': 5.1.0(rollup@4.21.3) @@ -3882,7 +3905,7 @@ snapshots: local-pkg: 0.5.0 magic-string-ast: 0.6.2 optionalDependencies: - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) transitivePeerDependencies: - rollup @@ -3953,7 +3976,7 @@ snapshots: '@vue/devtools-api@6.6.4': {} - '@vue/language-core@2.1.6(typescript@5.5.4)': + '@vue/language-core@2.1.6(typescript@5.3.3)': dependencies: '@volar/language-core': 2.4.5 '@vue/compiler-dom': 3.5.5 @@ -3964,7 +3987,7 @@ snapshots: muggle-string: 0.4.1 path-browserify: 1.0.1 optionalDependencies: - typescript: 5.5.4 + typescript: 5.3.3 '@vue/reactivity@3.5.5': dependencies: @@ -3982,40 +4005,40 @@ snapshots: '@vue/shared': 3.5.5 csstype: 3.1.3 - '@vue/server-renderer@3.5.5(vue@3.5.5(typescript@5.5.4))': + '@vue/server-renderer@3.5.5(vue@3.5.5(typescript@5.3.3))': dependencies: '@vue/compiler-ssr': 3.5.5 '@vue/shared': 3.5.5 - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) '@vue/shared@3.5.5': {} '@vue/tsconfig@0.5.1': {} - '@vueuse/components@11.0.3(vue@3.5.5(typescript@5.5.4))': + '@vueuse/components@11.0.3(vue@3.5.5(typescript@5.3.3))': dependencies: - '@vueuse/core': 11.0.3(vue@3.5.5(typescript@5.5.4)) - '@vueuse/shared': 11.0.3(vue@3.5.5(typescript@5.5.4)) - vue-demi: 0.14.10(vue@3.5.5(typescript@5.5.4)) + '@vueuse/core': 11.0.3(vue@3.5.5(typescript@5.3.3)) + '@vueuse/shared': 11.0.3(vue@3.5.5(typescript@5.3.3)) + vue-demi: 0.14.10(vue@3.5.5(typescript@5.3.3)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/core@11.0.3(vue@3.5.5(typescript@5.5.4))': + '@vueuse/core@11.0.3(vue@3.5.5(typescript@5.3.3))': dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 11.0.3 - '@vueuse/shared': 11.0.3(vue@3.5.5(typescript@5.5.4)) - vue-demi: 0.14.10(vue@3.5.5(typescript@5.5.4)) + '@vueuse/shared': 11.0.3(vue@3.5.5(typescript@5.3.3)) + vue-demi: 0.14.10(vue@3.5.5(typescript@5.3.3)) transitivePeerDependencies: - '@vue/composition-api' - vue - '@vueuse/integrations@11.0.3(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(sortablejs@1.15.3)(universal-cookie@7.2.0)(vue@3.5.5(typescript@5.5.4))': + '@vueuse/integrations@11.0.3(async-validator@4.2.5)(axios@1.7.7)(nprogress@0.2.0)(sortablejs@1.15.3)(universal-cookie@7.2.0)(vue@3.5.5(typescript@5.3.3))': dependencies: - '@vueuse/core': 11.0.3(vue@3.5.5(typescript@5.5.4)) - '@vueuse/shared': 11.0.3(vue@3.5.5(typescript@5.5.4)) - vue-demi: 0.14.10(vue@3.5.5(typescript@5.5.4)) + '@vueuse/core': 11.0.3(vue@3.5.5(typescript@5.3.3)) + '@vueuse/shared': 11.0.3(vue@3.5.5(typescript@5.3.3)) + vue-demi: 0.14.10(vue@3.5.5(typescript@5.3.3)) optionalDependencies: async-validator: 4.2.5 axios: 1.7.7 @@ -4028,9 +4051,9 @@ snapshots: '@vueuse/metadata@11.0.3': {} - '@vueuse/shared@11.0.3(vue@3.5.5(typescript@5.5.4))': + '@vueuse/shared@11.0.3(vue@3.5.5(typescript@5.3.3))': dependencies: - vue-demi: 0.14.10(vue@3.5.5(typescript@5.5.4)) + vue-demi: 0.14.10(vue@3.5.5(typescript@5.3.3)) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -4076,10 +4099,10 @@ snapshots: ansi-styles@6.2.1: {} - ant-design-vue@4.2.4(vue@3.5.5(typescript@5.5.4)): + ant-design-vue@4.2.4(vue@3.5.5(typescript@5.3.3)): dependencies: '@ant-design/colors': 6.0.0 - '@ant-design/icons-vue': 7.0.1(vue@3.5.5(typescript@5.5.4)) + '@ant-design/icons-vue': 7.0.1(vue@3.5.5(typescript@5.3.3)) '@babel/runtime': 7.25.6 '@ctrl/tinycolor': 3.6.1 '@emotion/hash': 0.9.2 @@ -4098,8 +4121,8 @@ snapshots: shallow-equal: 1.2.1 stylis: 4.3.4 throttle-debounce: 5.0.2 - vue: 3.5.5(typescript@5.5.4) - vue-types: 3.0.2(vue@3.5.5(typescript@5.5.4)) + vue: 3.5.5(typescript@5.3.3) + vue-types: 3.0.2(vue@3.5.5(typescript@5.3.3)) warning: 4.0.3 any-promise@1.3.0: {} @@ -4347,14 +4370,14 @@ snapshots: core-js@3.38.1: {} - cosmiconfig@9.0.0(typescript@5.5.4): + cosmiconfig@9.0.0(typescript@5.3.3): dependencies: env-paths: 2.2.1 import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 optionalDependencies: - typescript: 5.5.4 + typescript: 5.3.3 crc-32@1.2.2: {} @@ -4624,9 +4647,9 @@ snapshots: eslint: 8.57.0 semver: 7.6.3 - eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0)): + eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0)): dependencies: - eslint-plugin-import: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0) + eslint-plugin-import: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0) eslint-import-resolver-node@0.3.9: dependencies: @@ -4636,39 +4659,39 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0): + eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0): dependencies: '@nolyfill/is-core-module': 1.0.39 debug: 4.3.7 enhanced-resolve: 5.17.1 eslint: 8.57.0 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0) fast-glob: 3.3.2 get-tsconfig: 4.8.1 is-bun-module: 1.2.1 is-glob: 4.0.3 optionalDependencies: - eslint-plugin-import: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0) + eslint-plugin-import: 2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0) transitivePeerDependencies: - '@typescript-eslint/parser' - eslint-import-resolver-node - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.11.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0): + eslint-module-utils@2.11.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.3.3) eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0) transitivePeerDependencies: - supports-color - eslint-plugin-antfu@0.43.1(eslint@8.57.0)(typescript@5.5.4): + eslint-plugin-antfu@0.43.1(eslint@8.57.0)(typescript@5.3.3): dependencies: - '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/utils': 6.21.0(eslint@8.57.0)(typescript@5.3.3) transitivePeerDependencies: - eslint - supports-color @@ -4691,13 +4714,13 @@ snapshots: dependencies: htmlparser2: 8.0.2 - eslint-plugin-i@2.28.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0): + eslint-plugin-i@2.28.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0): dependencies: debug: 3.2.7 doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0) get-tsconfig: 4.8.1 is-glob: 4.0.3 minimatch: 3.1.2 @@ -4709,7 +4732,7 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-plugin-import@2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0): + eslint-plugin-import@2.30.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0): dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.8 @@ -4720,7 +4743,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint-plugin-import@2.30.0)(eslint@8.57.0))(eslint@8.57.0) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -4731,18 +4754,18 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.3.3) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack - supports-color - eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4): + eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3): dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.3.3) eslint: 8.57.0 optionalDependencies: - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3) transitivePeerDependencies: - supports-color - typescript @@ -4828,12 +4851,12 @@ snapshots: semver: 7.6.3 strip-indent: 3.0.0 - eslint-plugin-unused-imports@3.2.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0): + eslint-plugin-unused-imports@3.2.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0): dependencies: eslint: 8.57.0 eslint-rule-composer: 0.3.0 optionalDependencies: - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4) + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.3.3))(eslint@8.57.0)(typescript@5.3.3) eslint-plugin-vue@9.28.0(eslint@8.57.0): dependencies: @@ -5054,7 +5077,7 @@ snapshots: glob: 7.2.3 parse5: 6.0.1 pofile: 1.0.11 - typescript: 5.5.4 + typescript: 5.3.3 github-buttons@2.29.0: {} @@ -5659,17 +5682,17 @@ snapshots: pify@4.0.1: {} - pinia-plugin-persistedstate@3.2.3(pinia@2.2.2(typescript@5.5.4)(vue@3.5.5(typescript@5.5.4))): + pinia-plugin-persistedstate@3.2.3(pinia@2.2.2(typescript@5.3.3)(vue@3.5.5(typescript@5.3.3))): dependencies: - pinia: 2.2.2(typescript@5.5.4)(vue@3.5.5(typescript@5.5.4)) + pinia: 2.2.2(typescript@5.3.3)(vue@3.5.5(typescript@5.3.3)) - pinia@2.2.2(typescript@5.5.4)(vue@3.5.5(typescript@5.5.4)): + pinia@2.2.2(typescript@5.3.3)(vue@3.5.5(typescript@5.3.3)): dependencies: '@vue/devtools-api': 6.6.4 - vue: 3.5.5(typescript@5.5.4) - vue-demi: 0.14.10(vue@3.5.5(typescript@5.5.4)) + vue: 3.5.5(typescript@5.3.3) + vue-demi: 0.14.10(vue@3.5.5(typescript@5.3.3)) optionalDependencies: - typescript: 5.5.4 + typescript: 5.3.3 pirates@4.0.6: {} @@ -6103,9 +6126,9 @@ snapshots: dependencies: is-number: 7.0.0 - ts-api-utils@1.3.0(typescript@5.5.4): + ts-api-utils@1.3.0(typescript@5.3.3): dependencies: - typescript: 5.5.4 + typescript: 5.3.3 ts-interface-checker@0.1.13: {} @@ -6120,10 +6143,10 @@ snapshots: tslib@2.7.0: {} - tsutils@3.21.0(typescript@5.5.4): + tsutils@3.21.0(typescript@5.3.3): dependencies: tslib: 1.14.1 - typescript: 5.5.4 + typescript: 5.3.3 type-check@0.4.0: dependencies: @@ -6167,6 +6190,8 @@ snapshots: is-typed-array: 1.1.13 possible-typed-array-names: 1.0.0 + typescript@5.3.3: {} + typescript@5.5.4: {} typical@4.0.0: {} @@ -6210,7 +6235,7 @@ snapshots: '@types/cookie': 0.6.0 cookie: 0.6.0 - unplugin-auto-import@0.18.3(@vueuse/core@11.0.3(vue@3.5.5(typescript@5.5.4)))(rollup@4.21.3)(webpack-sources@3.2.3): + unplugin-auto-import@0.18.3(@vueuse/core@11.0.3(vue@3.5.5(typescript@5.3.3)))(rollup@4.21.3)(webpack-sources@3.2.3): dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.0(rollup@4.21.3) @@ -6221,12 +6246,12 @@ snapshots: unimport: 3.12.0(rollup@4.21.3)(webpack-sources@3.2.3) unplugin: 1.14.1(webpack-sources@3.2.3) optionalDependencies: - '@vueuse/core': 11.0.3(vue@3.5.5(typescript@5.5.4)) + '@vueuse/core': 11.0.3(vue@3.5.5(typescript@5.3.3)) transitivePeerDependencies: - rollup - webpack-sources - unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(rollup@4.21.3)(vue@3.5.5(typescript@5.5.4))(webpack-sources@3.2.3): + unplugin-vue-components@0.27.4(@babel/parser@7.25.6)(rollup@4.21.3)(vue@3.5.5(typescript@5.3.3))(webpack-sources@3.2.3): dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.0(rollup@4.21.3) @@ -6238,7 +6263,7 @@ snapshots: minimatch: 9.0.5 mlly: 1.7.1 unplugin: 1.14.1(webpack-sources@3.2.3) - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) optionalDependencies: '@babel/parser': 7.25.6 transitivePeerDependencies: @@ -6246,9 +6271,9 @@ snapshots: - supports-color - webpack-sources - unplugin-vue-define-options@1.5.1(rollup@4.21.3)(vue@3.5.5(typescript@5.5.4))(webpack-sources@3.2.3): + unplugin-vue-define-options@1.5.1(rollup@4.21.3)(vue@3.5.5(typescript@5.3.3))(webpack-sources@3.2.3): dependencies: - '@vue-macros/common': 1.14.0(rollup@4.21.3)(vue@3.5.5(typescript@5.5.4)) + '@vue-macros/common': 1.14.0(rollup@4.21.3)(vue@3.5.5(typescript@5.3.3)) ast-walker-scope: 0.6.2 unplugin: 1.14.1(webpack-sources@3.2.3) transitivePeerDependencies: @@ -6287,10 +6312,10 @@ snapshots: node-object-hash: 3.0.0 typescript: 5.5.4 - vite-svg-loader@5.1.0(vue@3.5.5(typescript@5.5.4)): + vite-svg-loader@5.1.0(vue@3.5.5(typescript@5.3.3)): dependencies: svgo: 3.3.2 - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) vite@5.4.5(@types/node@22.5.5)(less@4.2.0): dependencies: @@ -6304,9 +6329,9 @@ snapshots: vscode-uri@3.0.8: {} - vue-demi@0.14.10(vue@3.5.5(typescript@5.5.4)): + vue-demi@0.14.10(vue@3.5.5(typescript@5.3.3)): dependencies: - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) vue-eslint-parser@9.4.3(eslint@8.57.0): dependencies: @@ -6321,67 +6346,67 @@ snapshots: transitivePeerDependencies: - supports-color - vue-router@4.4.5(vue@3.5.5(typescript@5.5.4)): + vue-router@4.4.5(vue@3.5.5(typescript@5.3.3)): dependencies: '@vue/devtools-api': 6.6.4 - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) - vue-tsc@2.1.6(typescript@5.5.4): + vue-tsc@2.1.6(typescript@5.3.3): dependencies: '@volar/typescript': 2.4.5 - '@vue/language-core': 2.1.6(typescript@5.5.4) + '@vue/language-core': 2.1.6(typescript@5.3.3) semver: 7.6.3 - typescript: 5.5.4 + typescript: 5.3.3 - vue-types@3.0.2(vue@3.5.5(typescript@5.5.4)): + vue-types@3.0.2(vue@3.5.5(typescript@5.3.3)): dependencies: is-plain-object: 3.0.1 - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) - vue3-ace-editor@2.2.4(ace-builds@1.36.2)(vue@3.5.5(typescript@5.5.4)): + vue3-ace-editor@2.2.4(ace-builds@1.36.2)(vue@3.5.5(typescript@5.3.3)): dependencies: ace-builds: 1.36.2 resize-observer-polyfill: 1.5.1 - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) - vue3-apexcharts@1.5.3(apexcharts@3.53.0)(vue@3.5.5(typescript@5.5.4)): + vue3-apexcharts@1.5.3(apexcharts@3.53.0)(vue@3.5.5(typescript@5.3.3)): dependencies: apexcharts: 3.53.0 - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) - vue3-gettext@3.0.0-beta.6(@vue/compiler-sfc@3.5.5)(typescript@5.5.4)(vue@3.5.5(typescript@5.5.4)): + vue3-gettext@3.0.0-beta.6(@vue/compiler-sfc@3.5.5)(typescript@5.3.3)(vue@3.5.5(typescript@5.3.3)): dependencies: '@vue/compiler-sfc': 3.5.5 chalk: 4.1.2 command-line-args: 5.2.1 - cosmiconfig: 9.0.0(typescript@5.5.4) + cosmiconfig: 9.0.0(typescript@5.3.3) gettext-extractor: 3.8.0 glob: 10.4.5 parse5: 6.0.1 parse5-htmlparser2-tree-adapter: 6.0.1 pofile: 1.1.4 - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) transitivePeerDependencies: - typescript - vue3-otp-input@0.5.21(vue@3.5.5(typescript@5.5.4)): + vue3-otp-input@0.5.21(vue@3.5.5(typescript@5.3.3)): dependencies: - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) - vue@3.5.5(typescript@5.5.4): + vue@3.5.5(typescript@5.3.3): dependencies: '@vue/compiler-dom': 3.5.5 '@vue/compiler-sfc': 3.5.5 '@vue/runtime-dom': 3.5.5 - '@vue/server-renderer': 3.5.5(vue@3.5.5(typescript@5.5.4)) + '@vue/server-renderer': 3.5.5(vue@3.5.5(typescript@5.3.3)) '@vue/shared': 3.5.5 optionalDependencies: - typescript: 5.5.4 + typescript: 5.3.3 - vuedraggable@4.1.0(vue@3.5.5(typescript@5.5.4)): + vuedraggable@4.1.0(vue@3.5.5(typescript@5.3.3)): dependencies: sortablejs: 1.14.0 - vue: 3.5.5(typescript@5.5.4) + vue: 3.5.5(typescript@5.3.3) warning@4.0.3: dependencies: diff --git a/app/src/api/2fa.ts b/app/src/api/2fa.ts new file mode 100644 index 0000000..f0e4f17 --- /dev/null +++ b/app/src/api/2fa.ts @@ -0,0 +1,37 @@ +import type { AuthenticationResponseJSON } from '@simplewebauthn/types' +import http from '@/lib/http' + +export interface TwoFAStatusResponse { + enabled: boolean + otp_status: boolean + passkey_status: boolean +} + +const twoFA = { + status(): Promise { + return http.get('/2fa_status') + }, + start_secure_session_by_otp(passcode: string, recovery_code: string): Promise<{ session_id: string }> { + return http.post('/2fa_secure_session/otp', { + otp: passcode, + recovery_code, + }) + }, + secure_session_status(): Promise<{ status: boolean }> { + return http.get('/2fa_secure_session/status') + }, + begin_start_secure_session_by_passkey() { + return http.get('/2fa_secure_session/passkey') + }, + finish_start_secure_session_by_passkey(data: { session_id: string; options: AuthenticationResponseJSON }): Promise<{ + session_id: string + }> { + return http.post('/2fa_secure_session/passkey', data.options, { + headers: { + 'X-Passkey-Session-Id': data.session_id, + }, + }) + }, +} + +export default twoFA diff --git a/app/src/api/auth.ts b/app/src/api/auth.ts index b214458..4203ceb 100644 --- a/app/src/api/auth.ts +++ b/app/src/api/auth.ts @@ -1,3 +1,4 @@ +import type { AuthenticationResponseJSON } from '@simplewebauthn/types' import http from '@/lib/http' import { useUserStore } from '@/pinia' @@ -37,6 +38,16 @@ const auth = { async get_casdoor_uri(): Promise<{ uri: string }> { return http.get('/casdoor_uri') }, + begin_passkey_login() { + return http.get('/begin_passkey_login') + }, + finish_passkey_login(data: { session_id: string; options: AuthenticationResponseJSON }) { + return http.post('/finish_passkey_login', data.options, { + headers: { + 'X-Passkey-Session-Id': data.session_id, + }, + }) + }, } export default auth diff --git a/app/src/api/otp.ts b/app/src/api/otp.ts index 60c71ad..75672a0 100644 --- a/app/src/api/otp.ts +++ b/app/src/api/otp.ts @@ -6,9 +6,6 @@ export interface OTPGenerateSecretResponse { } const otp = { - status(): Promise<{ status: boolean }> { - return http.get('/otp_status') - }, generate_secret(): Promise { return http.get('/otp_secret') }, @@ -18,15 +15,6 @@ const otp = { reset(recovery_code: string) { return http.post('/otp_reset', { recovery_code }) }, - start_secure_session(passcode: string, recovery_code: string): Promise<{ session_id: string }> { - return http.post('/otp_secure_session', { - otp: passcode, - recovery_code, - }) - }, - secure_session_status() { - return http.get('/otp_secure_session_status') - }, } export default otp diff --git a/app/src/api/passkey.ts b/app/src/api/passkey.ts new file mode 100644 index 0000000..90895bc --- /dev/null +++ b/app/src/api/passkey.ts @@ -0,0 +1,36 @@ +import type { RegistrationResponseJSON } from '@simplewebauthn/types' +import http from '@/lib/http' +import type { ModelBase } from '@/api/curd' + +export interface Passkey extends ModelBase { + name: string + user_id: string + raw_id: string +} + +const passkey = { + begin_registration() { + return http.get('/begin_passkey_register') + }, + finish_registration(attestationResponse: RegistrationResponseJSON, passkeyName: string) { + return http.post('/finish_passkey_register', attestationResponse, { + params: { + name: passkeyName, + }, + }) + }, + get_list() { + return http.get('/passkeys') + }, + update(passkeyId: number, data: Passkey) { + return http.post(`/passkeys/${passkeyId}`, data) + }, + remove(passkeyId: number) { + return http.delete(`/passkeys/${passkeyId}`) + }, + get_config_status(): Promise<{ status: boolean }> { + return http.get('/passkeys/config') + }, +} + +export default passkey diff --git a/app/src/components/2FA/Authorization.vue b/app/src/components/2FA/Authorization.vue new file mode 100644 index 0000000..d572e55 --- /dev/null +++ b/app/src/components/2FA/Authorization.vue @@ -0,0 +1,136 @@ + + + + + diff --git a/app/src/components/OTP/useOTPModal.ts b/app/src/components/2FA/use2FAModal.ts similarity index 68% rename from app/src/components/OTP/useOTPModal.ts rename to app/src/components/2FA/use2FAModal.ts index 637cf5a..c75dd86 100644 --- a/app/src/components/OTP/useOTPModal.ts +++ b/app/src/components/2FA/use2FAModal.ts @@ -1,12 +1,12 @@ import { createVNode, render } from 'vue' import { Modal, message } from 'ant-design-vue' import { useCookies } from '@vueuse/integrations/useCookies' -import OTPAuthorization from '@/components/OTP/OTPAuthorization.vue' -import otp from '@/api/otp' +import Authorization from '@/components/2FA/Authorization.vue' +import twoFA from '@/api/2fa' import { useUserStore } from '@/pinia' -const useOTPModal = () => { - const refOTPAuthorization = ref() +const use2FAModal = () => { + const refOTPAuthorization = ref() const randomId = Math.random().toString(36).substring(2, 8) const { secureSessionId } = storeToRefs(useUserStore()) @@ -22,11 +22,11 @@ const useOTPModal = () => { } const open = async (): Promise => { - const { status } = await otp.status() - const { status: secureSessionStatus } = await otp.secure_session_status() + const twoFAStatus = await twoFA.status() + const { status: secureSessionStatus } = await twoFA.secure_session_status() return new Promise((resolve, reject) => { - if (!status) { + if (!twoFAStatus.enabled) { resolve('') return @@ -50,12 +50,16 @@ const useOTPModal = () => { container = null } - const verify = (passcode: string, recovery: string) => { - otp.start_secure_session(passcode, recovery).then(async r => { - cookies.set('secure_session_id', r.session_id, { maxAge: 60 * 3 }) - close() - secureSessionId.value = r.session_id - resolve(r.session_id) + const setSessionId = (sessionId: string) => { + cookies.set('secure_session_id', sessionId, { maxAge: 60 * 3 }) + close() + secureSessionId.value = sessionId + resolve(sessionId) + } + + const verifyOTP = (passcode: string, recovery: string) => { + twoFA.start_secure_session_by_otp(passcode, recovery).then(async r => { + setSessionId(r.session_id) }).catch(async () => { refOTPAuthorization.value?.clearInput() await message.error($gettext('Invalid passcode or recovery code')) @@ -76,11 +80,13 @@ const useOTPModal = () => { }, }, { default: () => h( - OTPAuthorization, + Authorization, { ref: refOTPAuthorization, + twoFAStatus, class: 'mt-3', - onOnSubmit: verify, + onSubmitOTP: verifyOTP, + onSubmitSecureSessionID: setSessionId, }, ), }) @@ -92,4 +98,4 @@ const useOTPModal = () => { return { open } } -export default useOTPModal +export default use2FAModal diff --git a/app/src/components/CodeEditor/CodeEditor.vue b/app/src/components/CodeEditor/CodeEditor.vue index 3c87517..ee6fde1 100644 --- a/app/src/components/CodeEditor/CodeEditor.vue +++ b/app/src/components/CodeEditor/CodeEditor.vue @@ -40,7 +40,7 @@ ace.config.setModuleUrl('ace/ext/searchbox', extSearchboxUrl) /> - diff --git a/app/src/components/ReactiveFromNow/ReactiveFromNow.vue b/app/src/components/ReactiveFromNow/ReactiveFromNow.vue new file mode 100644 index 0000000..1ae98e4 --- /dev/null +++ b/app/src/components/ReactiveFromNow/ReactiveFromNow.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/app/src/components/SetLanguage/SetLanguage.vue b/app/src/components/SetLanguage/SetLanguage.vue index c1f0357..954776b 100644 --- a/app/src/components/SetLanguage/SetLanguage.vue +++ b/app/src/components/SetLanguage/SetLanguage.vue @@ -1,10 +1,19 @@