[PATCH] web: uri-encode hexadecimal percent-encoding is now uppercase

[PATCH] web: uri-encode hexadecimal percent-encoding is now uppercase

[Aleix Conchillo Flaqué]

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

This patch changes the way uri-encode does percent-encoding. The
hexadecimal characters are now uppercase as suggested by RFC3986. So,

(uri-encode "/")
=> %2F

Aleix

[-- Attachment #2: uri-encode-uppercase.patch --]
[-- Type: application/octet-stream, Size: 2885 bytes --]

From 9909cae88e9bdf03b4253170a8669e5eb667b2b6 Mon Sep 17 00:00:00 2001
From: Aleix Conchillo Flaque <aconchillo@gmail.com>
Date: Thu, 2 May 2013 10:39:18 -0700
Subject: [PATCH] web: uri-encode hexadecimal percent-encoding is now
 uppercase

* module/web/uri.scm (uri-encode): the hexadecimal percent-encoding %HH
  is now uppercased as suggested by RFC3986:

      "For consistency, URI producers and normalizers should use
       uppercase hexadecimal digits for all percent-encodings."
---
 module/web/uri.scm |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/module/web/uri.scm b/module/web/uri.scm
index 7fe0100..df5a792 100644
--- a/module/web/uri.scm
+++ b/module/web/uri.scm
@@ -6,12 +6,12 @@
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
 ;;;; version 3 of the License, or (at your option) any later version.
-;;;; 
+;;;;
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
-;;;; 
+;;;;
 ;;;; You should have received a copy of the GNU Lesser General Public
 ;;;; License along with this library; if not, write to the Free Software
 ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@@ -20,7 +20,7 @@
 ;;; Commentary:
 
 ;; A data type for Universal Resource Identifiers, as defined in RFC
-;; 3986. 
+;; 3986.
 
 ;;; Code:
 
@@ -382,7 +382,7 @@ The default character set includes alphanumerics from ASCII, as well as
 the special characters ‘-’, ‘.’, ‘_’, and ‘~’.  Any other character will
 be percent-encoded, by writing out the character to a bytevector within
 the given ENCODING, then encoding each byte as ‘%HH’, where HH is the
-hexadecimal representation of the byte."
+uppercase hexadecimal representation of the byte."
   (define (needs-escaped? ch)
     (not (char-set-contains? unescaped-chars ch)))
   (if (string-index str needs-escaped?)
@@ -396,11 +396,12 @@ hexadecimal representation of the byte."
                        (len (bytevector-length bv)))
                   (let lp ((i 0))
                     (if (< i len)
-                        (let ((byte (bytevector-u8-ref bv i)))
+                        (let* ((byte (bytevector-u8-ref bv i))
+                               (num (number->string byte 16)))
                           (display #\% port)
                           (when (< byte 16)
                             (display #\0 port))
-                          (display (number->string byte 16) port)
+                          (display (string-upcase num) port)
                           (lp (1+ i))))))))
           str)))
       str))
-- 
1.7.10.4

Re: [PATCH] web: uri-encode hexadecimal percent-encoding is now uppercase

[Mark H Weaver]

Hi Aleix,

This patch looks good to me, except that I don't like the variable name
'num' for a string.  Actually, I'm not sure we need to bind that to a
variable at all.  How about just wrapping 'string-upcase' around the
call to 'number->string'?

      Thanks,
        Mark


> @@ -396,11 +396,12 @@ hexadecimal representation of the byte."
>                         (len (bytevector-length bv)))
>                    (let lp ((i 0))
>                      (if (< i len)
> -                        (let ((byte (bytevector-u8-ref bv i)))
> +                        (let* ((byte (bytevector-u8-ref bv i))
> +                               (num (number->string byte 16)))
>                            (display #\% port)
>                            (when (< byte 16)
>                              (display #\0 port))
> -                          (display (number->string byte 16) port)
> +                          (display (string-upcase num) port)
>                            (lp (1+ i))))))))
>            str)))
>        str))

