Bug 759030: Clean up Bugzilla::BugUrl modules

r=timello a=LpSolit

1 files changed, 10 insertions, 21 deletions

diff --git a/Bugzilla/BugUrl/Google.pm b/Bugzilla/BugUrl/Google.pm
index 08722c94f..8b8638c7a 100644
--- a/Bugzilla/BugUrl/Google.pm
+++ b/Bugzilla/BugUrl/Google.pm
@@ -9,16 +9,18 @@ package Bugzilla::BugUrl::Google;
 use strict;
 use base qw(Bugzilla::BugUrl);
 
-use Bugzilla::Error;
-use Bugzilla::Util;
-
 ###############################
 ####        Methods        ####
 ###############################
 
 sub should_handle {
     my ($class, $uri) = @_;
-    return ($uri->authority =~ /^code.google.com$/i) ? 1 : 0;
+
+    # Google Code URLs only have one form:
+    #   http(s)://code.google.com/p/PROJECT_NAME/issues/detail?id=1234
+    return ($uri->authority =~ /^code.google.com$/i
+            and $uri->path =~ m|^/p/[^/]+/issues/detail$|
+            and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0;
 }
 
 sub _check_value {
@@ -26,26 +28,13 @@ sub _check_value {
     
     $uri = $class->SUPER::_check_value($uri);
 
-    my $value = $uri->as_string;
-    # Google Code URLs only have one form:
-    #   http(s)://code.google.com/p/PROJECT_NAME/issues/detail?id=1234
-    my $project_name;
-    if ($uri->path =~ m|^/p/([^/]+)/issues/detail$|) {
-        $project_name = $1;
-    } else {
-        ThrowUserError('bug_url_invalid', { url => $value });
-    }
-    my $bug_id = $uri->query_param('id');
-    detaint_natural($bug_id);
-    if (!$bug_id) {
-        ThrowUserError('bug_url_invalid', { url => $value, reason => 'id' });
-    }
     # While Google Code URLs can be either HTTP or HTTPS,
     # always go with the HTTP scheme, as that's the default.
-    $value = "http://code.google.com/p/" . $project_name .
-             "/issues/detail?id=" . $bug_id;
+    if ($uri->scheme eq 'https') {
+        $uri->scheme('http');
+    }
 
-    return new URI($value);
+    return $uri;
 }
 
 1;