From: Krzesimir Nowak <krzesimir@endocode.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, jnareb@gmail.com, sunshine@sunshineco.com,
Krzesimir Nowak <krzesimir@endocode.com>
Subject: [PATCH 2/5] gitweb: Move check-ref-format code into separate function
Date: Wed, 4 Dec 2013 14:43:00 +0100 [thread overview]
Message-ID: <1386164583-14109-3-git-send-email-krzesimir@endocode.com> (raw)
In-Reply-To: <1386164583-14109-1-git-send-email-krzesimir@endocode.com>
This check will be used in more than one place later.
Signed-off-by: Krzesimir Nowak <krzesimir@endocode.com>
Reviewed-by: Junio C Hamano <gitster@pobox.com>
Reviewed-by: Jakub Narębski <jnareb@gmail.com>
---
gitweb/gitweb.perl | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index ee61f9e..67415b9 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1452,6 +1452,16 @@ sub validate_pathname {
return $input;
}
+sub check_ref_format {
+ my $input = shift || return undef;
+
+ # restrictions on ref name according to git-check-ref-format
+ if ($input =~ m!(/\.|\.\.|[\000-\040\177 ~^:?*\[]|/$)!) {
+ return undef;
+ }
+ return $input;
+}
+
sub validate_refname {
my $input = shift || return undef;
@@ -1462,10 +1472,9 @@ sub validate_refname {
# it must be correct pathname
$input = validate_pathname($input)
or return undef;
- # restrictions on ref name according to git-check-ref-format
- if ($input =~ m!(/\.|\.\.|[\000-\040\177 ~^:?*\[]|/$)!) {
- return undef;
- }
+ # check git-check-ref-format restrictions
+ check_ref_format($input)
+ or return undef;
return $input;
}
--
1.8.3.1
next prev parent reply other threads:[~2013-12-04 13:43 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-04 13:42 [PATCH 0/5] Show extra branch refs in gitweb v6 Krzesimir Nowak
2013-12-04 13:42 ` [PATCH 1/5] gitweb: Add a comment explaining the meaning of $/ Krzesimir Nowak
2013-12-04 15:11 ` Jakub Narębski
2013-12-04 15:46 ` Krzesimir Nowak
2013-12-04 16:19 ` Martin Langhoff
2013-12-04 20:28 ` Junio C Hamano
2013-12-05 9:16 ` Krzesimir Nowak
2013-12-04 17:34 ` Jakub Narębski
2013-12-04 17:37 ` Jakub Narębski
2013-12-04 13:43 ` Krzesimir Nowak [this message]
2013-12-04 15:56 ` [PATCH 2/5] gitweb: Move check-ref-format code into separate function Jakub Narębski
2013-12-05 9:19 ` Krzesimir Nowak
2013-12-04 20:31 ` Junio C Hamano
2013-12-05 9:18 ` Krzesimir Nowak
2013-12-04 13:43 ` [PATCH 3/5] gitweb: Return plain booleans in validation methods Krzesimir Nowak
2013-12-04 16:07 ` Jakub Narębski
2013-12-04 18:11 ` Junio C Hamano
2013-12-05 9:23 ` Krzesimir Nowak
2013-12-05 18:16 ` Junio C Hamano
2013-12-05 19:11 ` Jakub Narębski
2013-12-05 20:01 ` Junio C Hamano
2013-12-04 13:43 ` [PATCH 4/5] gitweb: Add a feature for adding more branch refs Krzesimir Nowak
2013-12-04 18:06 ` Jakub Narębski
2013-12-05 10:00 ` Krzesimir Nowak
2013-12-05 11:40 ` Jakub Narębski
2013-12-10 16:04 ` Krzesimir Nowak
2013-12-10 18:54 ` Junio C Hamano
2013-12-10 19:06 ` Jakub Narębski
2013-12-10 19:44 ` Junio C Hamano
2013-12-04 13:43 ` [PATCH 5/5] gitweb: Denote non-heads, non-remotes branches Krzesimir Nowak
2013-12-04 18:54 ` Jakub Narębski
2013-12-04 20:37 ` [PATCH 0/5] Show extra branch refs in gitweb v6 Junio C Hamano
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=1386164583-14109-3-git-send-email-krzesimir@endocode.com \
--to=krzesimir@endocode.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=sunshine@sunshineco.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 NNTP newsgroup(s).