From: Eric Wong <normalperson@yhbt•net>
To: "Michael G. Schwern" <schwern@pobox•com>
Cc: git@vger•kernel.org, gitster@pobox•com, robbat2@gentoo•org,
bwalton@artsci•utoronto.ca, jrnieder@gmail•com
Subject: Re: [PATCH 3/7] Extract, test and enhance the logic to collapse ../foo paths.
Date: Mon, 30 Jul 2012 19:51:08 +0000 [thread overview]
Message-ID: <20120730195108.GA20137@dcvr.yhbt.net> (raw)
In-Reply-To: <1343468312-72024-4-git-send-email-schwern@pobox.com>
"Michael G. Schwern" <schwern@pobox•com> wrote:
> From: "Michael G. Schwern" <schwern@pobox•com>
>
> The SVN API functions will not accept ../foo but their canonicalization
> functions will not collapse it. So we'll have to do it ourselves.
>
> _collapse_dotdot() works better than the existing regex did.
I don't dispute it's better, but it's worth explaining in the commit
message to reviewers why something is "better".
> This will be used shortly when canonicalize_path() starts using the
> SVN API.
> ---
> +# Turn foo/../bar into bar
> +sub _collapse_dotdot {
> + my $path = shift;
> +
> + 1 while $path =~ s{/[^/]+/+\.\.}{};
> + 1 while $path =~ s{[^/]+/+\.\./}{};
> + 1 while $path =~ s{[^/]+/+\.\.}{};
This is a bug that's gone unnoticed[1] for over 5 years now,
but I've just noticed this doesn' handle "foo/..bar" or "foo/...bar"
cases correctly.
> sub canonicalize_path {
> my ($path) = @_;
> my $dot_slash_added = 0;
> @@ -83,7 +95,7 @@ sub canonicalize_path {
> # good reason), so let's do this manually.
> $path =~ s#/+#/#g;
> $path =~ s#/\.(?:/|$)#/#g;
> - $path =~ s#/[^/]+/\.\.##g;
> + $path = _collapse_dotdot($path);
[1] - I doubt anybody uses paths like these, though...
next prev parent reply other threads:[~2012-07-30 19:51 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-28 9:38 Canonicalize the git-svn path & url accessors Michael G. Schwern
2012-07-28 9:38 ` [PATCH 1/7] Move the canonicalization functions to Git::SVN::Utils Michael G. Schwern
2012-07-28 9:38 ` [PATCH 2/7] Change canonicalize_url() to use the SVN 1.7 API when available Michael G. Schwern
2012-07-28 13:50 ` Jonathan Nieder
2012-07-28 19:01 ` Michael G Schwern
2012-07-28 19:30 ` Jonathan Nieder
2012-07-28 19:51 ` Michael G Schwern
2012-07-28 19:57 ` Jonathan Nieder
2012-07-28 20:02 ` Jonathan Nieder
2012-07-28 20:24 ` Michael G Schwern
2012-10-14 11:42 ` [PATCH/RFC 0/2] " Jonathan Nieder
2012-10-14 11:45 ` [PATCH 1/2] git svn: do not overescape URLs (fallback case) Jonathan Nieder
2012-10-14 11:48 ` [PATCH 2/2] git svn: canonicalize_url(): use svn_path_canonicalize when available Jonathan Nieder
2012-10-23 22:58 ` Eric Wong
2012-07-28 9:38 ` [PATCH 3/7] Extract, test and enhance the logic to collapse ../foo paths Michael G. Schwern
2012-07-30 19:51 ` Eric Wong [this message]
2012-07-30 20:46 ` Michael G Schwern
2012-09-26 19:45 ` Jonathan Nieder
2012-09-26 20:58 ` Eric Wong
2012-09-26 21:38 ` Jonathan Nieder
2012-09-26 21:54 ` Eric Wong
2012-09-26 22:43 ` Jonathan Nieder
2012-09-27 0:15 ` Eric Wong
2012-09-27 2:11 ` Jonathan Nieder
2012-07-28 9:38 ` [PATCH 4/7] Add join_paths() to safely concatenate paths Michael G. Schwern
2012-09-26 20:51 ` Jonathan Nieder
2012-07-28 9:38 ` [PATCH 5/7] Remove irrelevant comment Michael G. Schwern
2012-07-28 9:38 ` [PATCH 6/7] Switch path canonicalization to use the SVN API Michael G. Schwern
2012-07-28 13:55 ` Jonathan Nieder
2012-07-28 19:07 ` Michael G Schwern
2012-07-30 20:04 ` Eric Wong
2012-08-02 21:51 ` Eric Wong
2012-08-02 23:18 ` Michael G Schwern
2012-10-05 7:04 ` [PATCH] git-svn: keep leading slash when canonicalizing paths (fallback case) Jonathan Nieder
2012-10-05 23:12 ` Eric Wong
2012-10-06 5:36 ` Junio C Hamano
2012-07-28 9:38 ` [PATCH 7/7] Make Git::SVN and Git::SVN::Ra canonicalize paths and urls Michael G. Schwern
2012-07-28 14:11 ` Jonathan Nieder
2012-07-28 19:15 ` Michael G Schwern
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=20120730195108.GA20137@dcvr.yhbt.net \
--to=normalperson@yhbt$(echo .)net \
--cc=bwalton@artsci$(echo .)utoronto.ca \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
--cc=robbat2@gentoo$(echo .)org \
--cc=schwern@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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