Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
bugzilla
Commits
c9aaffd4
Commit
c9aaffd4
authored
Nov 26, 2011
by
Frédéric Buclin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 255606: Do not let buglist.cgi return all bugs by default
r/a=mkanat
parent
92cb17e0
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
35 additions
and
7 deletions
+35
-7
Config.pm
Bugzilla/Config.pm
+5
-0
Query.pm
Bugzilla/Config/Query.pm
+1
-1
Search.pm
Bugzilla/Search.pm
+5
-0
buglist.cgi
buglist.cgi
+1
-1
collectstats.pl
collectstats.pl
+1
-0
query.html.tmpl
template/en/default/admin/params/query.html.tmpl
+8
-3
messages.html.tmpl
template/en/default/global/messages.html.tmpl
+4
-0
search-specific.html.tmpl
template/en/default/search/search-specific.html.tmpl
+1
-1
whine.pl
whine.pl
+9
-1
No files found.
Bugzilla/Config.pm
View file @
c9aaffd4
...
...
@@ -193,6 +193,11 @@ sub update_params {
$new_params
{
'ssl_redirect'
}
=
1
;
}
# "specific_search_allow_empty_words" has been renamed to "search_allow_no_criteria".
if
(
exists
$param
->
{
'specific_search_allow_empty_words'
})
{
$new_params
{
'search_allow_no_criteria'
}
=
$param
->
{
'specific_search_allow_empty_words'
};
}
# --- DEFAULTS FOR NEW PARAMS ---
_load_params
unless
%
params
;
...
...
Bugzilla/Config/Query.pm
View file @
c9aaffd4
...
...
@@ -68,7 +68,7 @@ sub get_param_list {
},
{
name
=>
's
pecific_search_allow_empty_words
'
,
name
=>
's
earch_allow_no_criteria
'
,
type
=>
'b'
,
default
=>
1
},
...
...
Bugzilla/Search.pm
View file @
c9aaffd4
...
...
@@ -1168,6 +1168,11 @@ sub _sql_where {
if
(
$clause_sql
)
{
$where
.=
"\n AND "
.
$clause_sql
;
}
elsif
(
!
Bugzilla
->
params
->
{
'search_allow_no_criteria'
}
&&
!
$self
->
{
allow_unlimited
})
{
ThrowUserError
(
'buglist_parameters_required'
);
}
return
$where
;
}
...
...
buglist.cgi
View file @
c9aaffd4
...
...
@@ -82,7 +82,7 @@ if (defined($searchstring)) {
# If configured to not allow empty words, reject empty searches from the
# Find a Specific Bug search form, including words being a single or
# several consecutive whitespaces only.
if
(
!
Bugzilla
->
params
->
{
's
pecific_search_allow_empty_words
'
}
if
(
!
Bugzilla
->
params
->
{
's
earch_allow_no_criteria
'
}
&&
defined
(
$cgi
->
param
(
'content'
))
&&
$cgi
->
param
(
'content'
)
=~
/^\s*$/
)
{
ThrowUserError
(
"buglist_parameters_required"
);
...
...
collectstats.pl
View file @
c9aaffd4
...
...
@@ -507,6 +507,7 @@ sub CollectSeriesData {
eval
{
my
$search
=
new
Bugzilla::
Search
(
'params'
=>
scalar
$cgi
->
Vars
,
'fields'
=>
[
"bug_id"
],
'allow_unlimited'
=>
1
,
'user'
=>
$user
);
my
$sql
=
$search
->
sql
;
$data
=
$shadow_dbh
->
selectall_arrayref
(
$sql
);
...
...
template/en/default/admin/params/query.html.tmpl
View file @
c9aaffd4
...
...
@@ -51,9 +51,14 @@
"access the advanced query page. It's in URL parameter " _
"format, which makes it hard to read. Sorry!",
specific_search_allow_empty_words =>
"Whether to allow a search on the 'Simple Search' page with an empty"
_ " 'Words' field.",
search_allow_no_criteria =>
"Unless the code explicitly allows all $terms.bugs to be returned, this " _
"parameter permits to block the execution of queries with no criteria. " _
"When turned off, a query must have some criteria specified to limit " _
"the number of $terms.bugs returned to the user. When turned on, a user " _
"is allowed to run a query with no criteria and get all $terms.bugs he can " _
"see in his list. Turning this parameter on is not recommended on large " _
"installations.",
default_search_limit =>
"By default, $terms.Bugzilla limits searches done in the web"
...
...
template/en/default/global/messages.html.tmpl
View file @
c9aaffd4
...
...
@@ -920,6 +920,10 @@
No changes made to version <em>[% version.name FILTER html %]</em>.
[% END %]
[% ELSIF message_tag == "whine_query_failed" %]
The query '[% query_name FILTER html %]' from [% author.login FILTER html %]
failed: [% reason FILTER html %]
[% ELSIF message_tag == "workflow_updated" %]
The workflow has been updated.
[% END %]
...
...
template/en/default/search/search-specific.html.tmpl
View file @
c9aaffd4
...
...
@@ -108,7 +108,7 @@ for "crash secure SSL flash".
<td></td>
<td>
[% IF Param('s
pecific_search_allow_empty_words
') %]
[% IF Param('s
earch_allow_no_criteria
') %]
<input type="submit" id="search" value="Search">
[% ELSE %]
<input type="submit" id="search" value="Search"
...
...
whine.pl
View file @
c9aaffd4
...
...
@@ -452,7 +452,15 @@ sub run_queries {
'params'
=>
scalar
$searchparams
->
Vars
,
'user'
=>
$args
->
{
'recipient'
},
# the search runs as the recipient
);
my
$sqlquery
=
$search
->
sql
;
# If a query fails for whatever reason, it shouldn't kill the script.
my
$sqlquery
=
eval
{
$search
->
sql
};
if
(
$@
)
{
say
get_text
(
'whine_query_failed'
,
{
query_name
=>
$thisquery
->
{
'name'
},
author
=>
$args
->
{
'author'
},
reason
=>
$@
});
next
;
}
$sth
=
$dbh
->
prepare
(
$sqlquery
);
$sth
->
execute
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment