Skip to content

K
koko
Commit b3723fde authored by Eric's avatar Eric
Browse files
Options

[Bugfix] web sftp path bugs

parent 2a1db5d2
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
pkg/srvconn/sftpfile.go
View file @ b3723fde
...@@ -331,6 +331,7 @@ func (ad *AssetDir) ReadDir(path string) (res []os.FileInfo, err error) { ...@@ -331,6 +331,7 @@ func (ad *AssetDir) ReadDir(path string) (res []os.FileInfo, err error) {
return return
} }
folderName = pathData[0] folderName = pathData[0]
pathData = pathData[1:]
} }
su, ok := ad.suMaps[folderName] su, ok := ad.suMaps[folderName]
if !ok { if !ok {
...@@ -340,7 +341,7 @@ func (ad *AssetDir) ReadDir(path string) (res []os.FileInfo, err error) { ...@@ -340,7 +341,7 @@ func (ad *AssetDir) ReadDir(path string) (res []os.FileInfo, err error) {
return res, sftp.ErrSshFxPermissionDenied return res, sftp.ErrSshFxPermissionDenied
} }
con, realPath := ad.GetSFTPAndRealPath(su, strings.Join(pathData[1:], "/")) con, realPath := ad.GetSFTPAndRealPath(su, strings.Join(pathData, "/"))
if con == nil { if con == nil {
return nil, sftp.ErrSshFxConnectionLost return nil, sftp.ErrSshFxConnectionLost
} }
...@@ -365,6 +366,7 @@ func (ad *AssetDir) ReadLink(path string) (res string, err error) { ...@@ -365,6 +366,7 @@ func (ad *AssetDir) ReadLink(path string) (res string, err error) {
folderName, ok := ad.IsUniqueSu() folderName, ok := ad.IsUniqueSu()
if !ok { if !ok {
folderName = pathData[0] folderName = pathData[0]
pathData = pathData[1:]
} }
su, ok := ad.suMaps[folderName] su, ok := ad.suMaps[folderName]
if !ok { if !ok {
...@@ -374,7 +376,7 @@ func (ad *AssetDir) ReadLink(path string) (res string, err error) { ...@@ -374,7 +376,7 @@ func (ad *AssetDir) ReadLink(path string) (res string, err error) {
return res, sftp.ErrSshFxPermissionDenied return res, sftp.ErrSshFxPermissionDenied
} }
con, realPath := ad.GetSFTPAndRealPath(su, strings.Join(pathData[1:], "/")) con, realPath := ad.GetSFTPAndRealPath(su, strings.Join(pathData, "/"))
if con == nil { if con == nil {
return "", sftp.ErrSshFxConnectionLost return "", sftp.ErrSshFxConnectionLost
} }
...@@ -490,8 +492,8 @@ func (ad *AssetDir) Stat(path string) (res os.FileInfo, err error) { ...@@ -490,8 +492,8 @@ func (ad *AssetDir) Stat(path string) (res os.FileInfo, err error) {
folderName, ok := ad.IsUniqueSu() folderName, ok := ad.IsUniqueSu()
if !ok { if !ok {
folderName = pathData[0] folderName = pathData[0]
pathData = pathData[1:]
} }
su, ok := ad.suMaps[folderName] su, ok := ad.suMaps[folderName]
if !ok { if !ok {
return nil, sftp.ErrSshFxNoSuchFile return nil, sftp.ErrSshFxNoSuchFile
...@@ -499,7 +501,7 @@ func (ad *AssetDir) Stat(path string) (res os.FileInfo, err error) { ...@@ -499,7 +501,7 @@ func (ad *AssetDir) Stat(path string) (res os.FileInfo, err error) {
if !ad.validatePermission(su, model.ConnectAction) { if !ad.validatePermission(su, model.ConnectAction) {
return res, sftp.ErrSshFxPermissionDenied return res, sftp.ErrSshFxPermissionDenied
} }
con, realPath := ad.GetSFTPAndRealPath(su, strings.Join(pathData[1:], "/")) con, realPath := ad.GetSFTPAndRealPath(su, strings.Join(pathData, "/"))
if con == nil { if con == nil {
return nil, sftp.ErrSshFxConnectionLost return nil, sftp.ErrSshFxConnectionLost
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment