From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mG1jN+Z0bGAVNAEAgWs5BA (envelope-from ) for ; Tue, 06 Apr 2021 16:49:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id eCFdMeZ0bGDsLAAA1q6Kng (envelope-from ) for ; Tue, 06 Apr 2021 14:49:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E0CE52020D for ; Tue, 6 Apr 2021 16:49:09 +0200 (CEST) Received: from localhost ([::1]:42106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTn0u-0008Po-S8 for larch@yhetil.org; Tue, 06 Apr 2021 10:49:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTmzn-00079T-73 for emacs-orgmode@gnu.org; Tue, 06 Apr 2021 10:47:59 -0400 Received: from ciao.gmane.io ([116.202.254.214]:33916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTmzj-0005fi-DO for emacs-orgmode@gnu.org; Tue, 06 Apr 2021 10:47:58 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1lTmze-0006eS-57 for emacs-orgmode@gnu.org; Tue, 06 Apr 2021 16:47:50 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Maxim Nikulin Subject: [PATCH] org-protocol: decode "+" in query part as space Date: Tue, 6 Apr 2021 21:47:43 +0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------D48929F807B83615D792FAEE" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 X-Mozilla-News-Host: news://news.gmane.io:119 Content-Language: en-US Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 28 X-Spam_score: 2.8 X-Spam_bar: ++ X-Spam_report: (2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617720550; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=SQuyYAznL2yBrkZM5Rsu+nrUaUG64OUynFNasShWIks=; b=kI99fxUauL2m8xEkFEyaf/gXChv2OdQ1vzJRWfFbuacjXuTbfgBTXYqYwBhIjvBJBBvfWV Ag8n/STcMFpNcYneddfzrf1rw/ozFMrHM4fOuthtwem8+E6jK5WHCru4REpk+J8t6b+1/N s1/RFfepVuDz/zQabfitKgKgj/ntdsPIjsOGHDhtFU5ZF+74pxdh1JCSfqt91dnpOaxa5a 55e5BV8XczU9o2a05pJ9lyIXWOTTBCEzuJB8sUFjX9e68Uw04nLSAzMrWE212r1/A0IBuf MZhKxMiAdNmEkdPFtn5PFWiT/41Ub1WOtS2uZoJhTjK7jPdRc/BpyXySrkvEmw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617720550; a=rsa-sha256; cv=none; b=cnHhNWo8PPVrYcZFCEzF/TWlK2e9IO0+Om27kNDVtdRQde8xYLi/Vk82+cz3aDFdcFG6ZN DUGoOV3dCSyioL0uZgR+0Clrb/SfVorrX5+kB+k7auF177Pzz2ZUSgJJA6De5n5lhIZDA9 R9vLk07tMEOp1sg9D88PDOm+Ibnmfie9thJktqP8W/dN9w+kcojuSbGVsubviq5+o1F4Ca K3Xd6td/h/xc9wuLVazSP4C9wPYEG16QwYS+OmXHD78OSxbNeiQYGZ5mAL1jtmj2E36jvv A620jd5uk5UYOH1ZTFXaob0yR8f28ZQiRm9VzXaiWegFwgiY0N9w053J6IB18g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -0.34 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: E0CE52020D X-Spam-Score: -0.34 X-Migadu-Scanner: scn0.migadu.com X-TUID: xQ1CNbMFzPyo This is a multi-part message in MIME format. --------------D48929F807B83615D792FAEE Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hi, Some time ago, when I tried org-protocol, I was quite surprised that query parameters generated using URLSearchParams JavaScript class are decoded incorrectly. "+" characters representing space are passed as is. I hope, I have found a proper place in the code to handle such case. It does not affect previously recommended bookmarklets with abundant calls of encodeURIComponent that escapes spaces as "%20". I believe, new option is more readable: javascript:location.href='org-protocol://capture?' + new URLSearchParams({ template: 'x', url: location.href, title: document.title, body: window.getSelection()}); I guess, with old org-protocol syntax only pure percent encoding was necessary due to each parameter was represented as path component. "+" is allowed only in query part. Such variant was just missed when new query-like syntax was introduced. --------------D48929F807B83615D792FAEE Content-Type: text/x-patch; charset=UTF-8; name="0001-org-protocol.el-decode-in-query-part-as-space.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-org-protocol.el-decode-in-query-part-as-space.patch" >From bf14953cba974ef2199c8d551a47d58c819b9a33 Mon Sep 17 00:00:00 2001 From: Max Nikulin Date: Tue, 6 Apr 2021 21:30:06 +0700 Subject: [PATCH] org-protocol.el: decode "+" in query part as space * lisp/org-protocol.el (org-protocol-convert-query-to-plist): Replace "+" chars by spaces before passing parameter string to decoder. Allow making org-protocol URIs with help of URLSearchParams JavaScript class. * lisp/org-protocol.el doc/org-manual.org etc/ORG-NEWS: Add examples demonstrating new opportunity for browser bookmarklets. Make parsing of URI parameters a bit closer to URL standard https://url.spec.whatwg.org/#urlencoded-parsing --- doc/org-manual.org | 22 ++++++++++++++++++++ etc/ORG-NEWS | 11 ++++++++++ lisp/org-protocol.el | 48 ++++++++++++++++++++++++++++++++++++++------ 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/doc/org-manual.org b/doc/org-manual.org index efe956877..122da066d 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -19625,11 +19625,20 @@ slashes, and probably quote those for the shell. To use this feature from a browser, add a bookmark with an arbitrary name, e.g., =Org: store-link= and enter this as /Location/: +#+begin_example +javascript:location.href='org-protocol://store-link?' + + new URLSearchParams({url:location.href, title:document.title}); +#+end_example + +Title is an optional parameter. Another expression was recommended earlier: + #+begin_example javascript:location.href='org-protocol://store-link?url='+ encodeURIComponent(location.href); #+end_example +The latter form is compatible with older Org versions from 9.0 to 9.4. + *** The ~capture~ protocol :PROPERTIES: :DESCRIPTION: Fill a buffer with external information. @@ -19645,6 +19654,15 @@ using acapture template. To use this feature, add a bookmark with an arbitrary name, e.g., =Org: capture=, and enter this as =Location=: +#+begin_example +javascript:location.href='org-protocol://capture?' + + new URLSearchParams({ + template: 'x', url: window.location.href, + title: document.title, body: window.getSelection()}); +#+end_example + +You might have seen another expression: + #+begin_example javascript:location.href='org-protocol://capture?template=x'+ '&url='+encodeURIComponent(window.location.href)+ @@ -19652,6 +19670,10 @@ javascript:location.href='org-protocol://capture?template=x'+ '&body='+encodeURIComponent(window.getSelection()); #+end_example +It is a bit more cluttered than the former one, but it is compatible with +previous Org versions 9.0-9.4. In these versions encoding of space as "+" +character was not supported by URI decoder. + #+vindex: org-protocol-default-template-key The capture template to be used can be specified in the bookmark (like =X= above). If unspecified, the template key is set in the variable diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 8bf3a7d29..78c563e01 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -228,6 +228,17 @@ Storing links to files using ~org-store-link~ (==) when description of the link, if available. If no title exists it falls back to the filename as before. +*** org-protocol compatibility with =URLSearchParams= JavaScript class + +Decoder of query part of org-protocol URI recognizes "+" as an encoded +space characters now, so it is possible to avoid call to =encodeURIComponent= +for each parameter and use more readable expression in bookmarklet: + +#+begin_example +'org-protocol://store-link?' + new URLSearchParams({ + url: location.href, title: document.title}) +#+end_example + * Version 9.4 ** Incompatible changes *** Possibly broken internal file links: please check and fix diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 731f51e19..ebfd3887b 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -94,6 +94,15 @@ ;; You may use the same bookmark URL for all those standard handlers and just ;; adjust the sub-protocol used: ;; +;; javascript:location.href='org-protocol://sub-protocol?'+ +;; new URLSearchParams({ +;; url: location.href, +;; title: document.title, +;; body: window.getSelection()}) +;; +;; Alternatively use the following expression that encodes space as \"%20\" +;; instead of \"+\", so it is compatible with Org versions from 9.0 to 9.4: +;; ;; location.href='org-protocol://sub-protocol?url='+ ;; encodeURIComponent(location.href)+'&title='+ ;; encodeURIComponent(document.title)+'&body='+ @@ -103,6 +112,11 @@ ;; char that, if present, triggers the use of a special template. ;; Example: ;; +;; location.href='org-protocol://capture?'+ +;; new URLSearchParams({template:'x', /* ... */}) +;; +;; or +;; ;; location.href='org-protocol://capture?template=x'+ ... ;; ;; uses template ?x. @@ -426,7 +440,12 @@ Parameters: url, title (optional), body (optional) Old-style links such as org-protocol://store-link://URL/TITLE are also recognized. -The location for a browser's bookmark has to look like this: +The location for a browser's bookmark may look like this: + + javascript:location.href = \\='org-protocol://store-link?' + + new URLSearchParams({url:location.href, title:document.title}); + +or to keep compatibility with Org versions from 9.0 to 9.4 it may be: javascript:location.href = \\ \\='org-protocol://store-link?url=\\=' + \\ @@ -435,7 +454,9 @@ The location for a browser's bookmark has to look like this: Don't use `escape()'! Use `encodeURIComponent()' instead. The title of the page could contain slashes and the location -definitely will. +definitely will. Org 9.4 and earlier could not decode \"+\" +to space, that is why less readable latter expression may be necessary +for backward compatibility. The sub-protocol used to reach this function is set in `org-protocol-protocol-alist'. @@ -463,6 +484,14 @@ The sub-protocol used to reach this function is set in This function detects an URL, title and optional text, separated by `/'. The location for a browser's bookmark looks like this: + javascript:location.href = \\='org-protocol://capture?' + + new URLSearchParams({ + url: location.href, + title: document.title, + body: window.getSelection()}) + +or to keep compatibility with Org versions from 9.0 to 9.4: + javascript:location.href = \\='org-protocol://capture?url=\\='+ \\ encodeURIComponent(location.href) + \\='&title=\\=' \\ encodeURIComponent(document.title) + \\='&body=\\=' + \\ @@ -518,10 +547,11 @@ Now template ?b will be used." (defun org-protocol-convert-query-to-plist (query) "Convert QUERY key=value pairs in the URL to a property list." (when query - (apply 'append (mapcar (lambda (x) - (let ((c (split-string x "="))) - (list (intern (concat ":" (car c))) (cadr c)))) - (split-string query "&"))))) + (let ((plus-decoded (replace-regexp-in-string "\\+" " " query t t))) + (apply 'append (mapcar (lambda (x) + (let ((c (split-string x "="))) + (list (intern (concat ":" (car c))) (cadr c)))) + (split-string plus-decoded "&")))))) (defun org-protocol-open-source (fname) "Process an org-protocol://open-source?url= style URL with FNAME. @@ -531,6 +561,12 @@ in `org-protocol-project-alist'. The location for a browser's bookmark should look like this: + javascript:location.href = \\='org-protocol://open-source?' + + new URLSearchParams({url: location.href}) + +or if you prefer to keep compatibility with older Org versions (9.0 to 9.4), +consider the following expression: + javascript:location.href = \\='org-protocol://open-source?url=\\=' + \\ encodeURIComponent(location.href)" ;; As we enter this function for a match on our protocol, the return value -- 2.25.1 --------------D48929F807B83615D792FAEE--