wsy182/Cloudreve
1
0
Fork 0
mirror of https://github.com/halejohn/Cloudreve.git synced 2026-01-26 09:34:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modify: create Web Authn instance when needed

Browse Source
This commit is contained in:
HFO4
2020-02-23 15:50:41 +08:00
parent ce2a70df68
commit ef42ec3927
5 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
routers/controllers/admin.go
View File

@@ -1,7 +1,6 @@
package controllers
import (
"github.com/HFO4/cloudreve/pkg/authn"
"github.com/HFO4/cloudreve/pkg/request"
"github.com/HFO4/cloudreve/pkg/serializer"
"github.com/HFO4/cloudreve/service/admin"
@@ -64,8 +63,6 @@ func AdminGetGroups(c *gin.Context) {
func AdminReloadService(c *gin.Context) {
service := c.Param("service")
switch service {
case "authn":
authn.Init()
}
c.JSON(200, serializer.Response{})

40
routers/controllers/user.go
View File

@@ -23,9 +23,13 @@ func StartLoginAuthn(c *gin.Context) {
return
}
authn.Lock.RLock()
options, sessionData, err := authn.AuthnInstance.BeginLogin(expectedUser)
authn.Lock.RUnlock()
instance, err := authn.NewAuthnInstance()
if err != nil {
c.JSON(200, serializer.Err(serializer.CodeInternalSetting, "无法初始化Authn", err))
return
}
options, sessionData, err := instance.BeginLogin(expectedUser)
if err != nil {
c.JSON(200, ErrorResponse(err))
@@ -58,9 +62,13 @@ func FinishLoginAuthn(c *gin.Context) {
var sessionData webauthn.SessionData
err = json.Unmarshal(sessionDataJSON, &sessionData)
authn.Lock.RLock()
_, err = authn.AuthnInstance.FinishLogin(expectedUser, sessionData, c.Request)
authn.Lock.RUnlock()
instance, err := authn.NewAuthnInstance()
if err != nil {
c.JSON(200, serializer.Err(serializer.CodeInternalSetting, "无法初始化Authn", err))
return
}
_, err = instance.FinishLogin(expectedUser, sessionData, c.Request)
if err != nil {
c.JSON(200, serializer.Err(401, "登录验证失败", err))
@@ -77,9 +85,13 @@ func FinishLoginAuthn(c *gin.Context) {
func StartRegAuthn(c *gin.Context) {
currUser := CurrentUser(c)
authn.Lock.RLock()
options, sessionData, err := authn.AuthnInstance.BeginRegistration(currUser)
authn.Lock.RUnlock()
instance, err := authn.NewAuthnInstance()
if err != nil {
c.JSON(200, serializer.Err(serializer.CodeInternalSetting, "无法初始化Authn", err))
return
}
options, sessionData, err := instance.BeginRegistration(currUser)
if err != nil {
c.JSON(200, ErrorResponse(err))
@@ -106,9 +118,13 @@ func FinishRegAuthn(c *gin.Context) {
var sessionData webauthn.SessionData
err := json.Unmarshal(sessionDataJSON, &sessionData)
authn.Lock.RLock()
credential, err := authn.AuthnInstance.FinishRegistration(currUser, sessionData, c.Request)
authn.Lock.RUnlock()
instance, err := authn.NewAuthnInstance()
if err != nil {
c.JSON(200, serializer.Err(serializer.CodeInternalSetting, "无法初始化Authn", err))
return
}
credential, err := instance.FinishRegistration(currUser, sessionData, c.Request)
if err != nil {
c.JSON(200, ErrorResponse(err))