procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve handling of file modes in Tramp

Browse source 
* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-get-remote-uid)
(tramp-gvfs-handle-get-remote-gid): Do not assume that the default
location is owned be the remote uid/gid.
(tramp-gvfs-handle-file-executable-p):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-executable-p):
Check also for setuid/setgid bit.

* lisp/net/tramp.el (tramp-check-cached-permissions): Check also
for ?s access type.  Check whether remote uid/gid are unknown.
This commit is contained in:
Michael Albinus 2022-02-10 14:14:06 +01:00
parent 53da8c50fc
commit 8ababad570
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/net/tramp-gvfs.el
View file

@ -1385,7 +1385,8 @@ If FILE-SYSTEM is non-nil, return file system attributes."
"Like `file-executable-p' for Tramp files."
(with-parsed-tramp-file-name filename nil
(with-tramp-file-property v localname "file-executable-p"
(tramp-check-cached-permissions v ?x))))
(or (tramp-check-cached-permissions v ?x)
(tramp-check-cached-permissions v ?s)))))
(defun tramp-gvfs-handle-file-name-all-completions (filename directory)
"Like `file-name-all-completions' for Tramp files."
@ -1603,8 +1604,7 @@ ID-FORMAT valid values are `string' and `integer'."
(tramp-file-name-user vec)
(when-let ((localname
(tramp-get-connection-property
(tramp-get-process vec) "share"
(tramp-get-connection-property vec "default-location" nil))))
(tramp-get-process vec) "share" nil)))
(file-attribute-user-id
(file-attributes (tramp-make-tramp-file-name vec localname) id-format)))))
@ -1613,8 +1613,7 @@ ID-FORMAT valid values are `string' and `integer'."
ID-FORMAT valid values are `string' and `integer'."
(when-let ((localname
(tramp-get-connection-property
(tramp-get-process vec) "share"
(tramp-get-connection-property vec "default-location" nil))))
(tramp-get-process vec) "share" nil)))
(file-attribute-group-id
(file-attributes (tramp-make-tramp-file-name vec localname) id-format))))

1
lisp/net/tramp-sh.el
View file

@ -1585,6 +1585,7 @@ ID-FORMAT valid values are `string' and `integer'."
;; Examine `file-attributes' cache to see if request can be
;; satisfied without remote operation.
(or (tramp-check-cached-permissions v ?x)
(tramp-check-cached-permissions v ?s)
(tramp-run-test "-x" filename)))))
(defun tramp-sh-handle-file-readable-p (filename)

9
lisp/net/tramp.el
View file

@ -5402,7 +5402,8 @@ be granted."
(offset (cond
((eq ?r access) 1)
((eq ?w access) 2)
((eq ?x access) 3))))
((eq ?x access) 3)
((eq ?s access) 3))))
(dolist (suffix '("string" "integer") result)
(setq
result
@ -5432,13 +5433,15 @@ be granted."
;; User accessible and owned by user.
(and
(eq access (aref (file-attribute-modes file-attr) offset))
(or (equal remote-uid (file-attribute-user-id file-attr))
(or (equal remote-uid unknown-id)
(equal remote-uid (file-attribute-user-id file-attr))
(equal unknown-id (file-attribute-user-id file-attr))))
;; Group accessible and owned by user's principal group.
(and
(eq access
(aref (file-attribute-modes file-attr) (+ offset 3)))
(or (equal remote-gid (file-attribute-group-id file-attr))
(or (equal remote-gid unknown-id)
(equal remote-gid (file-attribute-group-id file-attr))
(equal unknown-id (file-attribute-group-id file-attr))))))))))))
(defun tramp-get-remote-uid (vec id-format)