From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 9 Dec 2014 02:59:48 +0000 (+0100)
Subject: Make URL pass the TLS peer status to the caller
X-Git-Tag: emacs-25.0.90~2635^2~143
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d7e5255013e0d784865e03a1acb6d663c30f0907;p=emacs.git

Make URL pass the TLS peer status to the caller

* lisp/url/url-http.el (url-http-parse-headers): Pass the GnuTLS
status of the connection to the caller.
---

diff --git a/etc/NEWS b/etc/NEWS
index 56036f8e533..2b407775d4c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -328,6 +328,10 @@ a function.
 to specify that we're running in a noninteractive context, and that
 we should not be queried about things like TLS certificate validity.
 
+*** If URL is used with a https connection, the first callback argument
+plist will contain a :peer element that has the output of
+`gnutls-peer-status' (if Emacs is built with GnuTLS support).
+
 ** Tramp
 
 *** New connection method "nc", which allows to access dumb busyboxes.
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index b39c67effbb..d544cf0d083 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* url-http.el (url-http-parse-headers): Pass the GnuTLS status of
+	the connection to the caller.
+
 2014-12-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* url-http.el (url-http-activate-callback): Make debug more verbose.
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 3d5b6be80ac..f5a214a89d8 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -25,7 +25,9 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl-lib))
+(eval-when-compile
+  (require 'cl-lib)
+  (require 'subr-x))
 
 (defvar url-callback-arguments)
 (defvar url-callback-function)
@@ -492,7 +494,12 @@ should be shown to the user."
   (url-http-mark-connection-as-free (url-host url-current-object)
 				    (url-port url-current-object)
 				    url-http-process)
-
+  ;; Pass the certificate on to the caller.
+  (when (gnutls-available-p)
+    (when-let (status (gnutls-peer-status url-http-process))
+      (setcar url-callback-arguments
+	      (plist-put (car url-callback-arguments)
+			 :peer status))))
   (if (or (not (boundp 'url-http-end-of-headers))
 	  (not url-http-end-of-headers))
       (error "Trying to parse headers in odd buffer: %s" (buffer-name)))