From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Richard Copley <rcopley@gmail.com>
Cc: 35739@debbugs.gnu.org, Noam Postavsky <npostavs@gmail.com>
Subject: bug#35739: Bad signature from GNU ELPA
Date: Wed, 15 May 2019 10:03:57 -0400 [thread overview]
Message-ID: <jwv36lf6dsj.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <CAPM58ogv285nuvuCVBBJWz5qy375ipyGkCk=gBSwDrP4r7-=Fw@mail.gmail.com> (Richard Copley's message of "Wed, 15 May 2019 08:13:43 +0100")
> --- a/lisp/emacs-lisp/package.el
> +++ b/lisp/emacs-lisp/package.el
> @@ -1225,7 +1225,7 @@ package--with-work-buffer
> (goto-char (point-min))
> (unless (search-forward-regexp "^\r?\n\r?" nil 'noerror)
> (error "Error retrieving: %s %S" ,url-sym "incomprehensible buffer")))
> - (url-insert-buffer-contents ,b-sym ,url-sym)
> + (url-insert ,b-sym)
> (kill-buffer ,b-sym)
> (goto-char (point-min)))))
> nil
[ Boy, this macro looks awfully deeply indented.
We need to rewrite this to fit into the usual 80 columns. ]
That actually looks very good [it would also need to change the other
url-insert-file-contents in that macro, of course].
Eli, do you think this could also be a fix for bug#34909?
E.g. something like the patch below?
Stefan
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 949ad711ae..8a16dba1c2 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1202,40 +1182,45 @@ package--with-work-buffer
(let ((url-sym (make-symbol "url"))
(b-sym (make-symbol "b-sym")))
`(cl-macrolet ((unless-error (body-2 &rest before-body)
- (let ((err (make-symbol "err")))
- `(with-temp-buffer
- (when (condition-case ,err
- (progn ,@before-body t)
- ,(list 'error ',error-form
- (list 'unless ',noerror-1
- `(signal (car ,err) (cdr ,err)))))
- ,@body-2)))))
+ (let ((err (make-symbol "err")))
+ `(with-temp-buffer
+ (set-buffer-multibyte nil)
+ (when (condition-case ,err
+ (progn ,@before-body t)
+ ,(list 'error ',error-form
+ (list 'unless ',noerror-1
+ `(signal (car ,err)
+ (cdr ,err)))))
+ ,@body-2)))))
(if (string-match-p "\\`https?:" ,url-1)
(let ((,url-sym (concat ,url-1 ,file)))
(if ,async
(unless-error nil
- (url-retrieve ,url-sym
- (lambda (status)
- (let ((,b-sym (current-buffer)))
- (require 'url-handlers)
- (unless-error ,body
- (when-let* ((er (plist-get status :error)))
- (error "Error retrieving: %s %S" ,url-sym er))
- (with-current-buffer ,b-sym
- (goto-char (point-min))
- (unless (search-forward-regexp "^\r?\n\r?" nil 'noerror)
- (error "Error retrieving: %s %S" ,url-sym "incomprehensible buffer")))
- (url-insert-buffer-contents ,b-sym ,url-sym)
- (kill-buffer ,b-sym)
- (goto-char (point-min)))))
- nil
- 'silent))
- (unless-error ,body (url-insert-file-contents ,url-sym))))
+ (url-retrieve
+ ,url-sym
+ (lambda (status)
+ (let ((,b-sym (current-buffer)))
+ (require 'url-handlers)
+ (unless-error ,body
+ (when-let* ((er (plist-get status :error)))
+ (error "Error retrieving: %s %S" ,url-sym er))
+ (with-current-buffer ,b-sym
+ (goto-char (point-min))
+ (unless (search-forward-regexp "^\r?\n\r?" nil t)
+ (error "Error retrieving: %s %S"
+ ,url-sym "incomprehensible buffer")))
+ (url-insert ,b-sym)
+ (kill-buffer ,b-sym)
+ (goto-char (point-min)))))
+ nil
+ 'silent))
+ (unless-error ,body (url-insert ,url-sym))))
(unless-error ,body
- (let ((url (expand-file-name ,file ,url-1)))
- (unless (file-name-absolute-p url)
- (error "Location %s is not a url nor an absolute file name" url))
- (insert-file-contents url))))))))
+ (let ((url (expand-file-name ,file ,url-1)))
+ (unless (file-name-absolute-p url)
+ (error "Location %s is not a url nor an absolute file name"
+ url))
+ (insert-file-contents url))))))))
(define-error 'bad-signature "Failed to verify signature")
@@ -1294,7 +1279,8 @@ package--check-signature
(package--with-response-buffer location :file sig-file
:async async :noerror t
;; Connection error is assumed to mean "no sig-file".
- :error-form (let ((allow-unsigned (eq package-check-signature 'allow-unsigned)))
+ :error-form (let ((allow-unsigned
+ (eq package-check-signature 'allow-unsigned)))
(when (and callback allow-unsigned)
(funcall callback nil))
(when unwind (funcall unwind))
@@ -1303,8 +1289,9 @@ package--check-signature
;; OTOH, an error here means "bad signature", which we never
;; suppress. (Bug#22089)
(unwind-protect
- (let ((sig (package--check-signature-content (buffer-substring (point) (point-max))
- string sig-file)))
+ (let ((sig (package--check-signature-content
+ (buffer-substring (point) (point-max))
+ string sig-file)))
(when callback (funcall callback sig))
sig)
(when unwind (funcall unwind))))))
@@ -1581,15 +1568,18 @@ package--download-one-archive
(member name package-unsigned-archives))
;; If we don't care about the signature, save the file and
;; we're done.
- (progn (let ((coding-system-for-write 'utf-8))
- (write-region content nil local-file nil 'silent))
- (package--update-downloads-in-progress archive))
+ (progn
+ (cl-assert (not enable-multibyte-characters))
+ (let ((coding-system-for-write 'binary))
+ (write-region content nil local-file nil 'silent))
+ (package--update-downloads-in-progress archive))
;; If we care, check it (perhaps async) and *then* write the file.
(package--check-signature
location file content async
;; This function will be called after signature checking.
(lambda (&optional good-sigs)
- (let ((coding-system-for-write 'utf-8))
+ (cl-assert (not enable-multibyte-characters))
+ (let ((coding-system-for-write 'binary))
(write-region content nil local-file nil 'silent))
;; Write out good signatures into archive-contents.signed file.
(when good-sigs
@@ -1903,7 +1893,8 @@ package-install-from-archive
;; Update the old pkg-desc which will be shown on the description buffer.
(setf (package-desc-signed pkg-desc) t)
;; Update the new (activated) pkg-desc as well.
- (when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc) package-alist))))
+ (when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc)
+ package-alist))))
(setf (package-desc-signed (car pkg-descs)) t))))))))))
(defun package-installed-p (package &optional min-version)
@@ -2477,10 +2468,12 @@ describe-package-1
(replace-match ""))))
(if (package-installed-p desc)
- ;; For installed packages, get the description from the installed files.
+ ;; For installed packages, get the description from the
+ ;; installed files.
(insert (package--get-description desc))
- ;; For non-built-in, non-installed packages, get description from the archive.
+ ;; For non-built-in, non-installed packages, get description from
+ ;; the archive.
(let* ((basename (format "%s-readme.txt" name))
readme-string)
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index e35d999e0f..783466ca70 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -299,7 +299,8 @@ url-file-local-copy
(defun url-insert (buffer &optional beg end)
"Insert the body of a URL object.
BUFFER should be a complete URL buffer as returned by `url-retrieve'.
-If the headers specify a coding-system, it is applied to the body before it is inserted.
+If the headers specify a coding-system (and current buffer is multibyte),
+it is applied to the body before it is inserted.
Returns a list of the form (SIZE CHARSET), where SIZE is the size in bytes
of the inserted text and CHARSET is the charset that was specified in the header,
or nil if none was found.
@@ -311,12 +312,13 @@ url-insert
(buffer-substring (+ (point-min) beg)
(if end (+ (point-min) end) (point-max)))
(buffer-string))))
- (charset (mail-content-type-get (mm-handle-type handle)
- 'charset)))
+ (charset (if enable-multibyte-characters
+ (mail-content-type-get (mm-handle-type handle)
+ 'charset))))
(mm-destroy-parts handle)
- (if charset
- (insert (mm-decode-string data (mm-charset-to-coding-system charset)))
- (insert data))
+ (insert (if charset
+ (mm-decode-string data (mm-charset-to-coding-system charset))
+ data))
(list (length data) charset)))
(defvar url-http-codes)
next prev parent reply other threads:[~2019-05-15 14:03 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-14 21:25 bug#35739: Bad signature from GNU ELPA Richard Copley
2019-05-14 21:37 ` bug#35739: Acknowledgement (Bad signature from GNU ELPA) Richard Copley
2019-05-14 22:04 ` bug#35739: Bad signature from GNU ELPA Noam Postavsky
2019-05-14 22:26 ` Richard Copley
2019-05-14 22:42 ` Richard Copley
2019-05-15 2:42 ` Eli Zaretskii
2019-05-15 7:13 ` Richard Copley
2019-05-15 14:03 ` Stefan Monnier [this message]
2019-05-15 15:03 ` Eli Zaretskii
2019-05-18 22:36 ` Stefan Monnier
2019-05-22 5:19 ` Eli Zaretskii
2019-05-22 16:20 ` Stefan Monnier
2019-05-22 17:09 ` Eli Zaretskii
2019-05-22 19:40 ` Stefan Monnier
2019-05-23 3:50 ` Eli Zaretskii
2019-05-23 4:06 ` Stefan Monnier
2019-05-23 4:52 ` Eli Zaretskii
2019-05-23 12:10 ` Stefan Monnier
2019-05-23 14:15 ` Eli Zaretskii
2019-05-24 14:22 ` Stefan Monnier
2019-05-24 15:00 ` Eli Zaretskii
2019-05-24 19:31 ` Stefan Monnier
2019-05-24 19:43 ` Eli Zaretskii
2019-05-24 19:51 ` Stefan Monnier
2019-05-25 7:36 ` Eli Zaretskii
2019-05-25 18:38 ` Stefan Monnier
2019-05-25 19:13 ` Eli Zaretskii
2019-05-15 2:41 ` Eli Zaretskii
2019-05-15 6:46 ` Richard Copley
2019-05-15 14:40 ` Eli Zaretskii
2019-05-15 15:12 ` Richard Copley
2019-05-29 18:45 ` Stefan Monnier
2019-05-29 19:11 ` Richard Copley
2019-05-29 20:07 ` Stefan Monnier
2019-05-29 20:50 ` Noam Postavsky
2019-05-30 2:35 ` Eli Zaretskii
2019-05-31 4:54 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv36lf6dsj.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=35739@debbugs.gnu.org \
--cc=npostavs@gmail.com \
--cc=rcopley@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.