MSVSphere Packaging Team
3 months ago
parent
f0f9a64e56
commit
22814e29e1
GPG Key ID:
B2B0B9F29E528FE8
@ -0,0 +1,36 @@
|
|||||||
|
From 2bc865ace050ff118db43f01457f95f95112b877 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ihor Radchenko <yantar92@posteo.net>
|
||||||
|
Date: Tue, 20 Feb 2024 14:59:20 +0300
|
||||||
|
Subject: org-file-contents: Consider all remote files unsafe
|
||||||
|
|
||||||
|
* lisp/org/org.el (org-file-contents): When loading files, consider all
|
||||||
|
remote files (like TRAMP-fetched files) unsafe, in addition to URLs.
|
||||||
|
---
|
||||||
|
lisp/org/org.el | 6 +++++-
|
||||||
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/lisp/org/org.el b/lisp/org/org.el
|
||||||
|
index 0f5d17d..76559c9 100644
|
||||||
|
--- a/lisp/org/org.el
|
||||||
|
+++ b/lisp/org/org.el
|
||||||
|
@@ -4576,12 +4576,16 @@ from file or URL, and return nil.
|
||||||
|
If NOCACHE is non-nil, do a fresh fetch of FILE even if cached version
|
||||||
|
is available. This option applies only if FILE is a URL."
|
||||||
|
(let* ((is-url (org-file-url-p file))
|
||||||
|
+ (is-remote (condition-case nil
|
||||||
|
+ (file-remote-p file)
|
||||||
|
+ ;; In case of error, be safe.
|
||||||
|
+ (t t)))
|
||||||
|
(cache (and is-url
|
||||||
|
(not nocache)
|
||||||
|
(gethash file org--file-cache))))
|
||||||
|
(cond
|
||||||
|
(cache)
|
||||||
|
- (is-url
|
||||||
|
+ ((or is-url is-remote)
|
||||||
|
(with-current-buffer (url-retrieve-synchronously file)
|
||||||
|
(goto-char (point-min))
|
||||||
|
;; Move point to after the url-retrieve header.
|
||||||
|
--
|
||||||
|
cgit v1.1
|
||||||
|
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
From 937b9042ad7426acdcca33e3d931d8f495bdd804 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ihor Radchenko <yantar92@posteo.net>
|
||||||
|
Date: Tue, 20 Feb 2024 12:44:30 +0300
|
||||||
|
Subject: * lisp/gnus/mm-view.el (mm-display-inline-fontify): Mark contents
|
||||||
|
untrusted.
|
||||||
|
|
||||||
|
---
|
||||||
|
lisp/gnus/mm-view.el | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
|
||||||
|
index 2e1261c..5f234e5 100644
|
||||||
|
--- a/lisp/gnus/mm-view.el
|
||||||
|
+++ b/lisp/gnus/mm-view.el
|
||||||
|
@@ -504,6 +504,7 @@ If MODE is not set, try to find mode automatically."
|
||||||
|
(setq coding-system (mm-find-buffer-file-coding-system)))
|
||||||
|
(setq text (buffer-string))))
|
||||||
|
(with-temp-buffer
|
||||||
|
+ (setq untrusted-content t)
|
||||||
|
(buffer-disable-undo)
|
||||||
|
(mm-enable-multibyte)
|
||||||
|
(insert (cond ((eq charset 'gnus-decoded)
|
||||||
|
--
|
||||||
|
cgit v1.1
|
||||||
|
|
||||||
@ -0,0 +1,78 @@
|
|||||||
|
From f4cc61636947b5c2f0afc67174dd369fe3277aa8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ihor Radchenko <yantar92@posteo.net>
|
||||||
|
Date: Tue, 18 Jun 2024 13:06:44 +0200
|
||||||
|
Subject: org-link-expand-abbrev: Do not evaluate arbitrary unsafe Elisp code
|
||||||
|
|
||||||
|
* lisp/org/org.el (org-link-expand-abbrev): Refuse expanding %(...) link
|
||||||
|
abbrevs that specify unsafe function. Instead, display a warning, and
|
||||||
|
do not expand the abbrev. Clear all the text properties from the
|
||||||
|
returned link, to avoid any potential vulnerabilities caused by
|
||||||
|
properties that may contain arbitrary Elisp.
|
||||||
|
---
|
||||||
|
lisp/org/org.el | 40 +++++++++++++++++++++++++++++-----------
|
||||||
|
1 file changed, 29 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lisp/org/org.el b/lisp/org/org.el
|
||||||
|
index 7a7f4f5..8a556c7 100644
|
||||||
|
--- a/lisp/org/org.el
|
||||||
|
+++ b/lisp/org/org.el
|
||||||
|
@@ -1152,26 +1152,44 @@ Abbreviations are defined in `org-link-abbrev-alist'."
|
||||||
|
|
||||||
|
(defun org-link-expand-abbrev (link)
|
||||||
|
"Apply replacements as defined in `org-link-abbrev-alist'."
|
||||||
|
- (if (string-match "^\\([^:]*\\)\\(::?\\(.*\\)\\)?$" link)
|
||||||
|
+ (if (not (string-match "^\\([^:]*\\)\\(::?\\(.*\\)\\)?$" link)) link
|
||||||
|
(let* ((key (match-string 1 link))
|
||||||
|
(as (or (assoc key org-link-abbrev-alist-local)
|
||||||
|
(assoc key org-link-abbrev-alist)))
|
||||||
|
(tag (and (match-end 2) (match-string 3 link)))
|
||||||
|
rpl)
|
||||||
|
(if (not as)
|
||||||
|
link
|
||||||
|
(setq rpl (cdr as))
|
||||||
|
- (cond
|
||||||
|
- ((symbolp rpl) (funcall rpl tag))
|
||||||
|
- ((string-match "%(\\([^)]+\\))" rpl)
|
||||||
|
- (replace-match
|
||||||
|
- (save-match-data
|
||||||
|
- (funcall (intern-soft (match-string 1 rpl)) tag)) t t rpl))
|
||||||
|
- ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
|
||||||
|
- ((string-match "%h" rpl)
|
||||||
|
- (replace-match (url-hexify-string (or tag "")) t t rpl))
|
||||||
|
- (t (concat rpl tag)))))
|
||||||
|
- link))
|
||||||
|
+ ;; Drop any potentially dangerous text properties like
|
||||||
|
+ ;; `modification-hooks' that may be used as an attack vector.
|
||||||
|
+ (substring-no-properties
|
||||||
|
+ (cond
|
||||||
|
+ ((symbolp rpl) (funcall rpl tag))
|
||||||
|
+ ((string-match "%(\\([^)]+\\))" rpl)
|
||||||
|
+ (let ((rpl-fun-symbol (intern-soft (match-string 1 rpl))))
|
||||||
|
+ ;; Using `unsafep-function' is not quite enough because
|
||||||
|
+ ;; Emacs considers functions like `genenv' safe, while
|
||||||
|
+ ;; they can potentially be used to expose private system
|
||||||
|
+ ;; data to attacker if abbreviated link is clicked.
|
||||||
|
+ (if (or (eq t (get rpl-fun-symbol 'org-link-abbrev-safe))
|
||||||
|
+ (eq t (get rpl-fun-symbol 'pure)))
|
||||||
|
+ (replace-match
|
||||||
|
+ (save-match-data
|
||||||
|
+ (funcall (intern-soft (match-string 1 rpl)) tag))
|
||||||
|
+ t t rpl)
|
||||||
|
+ (org-display-warning
|
||||||
|
+ (format "Disabling unsafe link abbrev: %s
|
||||||
|
+You may mark function safe via (put '%s 'org-link-abbrev-safe t)"
|
||||||
|
+ rpl (match-string 1 rpl)))
|
||||||
|
+ (setq org-link-abbrev-alist-local (delete as org-link-abbrev-alist-local)
|
||||||
|
+ org-link-abbrev-alist (delete as org-link-abbrev-alist))
|
||||||
|
+ link
|
||||||
|
+ )))
|
||||||
|
+ ((string-match "%s" rpl) (replace-match (or tag "") t t rpl))
|
||||||
|
+ ((string-match "%h" rpl)
|
||||||
|
+ (replace-match (url-hexify-string (or tag "")) t t rpl))
|
||||||
|
+ (t (concat rpl tag))))))))
|
||||||
|
|
||||||
|
;;; Storing and inserting links
|
||||||
|
|
||||||
|
--
|
||||||
|
cgit v1.1
|
||||||
|
|
||||||
Loading…
Reference in new issue