From: Noah Sanci <nsanci@redhat.com>
To: "Frank Ch. Eigler" <fche@redhat.com>
Cc: elfutils-devel@sourceware.org
Subject: Re: [Bug debuginfod/28034] client-side %-escape url characters
Date: Fri, 27 Aug 2021 11:07:00 -0400 [thread overview]
Message-ID: <CAJXA7qiQTWKQ7_d4X0MSkV8r3PO+0E6h89mZsc64LxvtbiOm5w@mail.gmail.com> (raw)
In-Reply-To: <CAJXA7qiQDGQN8f76aJtVagutoyNv6SXBAfUffgctFR9CgqJ1NA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]
Hello
Update 2, no longer append nulls unnecessarily.
-Noah Sanci
On Fri, Aug 27, 2021 at 10:44 AM Noah Sanci <nsanci@redhat.com> wrote:
>
> Hello,
>
> Here is an updated patch, using memmove. Much smaller.
>
> Thanks for the suggestions,
>
> Noah Sanci
>
>
> On Thu, Aug 26, 2021 at 5:02 PM Frank Ch. Eigler <fche@redhat.com> wrote:
> >
> > Hi -
> >
> > > /* PR28034 escape characters in completed url to %hh format. */
> > > - char *escaped_string;
> > > - escaped_string = curl_easy_escape(data[i].handle, filename, 0);
> > > - if (!escaped_string)
> > > + char escaped_string[PATH_MAX] = {'\0'};
> > > + char *loc = (char *) filename;
> > > + char *loc2;
> > > + char *tmp;
> > > + for(size_t j = 0; j < strlen(filename); ++j)
> > > {
> > > - rc = -ENOMEM;
> > > - goto out2;
> > > + loc2 = strstr(loc, "/");
> > > + // If the first character is a '/'
> > > [...]
> >
> > Holy cow that's a lot of work to do it this way.
> > A couple of alternatives:
> >
> > - ditch curl_easy_escape :-( and use a
> > malloc(strlen(x)*3)
> > byte-by-byte copy from source string into destination
> > if not [a-zA-Z0-9/.~] then %-escape
> >
> > or:
> > - keep curl_easy_escape and postprocess
> > byte-by-byte examine the result of curl_easy_escape
> > - if seeing a "%2F", replace the % with a / and memmove the
> > rest of the string 2 bytes ahead
> >
> > It shouldn't need strtok or strstr or a lot of logic or stuff like
> > that really.
> >
> > - FChE
> >
[-- Attachment #2: 0001-debuginfod-PR28034-client-side-escape-url-characters.patch --]
[-- Type: text/x-patch, Size: 2268 bytes --]
From f5c7c00c76b200675556a0ecc6bd8a5fdc7a30ea Mon Sep 17 00:00:00 2001
From: Noah Sanci <nsanci@redhat.com>
Date: Fri, 16 Jul 2021 15:16:20 -0400
Subject: [PATCH] debuginfod: PR28034 - client-side %-escape url characters
When requesting some source files, some URL-inconvenient chars
sometimes pop up. Example from f33 libstdc++:
/buildid/44d8485cb75512c2ca5c8f70afbd475cae30af4f/source/usr/src/debug/
gcc-10.3.1-1.fc33.x86_64/obj-x86_64-redhat-linux/x86_64-redhat-linux/
libstdc++-v3/src/c++11/../../../../../libstdc++-v3/src/c++11/
condition_variable.cc
As this URL is passed into debuginfod's handler_cb, it appears that the
+ signs are helpfully unescaped to spaces by libmicrohttpd, which
'course breaks everything.
In order to ensure the server properly parses urls such as this one,
%-escape characters on the client side so that the correct url
is preserved and properly processed on the server side.
https://sourceware.org/bugzilla/show_bug.cgi?id=28034
Signed-off-by: Noah Sanci <nsanci@redhat.com>
---
debuginfod/debuginfod-client.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index 7d4b220f..6db82f79 100644
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -905,13 +905,23 @@ debuginfod_query_server (debuginfod_client *c,
{
/* PR28034 escape characters in completed url to %hh format. */
char *escaped_string;
+ char *loc;
escaped_string = curl_easy_escape(data[i].handle, filename, 0);
if (!escaped_string)
{
rc = -ENOMEM;
goto out2;
}
- snprintf(data[i].url, PATH_MAX, "%s/%s/%s/%s", server_url,
+
+ loc = strstr(escaped_string, "%2F");
+ if (loc != NULL)
+ while( (loc = strstr(loc, "%2F")) )
+ {
+ loc[0] = '/';
+ // pull the string back after replacement
+ memmove(loc+1,loc+3,strlen(loc+3)+1);
+ }
+ snprintf(data[i].url, PATH_MAX, "%s/%s/%s%s", server_url,
build_id_bytes, type, escaped_string);
curl_free(escaped_string);
}
--
2.31.1
next prev parent reply other threads:[~2021-08-27 15:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 19:27 Noah Sanci
2021-08-26 21:02 ` Frank Ch. Eigler
2021-08-27 14:44 ` Noah Sanci
2021-08-27 15:07 ` Noah Sanci [this message]
2021-08-27 15:30 ` Noah Sanci
2021-09-08 13:38 ` Mark Wielaard
2021-09-09 17:28 ` Noah Sanci
2021-09-12 17:24 ` Mark Wielaard
2021-09-13 16:20 ` Noah Sanci
2021-09-13 18:11 ` Noah Sanci
2021-09-16 10:35 ` Mark Wielaard
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=CAJXA7qiQTWKQ7_d4X0MSkV8r3PO+0E6h89mZsc64LxvtbiOm5w@mail.gmail.com \
--to=nsanci@redhat.com \
--cc=elfutils-devel@sourceware.org \
--cc=fche@redhat.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).