From 97c9b8b81d758873638d11fd6b54d33cf3b8e25e Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Wed, 31 Oct 2018 16:38:13 -0400 Subject: [PATCH] Bug 1436619 - http:// in URL field --- Bugzilla/Bug.pm | 8 ++------ enter_bug.cgi | 2 +- .../en/default/bug/create/create-client-bounty.html.tmpl | 2 +- .../template/en/default/bug/create/create-doc.html.tmpl | 2 +- .../en/default/bug/create/create-itrequest.html.tmpl | 2 +- .../en/default/bug/create/create-legal.html.tmpl | 2 +- .../en/default/bug/create/create-mobile-compat.html.tmpl | 2 +- .../en/default/bug/create/create-mozlist.html.tmpl | 2 +- .../en/default/bug/create/create-trademark.html.tmpl | 2 +- .../default/bug/create/create-user-engagement.html.tmpl | 2 +- .../en/default/bug/create/create-web-bounty.html.tmpl | 2 +- .../template/en/default/bug_modal/edit.html.tmpl | 1 + .../template/en/default/bug_modal/field.html.tmpl | 4 +++- template/en/default/bug/create/create-guided.html.tmpl | 2 +- template/en/default/bug/create/create.html.tmpl | 2 +- template/en/default/bug/edit.html.tmpl | 9 ++++++++- 16 files changed, 26 insertions(+), 20 deletions(-) diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index ee48ed7a2..2cebacbb8 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -1678,12 +1678,8 @@ sub _check_assigned_to { sub _check_bug_file_loc { my ($invocant, $url) = @_; $url = '' if !defined($url); - # On bug entry, if bug_file_loc is "http://", the default, use an - # empty value instead. However, on bug editing people can set that - # back if they *really* want to. - if (!ref $invocant && $url eq 'http://') { - $url = ''; - } + # TODO: Add validation. It has to be loose, since we have accepted `data:`, + # `javascript:` and any other values on the URL field. return $url; } diff --git a/enter_bug.cgi b/enter_bug.cgi index 33cdf8535..52528a5e9 100755 --- a/enter_bug.cgi +++ b/enter_bug.cgi @@ -306,7 +306,7 @@ else { $vars->{'alias'} = formvalue('alias'); $vars->{'short_desc'} = formvalue('short_desc'); - $vars->{'bug_file_loc'} = formvalue('bug_file_loc', "http://"); + $vars->{'bug_file_loc'} = formvalue('bug_file_loc'); $vars->{'keywords'} = formvalue('keywords'); $vars->{'dependson'} = formvalue('dependson'); $vars->{'blocked'} = formvalue('blocked'); diff --git a/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl index 14cc7b94e..b188a00d0 100644 --- a/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-client-bounty.html.tmpl @@ -165,7 +165,7 @@ function validateAndSubmit() { The full URL (hostname/subpage) where the issue exists (if the URL is especially long please just include it in the comments) - +
diff --git a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl index 61460b4ec..d040e58bc 100644 --- a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl @@ -139,7 +139,7 @@ function validateAndSubmit() { Page to Update + value="[% bug_file_loc FILTER html %]" placeholder="https://"> diff --git a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl index 60eb2cbfe..8bd51c09d 100644 --- a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl @@ -177,7 +177,7 @@ URL (optional): + value="[% bug_file_loc FILTER html %]" placeholder="https://"> diff --git a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl index 0a75cab2b..55deedc65 100644 --- a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl @@ -179,7 +179,7 @@ label.required:before { - + diff --git a/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl index 8f5cd038b..31c5f98f0 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mobile-compat.html.tmpl @@ -123,7 +123,7 @@ function validateAndSubmit() { Full Web Page Address + placeholder="https://"> diff --git a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl index b5d9579a8..f1b5326e2 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl @@ -153,7 +153,7 @@ URL: + value="[% bug_file_loc FILTER html %]" placeholder="https://"> diff --git a/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl index 2788c01d4..051a394c7 100644 --- a/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-trademark.html.tmpl @@ -69,7 +69,7 @@ URL (optional): + value="[% bug_file_loc FILTER html %]" placeholder="https://"> diff --git a/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl index 304aecabf..b8a4f5d5e 100644 --- a/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl @@ -148,7 +148,7 @@ function toggleGoalOther() {
Where would the user be sent when they click on the promotion?
- +
diff --git a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl index 1e9b41a11..62e4dd721 100644 --- a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl @@ -117,7 +117,7 @@ function validateAndSubmit() { The full URL (hostname/subpage) where the issue exists (if the URL is especially long please just include it in the comments)
- +
diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index a7362790f..4222323ae 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -1128,6 +1128,7 @@ field = bug_fields.bug_file_loc field_type = constants.FIELD_TYPE_FREETEXT hide_on_view = bug.bug_file_loc == "" + default = "https://" help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#bug_file_loc" %] [% INCLUDE bug_url_link %] diff --git a/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl index 2dce818c5..e6933ef29 100644 --- a/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/field.html.tmpl @@ -217,7 +217,9 @@ END; [% CASE constants.FIELD_TYPE_FREETEXT %] [%# normal input field %] - + [% CASE constants.FIELD_TYPE_USER %] [% IF action && !action.hidden %]