zishuo/MirageServer
1
0
Fork 0
mirror of https://github.com/MirageNetwork/MirageServer.git synced 2025-10-30 03:11:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改:user uniqIndex name-> name+orgName导致的联合唯一键使用

Browse Source
This commit is contained in:
chuanh
2023-03-15 10:09:50 +00:00
parent 23aed99581
commit 58c8f44eee
11 changed files with 162 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
controller/console_api_keys.go
View File

@@ -57,13 +57,13 @@ func (h *Mirage) CAPIGetKeys(
w http.ResponseWriter,
r *http.Request,
) {
userName := h.verifyTokenIDandGetUser(w, r)
if userName == "" {
user := h.verifyTokenIDandGetUser(w, r)
if user.CheckEmpty() {
h.doAPIResponse(w, "用户信息核对失败", nil)
return
}
authKeys, err := h.ListPreAuthKeys(userName)
authKeys, err := h.ListPreAuthKeys(user.ID)
if err != nil {
h.doAPIResponse(w, "授权密钥查询失败", nil)
return
@@ -109,8 +109,8 @@ func (h *Mirage) CAPIPostKeys(
w http.ResponseWriter,
r *http.Request,
) {
userName := h.verifyTokenIDandGetUser(w, r)
if userName == "" {
user := h.verifyTokenIDandGetUser(w, r)
if user.CheckEmpty() {
h.doAPIResponse(w, "用户信息核对失败", nil)
return
}
@@ -125,7 +125,7 @@ func (h *Mirage) CAPIPostKeys(
case "authkey":
keyCfg := reqData.KeyData.Authkey
keyExpiration := time.Now().Add(time.Duration(reqData.KeyData.ExpirySeconds) * time.Second)
genedAuthKey, err := h.CreatePreAuthKey(userName, keyCfg.Reusable, keyCfg.Ephemeral, &keyExpiration, keyCfg.Tags)
genedAuthKey, err := h.CreatePreAuthKey(user, keyCfg.Reusable, keyCfg.Ephemeral, &keyExpiration, keyCfg.Tags)
if err != nil {
h.doAPIResponse(w, "授权密钥创建失败", nil)
return
@@ -145,9 +145,13 @@ func (h *Mirage) CAPIDelKeys(
w http.ResponseWriter,
r *http.Request,
) {
userName := h.verifyTokenIDandGetUser(w, r)
user := h.verifyTokenIDandGetUser(w, r)
if user.CheckEmpty() {
h.doAPIResponse(w, "用户信息核对失败", nil)
return
}
targetKeyID := strings.TrimPrefix(r.URL.Path, "/admin/api/keys/")
allKeys, err := h.ListPreAuthKeys(userName)
allKeys, err := h.ListPreAuthKeys(user.ID)
if err != nil {
h.doAPIResponse(w, "查询用户密钥信息失败", nil)
return