aboutsummaryrefslogtreecommitdiffstats
path: root/Bugzilla/BugUrl/Debian.pm
diff options
context:
space:
mode:
authorMatt Selsky <selsky@columbia.edu>2012-06-17 14:19:09 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2012-06-17 14:19:09 +0200
commit4c236f418a7122cecd22c36c679a7b9faf5469f7 (patch)
tree93326ee30db6f08ef84a99f74fdb8f6fea3e9d8e /Bugzilla/BugUrl/Debian.pm
parent35bf9943a87018e6cfa2d49f83f77c22205ddfc0 (diff)
downloadbugs-4c236f418a7122cecd22c36c679a7b9faf5469f7.tar
bugs-4c236f418a7122cecd22c36c679a7b9faf5469f7.tar.gz
bugs-4c236f418a7122cecd22c36c679a7b9faf5469f7.tar.bz2
bugs-4c236f418a7122cecd22c36c679a7b9faf5469f7.tar.xz
bugs-4c236f418a7122cecd22c36c679a7b9faf5469f7.zip
Bug 759030: Clean up Bugzilla::BugUrl modules
r=timello a=LpSolit
Diffstat (limited to 'Bugzilla/BugUrl/Debian.pm')
-rw-r--r--Bugzilla/BugUrl/Debian.pm32
1 files changed, 12 insertions, 20 deletions
diff --git a/Bugzilla/BugUrl/Debian.pm b/Bugzilla/BugUrl/Debian.pm
index c11a49910..78397bdd9 100644
--- a/Bugzilla/BugUrl/Debian.pm
+++ b/Bugzilla/BugUrl/Debian.pm
@@ -9,16 +9,20 @@ package Bugzilla::BugUrl::Debian;
use strict;
use base qw(Bugzilla::BugUrl);
-use Bugzilla::Error;
-use Bugzilla::Util;
-
###############################
#### Methods ####
###############################
sub should_handle {
my ($class, $uri) = @_;
- return ($uri->authority =~ /^bugs.debian.org$/i) ? 1 : 0;
+
+ # Debian BTS URLs can look like various things:
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1234
+ # http://bugs.debian.org/1234
+ return ($uri->authority =~ /^bugs.debian.org$/i
+ and (($uri->path =~ /bugreport\.cgi$/
+ and $uri->query_param('bug') =~ m|^\d+$|)
+ or $uri->path =~ m|^/\d+$|)) ? 1 : 0;
}
sub _check_value {
@@ -26,24 +30,12 @@ sub _check_value {
my $uri = $class->SUPER::_check_value(@_);
- # Debian BTS URLs can look like various things:
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1234
- # http://bugs.debian.org/1234
- my $bug_id;
- if ($uri->path =~ m|^/(\d+)$|) {
- $bug_id = $1;
- }
- elsif ($uri->path =~ /bugreport\.cgi$/) {
- $bug_id = $uri->query_param('bug');
- detaint_natural($bug_id);
- }
- if (!$bug_id) {
- ThrowUserError('bug_url_invalid',
- { url => $uri->path, reason => 'id' });
- }
# This is the shortest standard URL form for Debian BTS URLs,
# and so we reduce all URLs to this.
- return new URI("http://bugs.debian.org/" . $bug_id);
+ $uri->path =~ m|^/(\d+)$| || $uri->query_param('bug') =~ m|^(\d+)$|;
+ $uri = new URI("http://bugs.debian.org/$1");
+
+ return $uri;
}
1;