summaryrefslogtreecommitdiffstats
path: root/attachment.cgi
diff options
context:
space:
mode:
Diffstat (limited to 'attachment.cgi')
-rwxr-xr-xattachment.cgi1172
1 files changed, 612 insertions, 560 deletions
diff --git a/attachment.cgi b/attachment.cgi
index e1009c18e..01ee9a9e2 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -39,9 +39,9 @@ use MIME::Base64 qw(decode_base64);
# when preparing Bugzilla for mod_perl, this script used these
# variables in so many subroutines that it was easier to just
# make them globals.
-local our $cgi = Bugzilla->cgi;
-local our $template = Bugzilla->template;
-local our $vars = {};
+local our $cgi = Bugzilla->cgi;
+local our $template = Bugzilla->template;
+local our $vars = {};
local $Bugzilla::CGI::ALLOW_UNSAFE_RESPONSE = 1;
################################################################################
@@ -59,64 +59,57 @@ my $format = $cgi->param('format') || '';
# BMO: Don't allow updating of bugs if disabled
if (Bugzilla->params->{disable_bug_updates} && $cgi->request_method eq 'POST') {
- ThrowErrorPage('bug/process/updates-disabled.html.tmpl',
- 'Bug updates are currently disabled.');
+ ThrowErrorPage(
+ 'bug/process/updates-disabled.html.tmpl',
+ 'Bug updates are currently disabled.'
+ );
}
# You must use the appropriate urlbase param when doing anything
# but viewing an attachment, or a raw diff.
if ($action ne 'view'
- && (($action !~ /^(?:interdiff|diff)$/) || $format ne 'raw'))
+ && (($action !~ /^(?:interdiff|diff)$/) || $format ne 'raw'))
{
- do_ssl_redirect_if_required();
- if ($cgi->url_is_attachment_base) {
- $cgi->redirect_to_urlbase;
- }
- Bugzilla->login();
+ do_ssl_redirect_if_required();
+ if ($cgi->url_is_attachment_base) {
+ $cgi->redirect_to_urlbase;
+ }
+ Bugzilla->login();
}
# When viewing an attachment, do not request credentials if we are on
# the alternate host. Let view() decide when to call Bugzilla->login.
-if ($action eq "view")
-{
- view();
+if ($action eq "view") {
+ view();
}
-elsif ($action eq "interdiff")
-{
- interdiff();
+elsif ($action eq "interdiff") {
+ interdiff();
}
-elsif ($action eq "diff")
-{
- diff();
+elsif ($action eq "diff") {
+ diff();
}
-elsif ($action eq "viewall")
-{
- viewall();
+elsif ($action eq "viewall") {
+ viewall();
}
-elsif ($action eq "enter")
-{
- Bugzilla->login(LOGIN_REQUIRED);
- enter();
+elsif ($action eq "enter") {
+ Bugzilla->login(LOGIN_REQUIRED);
+ enter();
}
-elsif ($action eq "insert")
-{
- Bugzilla->login(LOGIN_REQUIRED);
- insert();
+elsif ($action eq "insert") {
+ Bugzilla->login(LOGIN_REQUIRED);
+ insert();
}
-elsif ($action eq "edit")
-{
- edit();
+elsif ($action eq "edit") {
+ edit();
}
-elsif ($action eq "update")
-{
- Bugzilla->login(LOGIN_REQUIRED);
- update();
+elsif ($action eq "update") {
+ Bugzilla->login(LOGIN_REQUIRED);
+ update();
}
elsif ($action eq "delete") {
- delete_attachment();
+ delete_attachment();
}
-else
-{
+else {
ThrowUserError('unknown_action', {action => $action});
}
@@ -138,72 +131,73 @@ exit;
# Returns an attachment object.
sub validateID {
- my($param, $dont_validate_access) = @_;
- $param ||= 'id';
+ my ($param, $dont_validate_access) = @_;
+ $param ||= 'id';
- # If we're not doing interdiffs, check if id wasn't specified and
- # prompt them with a page that allows them to choose an attachment.
- # Happens when calling plain attachment.cgi from the urlbar directly
- if ($param eq 'id' && !$cgi->param('id')) {
- print $cgi->header();
- $template->process("attachment/choose.html.tmpl", $vars) ||
- ThrowTemplateError($template->error());
- exit;
- }
+ # If we're not doing interdiffs, check if id wasn't specified and
+ # prompt them with a page that allows them to choose an attachment.
+ # Happens when calling plain attachment.cgi from the urlbar directly
+ if ($param eq 'id' && !$cgi->param('id')) {
+ print $cgi->header();
+ $template->process("attachment/choose.html.tmpl", $vars)
+ || ThrowTemplateError($template->error());
+ exit;
+ }
- my $attach_id = $cgi->param($param);
+ my $attach_id = $cgi->param($param);
- # Validate the specified attachment id. detaint kills $attach_id if
- # non-natural, so use the original value from $cgi in our exception
- # message here.
- detaint_natural($attach_id)
- || ThrowUserError("invalid_attach_id",
- { attach_id => scalar $cgi->param($param) });
+ # Validate the specified attachment id. detaint kills $attach_id if
+ # non-natural, so use the original value from $cgi in our exception
+ # message here.
+ detaint_natural($attach_id)
+ || ThrowUserError("invalid_attach_id",
+ {attach_id => scalar $cgi->param($param)});
- # Make sure the attachment exists in the database.
- my $attachment = new Bugzilla::Attachment({ id => $attach_id, cache => 1 })
- || ThrowUserError("invalid_attach_id", { attach_id => $attach_id });
+ # Make sure the attachment exists in the database.
+ my $attachment = new Bugzilla::Attachment({id => $attach_id, cache => 1})
+ || ThrowUserError("invalid_attach_id", {attach_id => $attach_id});
- return $attachment if ($dont_validate_access || check_can_access($attachment));
+ return $attachment if ($dont_validate_access || check_can_access($attachment));
}
# Make sure the current user has access to the specified attachment.
sub check_can_access {
- my $attachment = shift;
- my $user = Bugzilla->user;
-
- # Make sure the user is authorized to access this attachment's bug.
- Bugzilla::Bug->check({ id => $attachment->bug_id, cache => 1 });
- if ($attachment->isprivate && $user->id != $attachment->attacher->id
- && !$user->is_insider)
- {
- ThrowUserError('auth_failure', {action => 'access',
- object => 'attachment',
- attach_id => $attachment->id});
- }
- return 1;
+ my $attachment = shift;
+ my $user = Bugzilla->user;
+
+ # Make sure the user is authorized to access this attachment's bug.
+ Bugzilla::Bug->check({id => $attachment->bug_id, cache => 1});
+ if ( $attachment->isprivate
+ && $user->id != $attachment->attacher->id
+ && !$user->is_insider)
+ {
+ ThrowUserError('auth_failure',
+ {action => 'access', object => 'attachment', attach_id => $attachment->id});
+ }
+ return 1;
}
# Determines if the attachment is public -- that is, if users who are
# not logged in have access to the attachment
sub attachmentIsPublic {
- my $attachment = shift;
+ my $attachment = shift;
- return 0 if Bugzilla->params->{'requirelogin'};
- return 0 if $attachment->isprivate;
+ return 0 if Bugzilla->params->{'requirelogin'};
+ return 0 if $attachment->isprivate;
- my $anon_user = new Bugzilla::User;
- return $anon_user->can_see_bug($attachment->bug_id);
+ my $anon_user = new Bugzilla::User;
+ return $anon_user->can_see_bug($attachment->bug_id);
}
# Validates format of a diff/interdiff. Takes a list as an parameter, which
# defines the valid format values. Will throw an error if the format is not
# in the list. Returns either the user selected or default format.
sub validateFormat {
+
# receives a list of legal formats; first item is a default
my $format = $cgi->param('format') || $_[0];
if (not grep($_ eq $format, @_)) {
- ThrowUserError("invalid_format", { format => $format, formats => \@_ });
+ ThrowUserError("invalid_format", {format => $format, formats => \@_});
}
return $format;
@@ -211,13 +205,12 @@ sub validateFormat {
# Validates context of a diff/interdiff. Will throw an error if the context
# is not number, "file" or "patch". Returns the validated, detainted context.
-sub validateContext
-{
+sub validateContext {
my $context = $cgi->param('context') || "patch";
if ($context ne "file" && $context ne "patch") {
- my $orig_context = $context;
- detaint_natural($context)
- || ThrowUserError("invalid_context", { context => $orig_context });
+ my $orig_context = $context;
+ detaint_natural($context)
+ || ThrowUserError("invalid_context", {context => $orig_context});
}
return $context;
@@ -226,127 +219,143 @@ sub validateContext
# Gets the attachment object(s) generated by validateID, while ensuring
# attachbase and token authentication is used when required.
sub get_attachment {
- my @field_names = @_ ? @_ : qw(id);
+ my @field_names = @_ ? @_ : qw(id);
+
+ my %attachments;
- my %attachments;
+ if (use_attachbase()) {
- if (use_attachbase()) {
- # Load each attachment, and ensure they are all from the same bug
- my $bug_id = 0;
+ # Load each attachment, and ensure they are all from the same bug
+ my $bug_id = 0;
+ foreach my $field_name (@field_names) {
+ my $attachment = validateID($field_name, 1);
+ if (!$bug_id) {
+ $bug_id = $attachment->bug_id;
+ }
+ elsif ($attachment->bug_id != $bug_id) {
+ ThrowUserError('attachment_bug_id_mismatch');
+ }
+ $attachments{$field_name} = $attachment;
+ }
+ my @args = map { $_ . '=' . $attachments{$_}->id } @field_names;
+ my $cgi_params = $cgi->canonicalise_query(@field_names, 't', 'Bugzilla_login',
+ 'Bugzilla_password');
+ push(@args, $cgi_params) if $cgi_params;
+ my $path = 'attachment.cgi?' . join('&', @args);
+
+ # Make sure the attachment is served from the correct server.
+ if ($cgi->url_is_attachment_base($bug_id)) {
+
+ # No need to validate the token for public attachments. We cannot request
+ # credentials as we are on the alternate host.
+ if (!all_attachments_are_public(\%attachments)) {
+ my $token = $cgi->param('t');
+ my ($userid, undef, $token_data) = Bugzilla::Token::GetTokenData($token);
+ my %token_data = unpack_token_data($token_data);
+ my $valid_token = 1;
foreach my $field_name (@field_names) {
- my $attachment = validateID($field_name, 1);
- if (!$bug_id) {
- $bug_id = $attachment->bug_id;
- } elsif ($attachment->bug_id != $bug_id) {
- ThrowUserError('attachment_bug_id_mismatch');
- }
- $attachments{$field_name} = $attachment;
- }
- my @args = map { $_ . '=' . $attachments{$_}->id } @field_names;
- my $cgi_params = $cgi->canonicalise_query(@field_names, 't',
- 'Bugzilla_login', 'Bugzilla_password');
- push(@args, $cgi_params) if $cgi_params;
- my $path = 'attachment.cgi?' . join('&', @args);
-
- # Make sure the attachment is served from the correct server.
- if ($cgi->url_is_attachment_base($bug_id)) {
- # No need to validate the token for public attachments. We cannot request
- # credentials as we are on the alternate host.
- if (!all_attachments_are_public(\%attachments)) {
- my $token = $cgi->param('t');
- my ($userid, undef, $token_data) = Bugzilla::Token::GetTokenData($token);
- my %token_data = unpack_token_data($token_data);
- my $valid_token = 1;
- foreach my $field_name (@field_names) {
- my $token_id = $token_data{$field_name};
- if (!$token_id
- || !detaint_natural($token_id)
- || $attachments{$field_name}->id != $token_id)
- {
- $valid_token = 0;
- last;
- }
- }
- unless ($userid && $valid_token) {
- # Not a valid token.
- print $cgi->redirect('-location' => Bugzilla->localconfig->{urlbase} . $path);
- exit;
- }
- # Change current user without creating cookies.
- Bugzilla->set_user(new Bugzilla::User($userid));
- # Tokens are single use only, delete it.
- delete_token($token);
- }
- }
- elsif ($cgi->url_is_attachment_base) {
- # If we come here, this means that each bug has its own host
- # for attachments, and that we are trying to view one attachment
- # using another bug's host. That's not desired.
- $cgi->redirect_to_urlbase;
+ my $token_id = $token_data{$field_name};
+ if ( !$token_id
+ || !detaint_natural($token_id)
+ || $attachments{$field_name}->id != $token_id)
+ {
+ $valid_token = 0;
+ last;
+ }
}
- else {
- # We couldn't call Bugzilla->login earlier as we first had to
- # make sure we were not going to request credentials on the
- # alternate host.
- Bugzilla->login();
- my $attachbase = Bugzilla->localconfig->{'attachment_base'};
- # Replace %bugid% by the ID of the bug the attachment
- # belongs to, if present.
- $attachbase =~ s/\%bugid\%/$bug_id/;
- # To avoid leaking information we redirect using the attachment ID only
- $path = 'attachment.cgi?' . join('&', map { 'id=' . $attachments{$_}->id } keys %attachments);
- if (all_attachments_are_public(\%attachments)) {
- # No need for a token; redirect to attachment base.
- print $cgi->redirect(-location => $attachbase . $path);
- exit;
- } else {
- # Make sure the user can view the attachment.
- foreach my $field_name (@field_names) {
- check_can_access($attachments{$field_name});
- }
- # Create a token and redirect.
- my $token = url_quote(issue_session_token(pack_token_data(\%attachments)));
- print $cgi->redirect(-location => $attachbase . "$path&t=$token");
- exit;
- }
+ unless ($userid && $valid_token) {
+
+ # Not a valid token.
+ print $cgi->redirect('-location' => Bugzilla->localconfig->{urlbase} . $path);
+ exit;
}
- } else {
- do_ssl_redirect_if_required();
- # No alternate host is used. Request credentials if required.
- Bugzilla->login();
+
+ # Change current user without creating cookies.
+ Bugzilla->set_user(new Bugzilla::User($userid));
+
+ # Tokens are single use only, delete it.
+ delete_token($token);
+ }
+ }
+ elsif ($cgi->url_is_attachment_base) {
+
+ # If we come here, this means that each bug has its own host
+ # for attachments, and that we are trying to view one attachment
+ # using another bug's host. That's not desired.
+ $cgi->redirect_to_urlbase;
+ }
+ else {
+ # We couldn't call Bugzilla->login earlier as we first had to
+ # make sure we were not going to request credentials on the
+ # alternate host.
+ Bugzilla->login();
+ my $attachbase = Bugzilla->localconfig->{'attachment_base'};
+
+ # Replace %bugid% by the ID of the bug the attachment
+ # belongs to, if present.
+ $attachbase =~ s/\%bugid\%/$bug_id/;
+
+ # To avoid leaking information we redirect using the attachment ID only
+ $path = 'attachment.cgi?'
+ . join('&', map { 'id=' . $attachments{$_}->id } keys %attachments);
+ if (all_attachments_are_public(\%attachments)) {
+
+ # No need for a token; redirect to attachment base.
+ print $cgi->redirect(-location => $attachbase . $path);
+ exit;
+ }
+ else {
+ # Make sure the user can view the attachment.
foreach my $field_name (@field_names) {
- $attachments{$field_name} = validateID($field_name);
+ check_can_access($attachments{$field_name});
}
+
+ # Create a token and redirect.
+ my $token = url_quote(issue_session_token(pack_token_data(\%attachments)));
+ print $cgi->redirect(-location => $attachbase . "$path&t=$token");
+ exit;
+ }
+ }
+ }
+ else {
+ do_ssl_redirect_if_required();
+
+ # No alternate host is used. Request credentials if required.
+ Bugzilla->login();
+ foreach my $field_name (@field_names) {
+ $attachments{$field_name} = validateID($field_name);
}
+ }
- return wantarray
- ? map { $attachments{$_} } @field_names
- : $attachments{$field_names[0]};
+ return
+ wantarray
+ ? map { $attachments{$_} } @field_names
+ : $attachments{$field_names[0]};
}
sub all_attachments_are_public {
- my $attachments = shift;
- foreach my $field_name (keys %$attachments) {
- if (!attachmentIsPublic($attachments->{$field_name})) {
- return 0;
- }
+ my $attachments = shift;
+ foreach my $field_name (keys %$attachments) {
+ if (!attachmentIsPublic($attachments->{$field_name})) {
+ return 0;
}
- return 1;
+ }
+ return 1;
}
sub pack_token_data {
- my $attachments = shift;
- return join(' ', map { $_ . '=' . $attachments->{$_}->id } keys %$attachments);
+ my $attachments = shift;
+ return join(' ', map { $_ . '=' . $attachments->{$_}->id } keys %$attachments);
}
sub unpack_token_data {
- my @token_data = split(/ /, shift || '');
- my %data;
- foreach my $token (@token_data) {
- my ($field_name, $attach_id) = split('=', $token);
- $data{$field_name} = $attach_id;
- }
- return %data;
+ my @token_data = split(/ /, shift || '');
+ my %data;
+ foreach my $token (@token_data) {
+ my ($field_name, $attach_id) = split('=', $token);
+ $data{$field_name} = $attach_id;
+ }
+ return %data;
}
################################################################################
@@ -355,152 +364,168 @@ sub unpack_token_data {
# Display an attachment.
sub view {
- my $attachment = get_attachment();
-
- # At this point, Bugzilla->login has been called if it had to.
- my $contenttype = $attachment->contenttype;
- my $filename = basename($attachment->filename);
- my $contenttype_override = 0;
-
- # Bug 111522: allow overriding content-type manually in the posted form
- # params.
- if (defined $cgi->param('content_type')) {
- $contenttype = $attachment->_check_content_type($cgi->param('content_type'));
- $contenttype_override = 1;
- }
+ my $attachment = get_attachment();
+
+ # At this point, Bugzilla->login has been called if it had to.
+ my $contenttype = $attachment->contenttype;
+ my $filename = basename($attachment->filename);
+ my $contenttype_override = 0;
+
+ # Bug 111522: allow overriding content-type manually in the posted form
+ # params.
+ if (defined $cgi->param('content_type')) {
+ $contenttype = $attachment->_check_content_type($cgi->param('content_type'));
+ $contenttype_override = 1;
+ }
- # Return the appropriate HTTP response headers.
- $attachment->datasize || ThrowUserError("attachment_removed");
+ # Return the appropriate HTTP response headers.
+ $attachment->datasize || ThrowUserError("attachment_removed");
- # BMO add a hook for github url redirection
- Bugzilla::Hook::process('attachment_view', { attachment => $attachment });
+ # BMO add a hook for github url redirection
+ Bugzilla::Hook::process('attachment_view', {attachment => $attachment});
- my $do_redirect = 0;
- Bugzilla::Hook::process('attachment_should_redirect_login', { do_redirect => \$do_redirect });
+ my $do_redirect = 0;
+ Bugzilla::Hook::process('attachment_should_redirect_login',
+ {do_redirect => \$do_redirect});
- if ($do_redirect) {
- my $uri = URI->new(Bugzilla->localconfig->{urlbase} . 'attachment.cgi');
- $uri->query_param(id => $attachment->id);
- $uri->query_param(content_type => $contenttype) if $contenttype_override;
+ if ($do_redirect) {
+ my $uri = URI->new(Bugzilla->localconfig->{urlbase} . 'attachment.cgi');
+ $uri->query_param(id => $attachment->id);
+ $uri->query_param(content_type => $contenttype) if $contenttype_override;
- print $cgi->redirect('-location' => $uri);
- exit 0;
- }
+ print $cgi->redirect('-location' => $uri);
+ exit 0;
+ }
- # Don't send a charset header with attachments--they might not be UTF-8.
- # However, we do allow people to explicitly specify a charset if they
- # want.
- if ($contenttype !~ /\bcharset=/i) {
- # In order to prevent Apache from adding a charset, we have to send a
- # charset that's a single space.
- $cgi->charset("");
- if (Bugzilla->feature('detect_charset') && $contenttype =~ /^text\//) {
- my $encoding = detect_encoding($attachment->data);
- if ($encoding) {
- $cgi->charset(find_encoding($encoding)->mime_name);
- }
- }
+ # Don't send a charset header with attachments--they might not be UTF-8.
+ # However, we do allow people to explicitly specify a charset if they
+ # want.
+ if ($contenttype !~ /\bcharset=/i) {
+
+ # In order to prevent Apache from adding a charset, we have to send a
+ # charset that's a single space.
+ $cgi->charset("");
+ if (Bugzilla->feature('detect_charset') && $contenttype =~ /^text\//) {
+ my $encoding = detect_encoding($attachment->data);
+ if ($encoding) {
+ $cgi->charset(find_encoding($encoding)->mime_name);
+ }
}
- Bugzilla->log_user_request($attachment->bug_id, $attachment->id, "attachment-get")
- if Bugzilla->user->id;
-
- my $disposition = Bugzilla->params->{'allow_attachment_display'} ? 'inline' : 'attachment';
- my $filename_star = qq{UTF-8''} . url_escape( encode('UTF-8', $filename) );
+ }
+ Bugzilla->log_user_request($attachment->bug_id, $attachment->id,
+ "attachment-get")
+ if Bugzilla->user->id;
- print $cgi->header(-type=> $contenttype,
- -content_disposition=> "$disposition; filename*=$filename_star",
- -content_length => $attachment->datasize);
- disable_utf8();
- print $attachment->data;
+ my $disposition
+ = Bugzilla->params->{'allow_attachment_display'} ? 'inline' : 'attachment';
+ my $filename_star = qq{UTF-8''} . url_escape(encode('UTF-8', $filename));
+
+ print $cgi->header(
+ -type => $contenttype,
+ -content_disposition => "$disposition; filename*=$filename_star",
+ -content_length => $attachment->datasize
+ );
+ disable_utf8();
+ print $attachment->data;
}
sub interdiff {
- # Retrieve and validate parameters
- my $format = validateFormat('html', 'raw');
- my($old_attachment, $new_attachment);
- if ($format eq 'raw') {
- ($old_attachment, $new_attachment) = get_attachment('oldid', 'newid');
- } else {
- $old_attachment = validateID('oldid');
- $new_attachment = validateID('newid');
- }
- my $context = validateContext();
- Bugzilla::Attachment::PatchReader::process_interdiff(
- $old_attachment, $new_attachment, $format, $context);
+ # Retrieve and validate parameters
+ my $format = validateFormat('html', 'raw');
+ my ($old_attachment, $new_attachment);
+ if ($format eq 'raw') {
+ ($old_attachment, $new_attachment) = get_attachment('oldid', 'newid');
+ }
+ else {
+ $old_attachment = validateID('oldid');
+ $new_attachment = validateID('newid');
+ }
+ my $context = validateContext();
+
+ Bugzilla::Attachment::PatchReader::process_interdiff($old_attachment,
+ $new_attachment, $format, $context);
}
sub diff {
- # Retrieve and validate parameters
- my $format = validateFormat('html', 'raw');
- my $attachment = $format eq 'raw' ? get_attachment() : validateID();
- my $context = validateContext();
-
- # If it is not a patch, view normally.
- if (!$attachment->ispatch) {
- view();
- return;
- }
- Bugzilla::Attachment::PatchReader::process_diff($attachment, $format, $context);
+ # Retrieve and validate parameters
+ my $format = validateFormat('html', 'raw');
+ my $attachment = $format eq 'raw' ? get_attachment() : validateID();
+ my $context = validateContext();
+
+ # If it is not a patch, view normally.
+ if (!$attachment->ispatch) {
+ view();
+ return;
+ }
+
+ Bugzilla::Attachment::PatchReader::process_diff($attachment, $format, $context);
}
# Display all attachments for a given bug in a series of IFRAMEs within one
# HTML page.
sub viewall {
- # Retrieve and validate parameters
- my $bug = Bugzilla::Bug->check({ id => scalar $cgi->param('bugid'), cache => 1 });
- my $attachments = Bugzilla::Attachment->get_attachments_by_bug($bug);
- # Ignore deleted attachments.
- @$attachments = grep { $_->datasize } @$attachments;
+ # Retrieve and validate parameters
+ my $bug = Bugzilla::Bug->check({id => scalar $cgi->param('bugid'), cache => 1});
- if ($cgi->param('hide_obsolete')) {
- @$attachments = grep { !$_->isobsolete } @$attachments;
- $vars->{'hide_obsolete'} = 1;
- }
+ my $attachments = Bugzilla::Attachment->get_attachments_by_bug($bug);
- # Define the variables and functions that will be passed to the UI template.
- $vars->{'bug'} = $bug;
- $vars->{'attachments'} = $attachments;
+ # Ignore deleted attachments.
+ @$attachments = grep { $_->datasize } @$attachments;
- print $cgi->header();
+ if ($cgi->param('hide_obsolete')) {
+ @$attachments = grep { !$_->isobsolete } @$attachments;
+ $vars->{'hide_obsolete'} = 1;
+ }
- # Generate and return the UI (HTML page) from the appropriate template.
- $template->process("attachment/show-multiple.html.tmpl", $vars)
- || ThrowTemplateError($template->error());
+ # Define the variables and functions that will be passed to the UI template.
+ $vars->{'bug'} = $bug;
+ $vars->{'attachments'} = $attachments;
+
+ print $cgi->header();
+
+ # Generate and return the UI (HTML page) from the appropriate template.
+ $template->process("attachment/show-multiple.html.tmpl", $vars)
+ || ThrowTemplateError($template->error());
}
# Display a form for entering a new attachment.
sub enter {
+
# Retrieve and validate parameters
- my $bug = Bugzilla::Bug->check(scalar $cgi->param('bugid'));
+ my $bug = Bugzilla::Bug->check(scalar $cgi->param('bugid'));
my $bugid = $bug->id;
Bugzilla::Attachment->_check_bug($bug);
- my $dbh = Bugzilla->dbh;
+ my $dbh = Bugzilla->dbh;
my $user = Bugzilla->user;
# Retrieve the attachments the user can edit from the database and write
# them into an array of hashes where each hash represents one attachment.
my $canEdit = "";
if (!$user->in_group('editbugs', $bug->product_id)) {
- $canEdit = "AND submitter_id = " . $user->id;
+ $canEdit = "AND submitter_id = " . $user->id;
}
- my $attach_ids = $dbh->selectcol_arrayref("SELECT attach_id FROM attachments
+ my $attach_ids = $dbh->selectcol_arrayref(
+ "SELECT attach_id FROM attachments
WHERE bug_id = ? AND isobsolete = 0 $canEdit
- ORDER BY attach_id", undef, $bugid);
+ ORDER BY attach_id", undef, $bugid
+ );
# Define the variables and functions that will be passed to the UI template.
- $vars->{'bug'} = $bug;
+ $vars->{'bug'} = $bug;
$vars->{'attachments'} = Bugzilla::Attachment->new_from_list($attach_ids);
- my $flag_types = Bugzilla::FlagType::match({'target_type' => 'attachment',
- 'product_id' => $bug->product_id,
- 'component_id' => $bug->component_id,
- 'is_active' => 1});
+ my $flag_types = Bugzilla::FlagType::match({
+ 'target_type' => 'attachment',
+ 'product_id' => $bug->product_id,
+ 'component_id' => $bug->component_id,
+ 'is_active' => 1
+ });
$vars->{'flag_types'} = $flag_types;
- $vars->{'any_flags_requesteeble'} =
- grep { $_->is_requestable && $_->is_requesteeble } @$flag_types;
+ $vars->{'any_flags_requesteeble'}
+ = grep { $_->is_requestable && $_->is_requesteeble } @$flag_types;
$vars->{'token'} = issue_session_token('create_attachment');
print $cgi->header();
@@ -512,100 +537,114 @@ sub enter {
# Insert a new attachment into the database.
sub insert {
- my $dbh = Bugzilla->dbh;
- my $user = Bugzilla->user;
-
- $dbh->bz_start_transaction;
+ my $dbh = Bugzilla->dbh;
+ my $user = Bugzilla->user;
- # Retrieve and validate parameters
- my $bug = Bugzilla::Bug->check(scalar $cgi->param('bugid'));
- my $bugid = $bug->id;
- my ($timestamp) = $dbh->selectrow_array("SELECT NOW()");
+ $dbh->bz_start_transaction;
- # Detect if the user already used the same form to submit an attachment
- my $token = trim($cgi->param('token'));
- check_token_data($token, 'create_attachment', 'index.cgi');
+ # Retrieve and validate parameters
+ my $bug = Bugzilla::Bug->check(scalar $cgi->param('bugid'));
+ my $bugid = $bug->id;
+ my ($timestamp) = $dbh->selectrow_array("SELECT NOW()");
+
+ # Detect if the user already used the same form to submit an attachment
+ my $token = trim($cgi->param('token'));
+ check_token_data($token, 'create_attachment', 'index.cgi');
+
+ # Check attachments the user tries to mark as obsolete.
+ my @obsolete_attachments;
+ if ($cgi->param('obsolete')) {
+ my @obsolete = $cgi->param('obsolete');
+ @obsolete_attachments
+ = Bugzilla::Attachment->validate_obsolete($bug, \@obsolete);
+ }
- # Check attachments the user tries to mark as obsolete.
- my @obsolete_attachments;
- if ($cgi->param('obsolete')) {
- my @obsolete = $cgi->param('obsolete');
- @obsolete_attachments = Bugzilla::Attachment->validate_obsolete($bug, \@obsolete);
- }
+ # Must be called before create() as it may alter $cgi->param('ispatch').
+ my $content_type = Bugzilla::Attachment::get_content_type();
- # Must be called before create() as it may alter $cgi->param('ispatch').
- my $content_type = Bugzilla::Attachment::get_content_type();
+ # Get the filehandle of the attachment.
+ my $data_fh = $cgi->upload('data');
+ my $attach_text = $cgi->param('attach_text');
+ my $data_base64 = $cgi->param('data_base64');
+ my $data;
+ my $filename;
- # Get the filehandle of the attachment.
- my $data_fh = $cgi->upload('data');
- my $attach_text = $cgi->param('attach_text');
- my $data_base64 = $cgi->param('data_base64');
- my $data;
- my $filename;
+ if ($attach_text) {
- if ($attach_text) {
- # Convert to unix line-endings if pasting a patch
- if (scalar($cgi->param('ispatch'))) {
- $attach_text =~ s/[\012\015]{1,2}/\012/g;
- }
- $data = $attach_text;
- $filename = "file_$bugid.txt";
- } elsif ($data_base64) {
- $data = decode_base64($data_base64);
- $filename = $cgi->param('filename') || "file_$bugid";
- } else {
- $data = $filename = $data_fh;
+ # Convert to unix line-endings if pasting a patch
+ if (scalar($cgi->param('ispatch'))) {
+ $attach_text =~ s/[\012\015]{1,2}/\012/g;
}
+ $data = $attach_text;
+ $filename = "file_$bugid.txt";
+ }
+ elsif ($data_base64) {
+ $data = decode_base64($data_base64);
+ $filename = $cgi->param('filename') || "file_$bugid";
+ }
+ else {
+ $data = $filename = $data_fh;
+ }
- my $attachment = Bugzilla::Attachment->create(
- {bug => $bug,
- creation_ts => $timestamp,
- data => $data,
- description => scalar $cgi->param('description'),
- filename => $filename,
- ispatch => scalar $cgi->param('ispatch'),
- isprivate => scalar $cgi->param('isprivate'),
- mimetype => $content_type,
- });
-
- # Delete the token used to create this attachment.
- delete_token($token);
+ my $attachment = Bugzilla::Attachment->create({
+ bug => $bug,
+ creation_ts => $timestamp,
+ data => $data,
+ description => scalar $cgi->param('description'),
+ filename => $filename,
+ ispatch => scalar $cgi->param('ispatch'),
+ isprivate => scalar $cgi->param('isprivate'),
+ mimetype => $content_type,
+ });
+
+ # Delete the token used to create this attachment.
+ delete_token($token);
+
+ foreach my $obsolete_attachment (@obsolete_attachments) {
+ $obsolete_attachment->set_is_obsolete(1);
+ $obsolete_attachment->update($timestamp);
+ }
- foreach my $obsolete_attachment (@obsolete_attachments) {
- $obsolete_attachment->set_is_obsolete(1);
- $obsolete_attachment->update($timestamp);
+ # BMO - allow pre-processing of attachment flags
+ Bugzilla::Hook::process('create_attachment_flags',
+ {bug => $bug, attachment => $attachment});
+ my ($flags, $new_flags)
+ = Bugzilla::Flag->extract_flags_from_cgi($bug, $attachment, $vars,
+ SKIP_REQUESTEE_ON_ERROR);
+ $attachment->set_flags($flags, $new_flags);
+
+ # Insert a comment about the new attachment into the database.
+ my $comment = $cgi->param('comment');
+ $comment = '' unless defined $comment;
+ $bug->add_comment(
+ $comment,
+ {
+ isprivate => $attachment->isprivate,
+ type => CMT_ATTACHMENT_CREATED,
+ extra_data => $attachment->id
}
-
- # BMO - allow pre-processing of attachment flags
- Bugzilla::Hook::process('create_attachment_flags', { bug => $bug, attachment => $attachment });
- my ($flags, $new_flags) = Bugzilla::Flag->extract_flags_from_cgi(
- $bug, $attachment, $vars, SKIP_REQUESTEE_ON_ERROR);
- $attachment->set_flags($flags, $new_flags);
-
- # Insert a comment about the new attachment into the database.
- my $comment = $cgi->param('comment');
- $comment = '' unless defined $comment;
- $bug->add_comment($comment, { isprivate => $attachment->isprivate,
- type => CMT_ATTACHMENT_CREATED,
- extra_data => $attachment->id });
+ );
# Assign the bug to the user, if they are allowed to take it
my $owner = "";
if ($cgi->param('takebug') && $user->in_group('editbugs', $bug->product_id)) {
- # When taking a bug, we have to follow the workflow.
- my $bug_status = $cgi->param('bug_status') || '';
- ($bug_status) = grep {$_->name eq $bug_status} @{$bug->status->can_change_to};
- if ($bug_status && $bug_status->is_open
- && ($bug_status->name ne 'UNCONFIRMED'
- || $bug->product_obj->allows_unconfirmed))
- {
- $bug->set_bug_status($bug_status->name);
- $bug->clear_resolution();
- }
- # Make sure the person we are taking the bug from gets mail.
- $owner = $bug->assigned_to->login;
- $bug->set_assigned_to($user);
+ # When taking a bug, we have to follow the workflow.
+ my $bug_status = $cgi->param('bug_status') || '';
+ ($bug_status) = grep { $_->name eq $bug_status } @{$bug->status->can_change_to};
+
+ if ( $bug_status
+ && $bug_status->is_open
+ && ($bug_status->name ne 'UNCONFIRMED' || $bug->product_obj->allows_unconfirmed)
+ )
+ {
+ $bug->set_bug_status($bug_status->name);
+ $bug->clear_resolution();
+ }
+
+ # Make sure the person we are taking the bug from gets mail.
+ $owner = $bug->assigned_to->login;
+ $bug->set_assigned_to($user);
}
$bug->update($timestamp);
@@ -617,13 +656,14 @@ sub insert {
# Define the variables and functions that will be passed to the UI template.
$vars->{'attachment'} = $attachment;
+
# We cannot reuse the $bug object as delta_ts has eventually been updated
# since the object was created.
- $vars->{'bugs'} = [new Bugzilla::Bug($bugid)];
- $vars->{'header_done'} = 1;
+ $vars->{'bugs'} = [new Bugzilla::Bug($bugid)];
+ $vars->{'header_done'} = 1;
$vars->{'contenttypemethod'} = $cgi->param('contenttypemethod');
- my $recipients = { 'changer' => $user, 'owner' => $owner };
+ my $recipients = {'changer' => $user, 'owner' => $owner};
$vars->{'sent_bugmail'} = Bugzilla::BugMail::Send($bugid, $recipients);
# BMO: add show_bug_format hook for experimental UI work
@@ -631,10 +671,11 @@ sub insert {
Bugzilla::Hook::process('show_bug_format', $show_bug_format);
if ($show_bug_format->{format} eq 'modal') {
- $cgi->content_security_policy(Bugzilla::CGI::SHOW_BUG_MODAL_CSP($bugid));
+ $cgi->content_security_policy(Bugzilla::CGI::SHOW_BUG_MODAL_CSP($bugid));
}
print $cgi->header();
+
# Generate and return the UI (HTML page) from the appropriate template.
$template->process("attachment/created.html.tmpl", $vars)
|| ThrowTemplateError($template->error());
@@ -647,19 +688,21 @@ sub insert {
sub edit {
my $attachment = validateID();
- my $bugattachments =
- Bugzilla::Attachment->get_attachments_by_bug($attachment->bug);
+ my $bugattachments
+ = Bugzilla::Attachment->get_attachments_by_bug($attachment->bug);
+
+ my $any_flags_requesteeble = grep { $_->is_requestable && $_->is_requesteeble }
+ @{$attachment->flag_types};
- my $any_flags_requesteeble =
- grep { $_->is_requestable && $_->is_requesteeble } @{$attachment->flag_types};
# Useful in case a flagtype is no longer requestable but a requestee
# has been set before we turned off that bit.
$any_flags_requesteeble ||= grep { $_->requestee_id } @{$attachment->flags};
$vars->{'any_flags_requesteeble'} = $any_flags_requesteeble;
- $vars->{'attachment'} = $attachment;
- $vars->{'attachments'} = $bugattachments;
+ $vars->{'attachment'} = $attachment;
+ $vars->{'attachments'} = $bugattachments;
- Bugzilla->log_user_request($attachment->bug_id, $attachment->id, "attachment-get")
+ Bugzilla->log_user_request($attachment->bug_id, $attachment->id,
+ "attachment-get")
if Bugzilla->user->id;
print $cgi->header();
@@ -672,220 +715,229 @@ sub edit {
# (or the original attachment's submitter) can edit the attachment.
# Users cannot edit the content of the attachment itself.
sub update {
- my $user = Bugzilla->user;
- my $dbh = Bugzilla->dbh;
-
- # Start a transaction in preparation for updating the attachment.
- $dbh->bz_start_transaction();
-
- # Retrieve and validate parameters
- my $attachment = validateID();
- my $bug = $attachment->bug;
- $attachment->_check_bug;
- my $can_edit = $attachment->validate_can_edit;
-
- if ($can_edit) {
- $attachment->set_description(scalar $cgi->param('description'));
- $attachment->set_is_patch(scalar $cgi->param('ispatch'));
- $attachment->set_content_type(scalar $cgi->param('contenttypeentry'));
- $attachment->set_is_obsolete(scalar $cgi->param('isobsolete'));
- $attachment->set_is_private(scalar $cgi->param('isprivate'));
- $attachment->set_filename(scalar $cgi->param('filename'));
-
- # Now make sure the attachment has not been edited since we loaded the page.
- my $delta_ts = $cgi->param('delta_ts');
- my $modification_time = $attachment->modification_time;
-
- if ($delta_ts && $delta_ts ne $modification_time) {
- datetime_from($delta_ts)
- or ThrowCodeError('invalid_timestamp', { timestamp => $delta_ts });
- ($vars->{'operations'}) =
- Bugzilla::Bug::GetBugActivity($bug->id, $attachment->id, $delta_ts);
-
- # If the modification date changed but there is no entry in
- # the activity table, this means someone commented only.
- # In this case, there is no reason to midair.
- if (scalar(@{$vars->{'operations'}})) {
- $cgi->param('delta_ts', $modification_time);
- # The token contains the old modification_time. We need a new one.
- $cgi->param('token', issue_hash_token([$attachment->id, $modification_time]));
-
- $vars->{'attachment'} = $attachment;
-
- print $cgi->header();
- # Warn the user about the mid-air collision and ask them what to do.
- $template->process("attachment/midair.html.tmpl", $vars)
- || ThrowTemplateError($template->error());
- exit;
- }
- }
- }
+ my $user = Bugzilla->user;
+ my $dbh = Bugzilla->dbh;
+
+ # Start a transaction in preparation for updating the attachment.
+ $dbh->bz_start_transaction();
+
+ # Retrieve and validate parameters
+ my $attachment = validateID();
+ my $bug = $attachment->bug;
+ $attachment->_check_bug;
+ my $can_edit = $attachment->validate_can_edit;
+
+ if ($can_edit) {
+ $attachment->set_description(scalar $cgi->param('description'));
+ $attachment->set_is_patch(scalar $cgi->param('ispatch'));
+ $attachment->set_content_type(scalar $cgi->param('contenttypeentry'));
+ $attachment->set_is_obsolete(scalar $cgi->param('isobsolete'));
+ $attachment->set_is_private(scalar $cgi->param('isprivate'));
+ $attachment->set_filename(scalar $cgi->param('filename'));
+
+ # Now make sure the attachment has not been edited since we loaded the page.
+ my $delta_ts = $cgi->param('delta_ts');
+ my $modification_time = $attachment->modification_time;
+
+ if ($delta_ts && $delta_ts ne $modification_time) {
+ datetime_from($delta_ts)
+ or ThrowCodeError('invalid_timestamp', {timestamp => $delta_ts});
+ ($vars->{'operations'})
+ = Bugzilla::Bug::GetBugActivity($bug->id, $attachment->id, $delta_ts);
+
+ # If the modification date changed but there is no entry in
+ # the activity table, this means someone commented only.
+ # In this case, there is no reason to midair.
+ if (scalar(@{$vars->{'operations'}})) {
+ $cgi->param('delta_ts', $modification_time);
+
+ # The token contains the old modification_time. We need a new one.
+ $cgi->param('token', issue_hash_token([$attachment->id, $modification_time]));
+
+ $vars->{'attachment'} = $attachment;
+
+ print $cgi->header();
- # We couldn't do this check earlier as we first had to validate attachment ID
- # and display the mid-air collision page if modification_time changed.
- my $token = $cgi->param('token');
- check_hash_token($token, [$attachment->id, $attachment->modification_time]);
-
- # If the user submitted a comment while editing the attachment,
- # add the comment to the bug. Do this after having validated isprivate!
- my $comment = $cgi->param('comment');
- if (defined $comment && trim($comment) ne '') {
- $bug->add_comment($comment, { isprivate => $attachment->isprivate,
- type => CMT_ATTACHMENT_UPDATED,
- extra_data => $attachment->id });
+ # Warn the user about the mid-air collision and ask them what to do.
+ $template->process("attachment/midair.html.tmpl", $vars)
+ || ThrowTemplateError($template->error());
+ exit;
+ }
}
+ }
- my ($flags, $new_flags) =
- Bugzilla::Flag->extract_flags_from_cgi($bug, $attachment, $vars);
+ # We couldn't do this check earlier as we first had to validate attachment ID
+ # and display the mid-air collision page if modification_time changed.
+ my $token = $cgi->param('token');
+ check_hash_token($token, [$attachment->id, $attachment->modification_time]);
+
+ # If the user submitted a comment while editing the attachment,
+ # add the comment to the bug. Do this after having validated isprivate!
+ my $comment = $cgi->param('comment');
+ if (defined $comment && trim($comment) ne '') {
+ $bug->add_comment(
+ $comment,
+ {
+ isprivate => $attachment->isprivate,
+ type => CMT_ATTACHMENT_UPDATED,
+ extra_data => $attachment->id
+ }
+ );
+ }
- if ($can_edit) {
- $attachment->set_flags($flags, $new_flags);
+ my ($flags, $new_flags)
+ = Bugzilla::Flag->extract_flags_from_cgi($bug, $attachment, $vars);
+
+ if ($can_edit) {
+ $attachment->set_flags($flags, $new_flags);
+ }
+
+ # Requestees can set flags targetted to them, even if they cannot
+ # edit the attachment. Flag setters can edit their own flags too.
+ elsif (scalar @$flags) {
+ my @flag_ids = map { $_->{id} } @$flags;
+ my $flag_objs = Bugzilla::Flag->new_from_list(\@flag_ids);
+ my %flag_list = map { $_->id => $_ } @$flag_objs;
+
+ my @editable_flags;
+ foreach my $flag (@$flags) {
+ my $flag_obj = $flag_list{$flag->{id}};
+ if ($flag_obj->setter_id == $user->id
+ || ($flag_obj->requestee_id && $flag_obj->requestee_id == $user->id))
+ {
+ push(@editable_flags, $flag);
+ }
}
- # Requestees can set flags targetted to them, even if they cannot
- # edit the attachment. Flag setters can edit their own flags too.
- elsif (scalar @$flags) {
- my @flag_ids = map { $_->{id} } @$flags;
- my $flag_objs = Bugzilla::Flag->new_from_list(\@flag_ids);
- my %flag_list = map { $_->id => $_ } @$flag_objs;
-
- my @editable_flags;
- foreach my $flag (@$flags) {
- my $flag_obj = $flag_list{$flag->{id}};
- if ($flag_obj->setter_id == $user->id
- || ($flag_obj->requestee_id && $flag_obj->requestee_id == $user->id))
- {
- push(@editable_flags, $flag);
- }
- }
- if (scalar @editable_flags) {
- $attachment->set_flags(\@editable_flags, []);
- # Flag changes must be committed.
- $can_edit = 1;
- }
+ if (scalar @editable_flags) {
+ $attachment->set_flags(\@editable_flags, []);
+
+ # Flag changes must be committed.
+ $can_edit = 1;
}
+ }
- # Figure out when the changes were made.
- my $timestamp = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+ # Figure out when the changes were made.
+ my $timestamp = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
- # Commit the comment, if any.
- # This has to happen before updating the attachment, to ensure new comments
- # are available to $attachment->update.
- $bug->update($timestamp);
+ # Commit the comment, if any.
+ # This has to happen before updating the attachment, to ensure new comments
+ # are available to $attachment->update.
+ $bug->update($timestamp);
- if ($can_edit) {
- my $changes = $attachment->update($timestamp);
- # If there are changes, we updated delta_ts in the DB. We have to
- # reflect this change in the bug object.
- $bug->{delta_ts} = $timestamp if scalar(keys %$changes);
- }
+ if ($can_edit) {
+ my $changes = $attachment->update($timestamp);
- # Commit the transaction now that we are finished updating the database.
- $dbh->bz_commit_transaction();
+ # If there are changes, we updated delta_ts in the DB. We have to
+ # reflect this change in the bug object.
+ $bug->{delta_ts} = $timestamp if scalar(keys %$changes);
+ }
- # Define the variables and functions that will be passed to the UI template.
- $vars->{'attachment'} = $attachment;
- $vars->{'bugs'} = [$bug];
- $vars->{'header_done'} = 1;
- $vars->{'sent_bugmail'} =
- Bugzilla::BugMail::Send($bug->id, { 'changer' => $user });
+ # Commit the transaction now that we are finished updating the database.
+ $dbh->bz_commit_transaction();
- # BMO: add show_bug_format hook for experimental UI work
- my $show_bug_format = {};
- Bugzilla::Hook::process('show_bug_format', $show_bug_format);
+ # Define the variables and functions that will be passed to the UI template.
+ $vars->{'attachment'} = $attachment;
+ $vars->{'bugs'} = [$bug];
+ $vars->{'header_done'} = 1;
+ $vars->{'sent_bugmail'}
+ = Bugzilla::BugMail::Send($bug->id, {'changer' => $user});
- if ($show_bug_format->{format} eq 'modal') {
- $cgi->content_security_policy(Bugzilla::CGI::SHOW_BUG_MODAL_CSP($bug->id));
- }
+ # BMO: add show_bug_format hook for experimental UI work
+ my $show_bug_format = {};
+ Bugzilla::Hook::process('show_bug_format', $show_bug_format);
- print $cgi->header();
+ if ($show_bug_format->{format} eq 'modal') {
+ $cgi->content_security_policy(Bugzilla::CGI::SHOW_BUG_MODAL_CSP($bug->id));
+ }
- # Generate and return the UI (HTML page) from the appropriate template.
- $template->process("attachment/updated.html.tmpl", $vars)
- || ThrowTemplateError($template->error());
+ print $cgi->header();
+
+ # Generate and return the UI (HTML page) from the appropriate template.
+ $template->process("attachment/updated.html.tmpl", $vars)
+ || ThrowTemplateError($template->error());
}
# Only administrators can delete attachments.
sub delete_attachment {
- my $user = Bugzilla->login(LOGIN_REQUIRED);
- my $dbh = Bugzilla->dbh;
-
- $user->in_group('admin')
- || ThrowUserError('auth_failure', {group => 'admin',
- action => 'delete',
- object => 'attachment'});
-
- Bugzilla->params->{'allow_attachment_deletion'}
- || ThrowUserError('attachment_deletion_disabled');
-
- # Make sure the administrator is allowed to edit this attachment.
- my $attachment = validateID();
- Bugzilla::Attachment->_check_bug($attachment->bug);
-
- $attachment->datasize || ThrowUserError('attachment_removed');
-
- # We don't want to let a malicious URL accidentally delete an attachment.
- my $token = trim($cgi->param('token'));
- if ($token) {
- my ($creator_id, $date, $event) = Bugzilla::Token::GetTokenData($token);
- unless ($creator_id
- && ($creator_id == $user->id)
- && ($event eq 'delete_attachment' . $attachment->id))
- {
- # The token is invalid.
- ThrowUserError('token_does_not_exist');
- }
+ my $user = Bugzilla->login(LOGIN_REQUIRED);
+ my $dbh = Bugzilla->dbh;
- my $bug = new Bugzilla::Bug($attachment->bug_id);
+ $user->in_group('admin')
+ || ThrowUserError('auth_failure',
+ {group => 'admin', action => 'delete', object => 'attachment'});
- # The token is valid. Delete the content of the attachment.
- my $msg;
- $vars->{'attachment'} = $attachment;
- $vars->{'reason'} = clean_text($cgi->param('reason') || '');
+ Bugzilla->params->{'allow_attachment_deletion'}
+ || ThrowUserError('attachment_deletion_disabled');
- $template->process("attachment/delete_reason.txt.tmpl", $vars, \$msg)
- || ThrowTemplateError($template->error());
+ # Make sure the administrator is allowed to edit this attachment.
+ my $attachment = validateID();
+ Bugzilla::Attachment->_check_bug($attachment->bug);
+
+ $attachment->datasize || ThrowUserError('attachment_removed');
- # Paste the reason provided by the admin into a comment.
- $bug->add_comment($msg);
+ # We don't want to let a malicious URL accidentally delete an attachment.
+ my $token = trim($cgi->param('token'));
+ if ($token) {
+ my ($creator_id, $date, $event) = Bugzilla::Token::GetTokenData($token);
+ unless ($creator_id
+ && ($creator_id == $user->id)
+ && ($event eq 'delete_attachment' . $attachment->id))
+ {
+ # The token is invalid.
+ ThrowUserError('token_does_not_exist');
+ }
- # Remove attachment.
- $attachment->remove_from_db();
+ my $bug = new Bugzilla::Bug($attachment->bug_id);
- # Now delete the token.
- delete_token($token);
+ # The token is valid. Delete the content of the attachment.
+ my $msg;
+ $vars->{'attachment'} = $attachment;
+ $vars->{'reason'} = clean_text($cgi->param('reason') || '');
- # Insert the comment.
- $bug->update();
+ $template->process("attachment/delete_reason.txt.tmpl", $vars, \$msg)
+ || ThrowTemplateError($template->error());
- # Required to display the bug the deleted attachment belongs to.
- $vars->{'bugs'} = [$bug];
- $vars->{'header_done'} = 1;
+ # Paste the reason provided by the admin into a comment.
+ $bug->add_comment($msg);
- $vars->{'sent_bugmail'} =
- Bugzilla::BugMail::Send($bug->id, { 'changer' => $user });
+ # Remove attachment.
+ $attachment->remove_from_db();
- # BMO: add show_bug_format hook for experimental UI work
- my $show_bug_format = {};
- Bugzilla::Hook::process('show_bug_format', $show_bug_format);
+ # Now delete the token.
+ delete_token($token);
- if ($show_bug_format->{format} eq 'modal') {
- $cgi->content_security_policy(Bugzilla::CGI::SHOW_BUG_MODAL_CSP($bug->id));
- }
+ # Insert the comment.
+ $bug->update();
- print $cgi->header();
- $template->process("attachment/updated.html.tmpl", $vars)
- || ThrowTemplateError($template->error());
- }
- else {
- # Create a token.
- $token = issue_session_token('delete_attachment' . $attachment->id);
+ # Required to display the bug the deleted attachment belongs to.
+ $vars->{'bugs'} = [$bug];
+ $vars->{'header_done'} = 1;
- $vars->{'a'} = $attachment;
- $vars->{'token'} = $token;
+ $vars->{'sent_bugmail'}
+ = Bugzilla::BugMail::Send($bug->id, {'changer' => $user});
- print $cgi->header();
- $template->process("attachment/confirm-delete.html.tmpl", $vars)
- || ThrowTemplateError($template->error());
+ # BMO: add show_bug_format hook for experimental UI work
+ my $show_bug_format = {};
+ Bugzilla::Hook::process('show_bug_format', $show_bug_format);
+
+ if ($show_bug_format->{format} eq 'modal') {
+ $cgi->content_security_policy(Bugzilla::CGI::SHOW_BUG_MODAL_CSP($bug->id));
}
+
+ print $cgi->header();
+ $template->process("attachment/updated.html.tmpl", $vars)
+ || ThrowTemplateError($template->error());
+ }
+ else {
+ # Create a token.
+ $token = issue_session_token('delete_attachment' . $attachment->id);
+
+ $vars->{'a'} = $attachment;
+ $vars->{'token'} = $token;
+
+ print $cgi->header();
+ $template->process("attachment/confirm-delete.html.tmpl", $vars)
+ || ThrowTemplateError($template->error());
+ }
}