Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
hexbee
Cloudreve
提交
ef42ec39
C
Cloudreve
项目概览
hexbee
/
Cloudreve
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
Cloudreve
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
ef42ec39
编写于
2月 23, 2020
作者:
H
HFO4
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Modify: create Web Authn instance when needed
上级
ce2a70df
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
34 addition
and
35 deletion
+34
-35
bootstrap/init.go
bootstrap/init.go
+0
-2
pkg/authn/auth.go
pkg/authn/auth.go
+3
-14
pkg/authn/auth_test.go
pkg/authn/auth_test.go
+3
-4
routers/controllers/admin.go
routers/controllers/admin.go
+0
-3
routers/controllers/user.go
routers/controllers/user.go
+28
-12
未找到文件。
bootstrap/init.go
浏览文件 @
ef42ec39
...
...
@@ -4,7 +4,6 @@ import (
model
"github.com/HFO4/cloudreve/models"
"github.com/HFO4/cloudreve/pkg/aria2"
"github.com/HFO4/cloudreve/pkg/auth"
"github.com/HFO4/cloudreve/pkg/authn"
"github.com/HFO4/cloudreve/pkg/cache"
"github.com/HFO4/cloudreve/pkg/conf"
"github.com/HFO4/cloudreve/pkg/crontab"
...
...
@@ -24,7 +23,6 @@ func Init(path string) {
cache
.
Init
()
if
conf
.
SystemConfig
.
Mode
==
"master"
{
model
.
Init
()
authn
.
Init
()
task
.
Init
()
aria2
.
Init
()
email
.
Init
()
...
...
pkg/authn/auth.go
浏览文件 @
ef42ec39
...
...
@@ -2,26 +2,15 @@ package authn
import
(
model
"github.com/HFO4/cloudreve/models"
"github.com/HFO4/cloudreve/pkg/util"
"github.com/duo-labs/webauthn/webauthn"
"sync"
)
var
AuthnInstance
*
webauthn
.
WebAuthn
var
Lock
sync
.
RWMutex
// Init 初始化webauthn
func
Init
()
{
Lock
.
Lock
()
defer
Lock
.
Unlock
()
var
err
error
// NewAuthnInstance 新建Authn实例
func
NewAuthnInstance
()
(
*
webauthn
.
WebAuthn
,
error
)
{
base
:=
model
.
GetSiteURL
()
AuthnInstance
,
err
=
webauthn
.
New
(
&
webauthn
.
Config
{
return
webauthn
.
New
(
&
webauthn
.
Config
{
RPDisplayName
:
model
.
GetSettingByName
(
"siteName"
),
// Display Name for your site
RPID
:
base
.
Hostname
(),
// Generally the FQDN for your site
RPOrigin
:
base
.
String
(),
// The origin URL for WebAuthn requests
})
if
err
!=
nil
{
util
.
Log
()
.
Error
(
"无法初始化WebAuthn, %s"
,
err
)
}
}
pkg/authn/auth_test.go
浏览文件 @
ef42ec39
...
...
@@ -10,8 +10,7 @@ func TestInit(t *testing.T) {
asserts
:=
assert
.
New
(
t
)
cache
.
Set
(
"setting_siteURL"
,
"http://cloudreve.org"
,
0
)
cache
.
Set
(
"setting_siteName"
,
"Cloudreve"
,
0
)
asserts
.
NotPanics
(
func
()
{
Init
()
})
asserts
.
NotNil
(
AuthnInstance
)
res
,
err
:=
NewAuthnInstance
()
asserts
.
NotNil
(
res
)
asserts
.
NoError
(
err
)
}
routers/controllers/admin.go
浏览文件 @
ef42ec39
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
{})
...
...
routers/controllers/user.go
浏览文件 @
ef42ec39
...
...
@@ -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
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录