ProjectHentai/alist
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sftp-server): postgre cannot store control characters (#8188 close #8186)

Browse Source
This commit is contained in:
KirCute 2025-03-27 23:14:36 +08:00 committed by GitHub
parent 32890da29f
commit 6e13923225
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/op/sshkey.go
View File

@ -17,7 +17,6 @@ func CreateSSHPublicKey(k *model.SSHPublicKey) (error, bool) {
if err != nil { if err != nil {
return err, false return err, false
} }
k.KeyStr = string(pubKey.Marshal())
k.Fingerprint = ssh.FingerprintSHA256(pubKey) k.Fingerprint = ssh.FingerprintSHA256(pubKey)
k.AddedTime = time.Now() k.AddedTime = time.Now()
k.LastUsedTime = k.AddedTime k.LastUsedTime = k.AddedTime

3
server/handles/sshkey.go
View File

@ -6,6 +6,7 @@ import (
"github.com/alist-org/alist/v3/server/common" "github.com/alist-org/alist/v3/server/common"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"strconv" "strconv"
"strings"
) )
type SSHKeyAddReq struct { type SSHKeyAddReq struct {
@ -30,7 +31,7 @@ func AddMyPublicKey(c *gin.Context) {
} }
key := &model.SSHPublicKey{ key := &model.SSHPublicKey{
Title: req.Title, Title: req.Title,
KeyStr: req.Key, KeyStr: strings.TrimSpace(req.Key),
UserId: userObj.ID, UserId: userObj.ID,
} }
err, parsed := op.CreateSSHPublicKey(key) err, parsed := op.CreateSSHPublicKey(key)

12
server/sftp.go
View File

@ -113,11 +113,15 @@ func (d *SftpDriver) PublicKeyAuth(conn ssh.ConnMetadata, key ssh.PublicKey) (*s
} }
marshal := string(key.Marshal()) marshal := string(key.Marshal())
for _, sk := range keys { for _, sk := range keys {
if marshal == sk.KeyStr { if marshal != sk.KeyStr {
sk.LastUsedTime = time.Now() pubKey, _, _, _, e := ssh.ParseAuthorizedKey([]byte(sk.KeyStr))
_ = op.UpdateSSHPublicKey(&sk) if e != nil || marshal != string(pubKey.Marshal()) {
return nil, nil continue
}
} }
sk.LastUsedTime = time.Now()
_ = op.UpdateSSHPublicKey(&sk)
return nil, nil
} }
return nil, errors.New("public key refused") return nil, errors.New("public key refused")
} }