Skip to content

Bug 2021336: (Secure) #2560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dklawren merged 1 commit into from
Mar 5, 2026
+2 −24
Merged

Bug 2021336: (Secure) #2560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions Bugzilla/Search.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,30 +970,8 @@ sub _sql {
$timeout_comment = "/*+ MAX_EXECUTION_TIME($ms) */";
}

# Add some user information to the SQL so we can pinpoint where some
# slow running queries originate and help to refine the searches.
my $cgi = Bugzilla->cgi;
my $remote_ip = remote_ip();
my $user_agent = $cgi->user_agent || $cgi->script_name;
my $query_string = $cgi->canonicalize_query();

# Sanitize user-controlled fields to prevent SQL injection in user agent
# and query parameters
for ($user_agent, $query_string) {
# Remove SQL comment terminators and newlines
s/[*]//g;
s/[\r\n]+/ /g;
s/[^\x20-\x7E]/ /g; # Replace non-printable characters with space
}

my $query = <<"END";
/*
user-id: $user_id
remote-ip: $remote_ip
user-agent: $user_agent
query-string: $query_string
*/
SELECT $timeout_comment $select
SELECT $timeout_comment $select
FROM $from
WHERE $where
$group_by$order_by$limit
Expand Down
2 changes: 1 addition & 1 deletion t/007util.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,4 @@ $past = $now->clone->subtract(days => 2);
is(time_ago($past), '2 days ago', 'time_ago(DateTime 2 days ago) returns "2 days ago"');

$past = $now->clone->subtract(months => 1);
like(time_ago($past), qr/^(1 month|2[89]|3[01] days) ago$/, 'time_ago(DateTime 1 month ago) is reasonable');
like(time_ago($past), qr/^(1 month|(2[89]|3[01]) days) ago$/, 'time_ago(DateTime 1 month ago) is reasonable');