Re: [PATCH] web: uri-encode hexadecimal percent-encoding is now uppercase

[Aleix Conchillo Flaqué]

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

On Thu, May 2, 2013 at 11:53 AM, Mark H Weaver <mhw@netris.org> wrote:
> Hi Aleix,
>
> This patch looks good to me, except that I don't like the variable name
> 'num' for a string.  Actually, I'm not sure we need to bind that to a
> variable at all.  How about just wrapping 'string-upcase' around the
> call to 'number->string'?
>

Makes sense. Let's see this one.

Aleix

[-- Attachment #2: uri-encode-uppercase.patch --]
[-- Type: application/octet-stream, Size: 2622 bytes --]

From 8f1d8b7f4c08d81c44884697e9fed717be27e857 Mon Sep 17 00:00:00 2001
From: Aleix Conchillo Flaque <aconchillo@gmail.com>
Date: Thu, 2 May 2013 12:13:31 -0700
Subject: [PATCH] web: uri-encode hexadecimal percent-encoding is now
 uppercase

* module/web/uri.scm (uri-encode): the hexadecimal percent-encoding %HH
  is now uppercased as suggested by RFC3986:

      "For consistency, URI producers and normalizers should use
       uppercase hexadecimal digits for all percent-encodings."
---
 module/web/uri.scm |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/web/uri.scm b/module/web/uri.scm
index 7fe0100..3ab820d 100644
--- a/module/web/uri.scm
+++ b/module/web/uri.scm
@@ -6,12 +6,12 @@
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
 ;;;; version 3 of the License, or (at your option) any later version.
-;;;; 
+;;;;
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ;;;; Lesser General Public License for more details.
-;;;; 
+;;;;
 ;;;; You should have received a copy of the GNU Lesser General Public
 ;;;; License along with this library; if not, write to the Free Software
 ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@@ -20,7 +20,7 @@
 ;;; Commentary:
 
 ;; A data type for Universal Resource Identifiers, as defined in RFC
-;; 3986. 
+;; 3986.
 
 ;;; Code:
 
@@ -382,7 +382,7 @@ The default character set includes alphanumerics from ASCII, as well as
 the special characters ‘-’, ‘.’, ‘_’, and ‘~’.  Any other character will
 be percent-encoded, by writing out the character to a bytevector within
 the given ENCODING, then encoding each byte as ‘%HH’, where HH is the
-hexadecimal representation of the byte."
+uppercase hexadecimal representation of the byte."
   (define (needs-escaped? ch)
     (not (char-set-contains? unescaped-chars ch)))
   (if (string-index str needs-escaped?)
@@ -400,7 +400,8 @@ hexadecimal representation of the byte."
                           (display #\% port)
                           (when (< byte 16)
                             (display #\0 port))
-                          (display (number->string byte 16) port)
+                          (display (string-upcase (number->string byte 16))
+                                   port)
                           (lp (1+ i))))))))
           str)))
       str))
-- 
1.7.10.4

Re: [PATCH] web: uri-encode hexadecimal percent-encoding is now uppercase

[Mark H Weaver]

Hi Aleix,

There was one remaining problem with your commit: web-uri.test contained
some tests that assumed lowercase percent encoding.  I took the liberty
of modifying your commit to fix those tests, and then pushed it to
stable-2.0.

     Thanks!
       Mark

Re: [PATCH] web: uri-encode hexadecimal percent-encoding is now uppercase

[Aleix Conchillo Flaqué]

On Thu, May 2, 2013 at 2:17 PM, Mark H Weaver <mhw@netris.org> wrote:
> Hi Aleix,
>
> There was one remaining problem with your commit: web-uri.test contained
> some tests that assumed lowercase percent encoding.  I took the liberty
> of modifying your commit to fix those tests, and then pushed it to
> stable-2.0.
>

Oh... right :-(. Have to get used to the process.

Thanks!

Aleix