Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-06 22:30:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

WebClient: refactor preserving share password

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2024-12-18 19:54:39 +01:00
parent bfe6c58133
commit b0061f570e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/dataprovider/share.go
View File

@@ -89,6 +89,11 @@ func (s *Share) GetAllowedFromAsString() string {
return strings.Join(s.AllowFrom, ",") return strings.Join(s.AllowFrom, ",")
} }
// IsPasswordHashed returns true if the password is hashed
func (s *Share) IsPasswordHashed() bool {
return util.IsStringPrefixInSlice(s.Password, hashPwdPrefixes)
}
func (s *Share) getACopy() Share { func (s *Share) getACopy() Share {
allowFrom := make([]string, len(s.AllowFrom)) allowFrom := make([]string, len(s.AllowFrom))
copy(allowFrom, s.AllowFrom) copy(allowFrom, s.AllowFrom)

4
internal/httpd/webclient.go
View File

@@ -706,6 +706,9 @@ func (s *httpdServer) renderAddUpdateSharePage(w http.ResponseWriter, r *http.Re
currentURL = fmt.Sprintf("%v/%v", webClientSharePath, url.PathEscape(share.ShareID)) currentURL = fmt.Sprintf("%v/%v", webClientSharePath, url.PathEscape(share.ShareID))
title = util.I18nShareUpdateTitle title = util.I18nShareUpdateTitle
} }
if share.IsPasswordHashed() {
share.Password = redactedSecret
}
data := clientSharePage{ data := clientSharePage{
baseClientPage: s.getBaseClientPageData(title, currentURL, w, r), baseClientPage: s.getBaseClientPageData(title, currentURL, w, r),
Share: share, Share: share,
@@ -1437,7 +1440,6 @@ func (s *httpdServer) handleClientUpdateShareGet(w http.ResponseWriter, r *http.
shareID := getURLParam(r, "id") shareID := getURLParam(r, "id")
share, err := dataprovider.ShareExists(shareID, claims.Username) share, err := dataprovider.ShareExists(shareID, claims.Username)
if err == nil { if err == nil {
share.HideConfidentialData()
s.renderAddUpdateSharePage(w, r, &share, nil, false) s.renderAddUpdateSharePage(w, r, &share, nil, false)
} else if errors.Is(err, util.ErrNotFound) { } else if errors.Is(err, util.ErrNotFound) {
s.renderClientNotFoundPage(w, r, err) s.renderClientNotFoundPage(w, r, err)