From 4c236f418a7122cecd22c36c679a7b9faf5469f7 Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Sun, 17 Jun 2012 14:19:09 +0200
Subject: Bug 759030: Clean up Bugzilla::BugUrl modules r=timello a=LpSolit

---
 Bugzilla/BugUrl/Debian.pm | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

(limited to 'Bugzilla/BugUrl/Debian.pm')

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;
-- 
cgit v1.2.1