From 6a50f697483df6c9a1e8249f33552fa92ce92ed1 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 9 Oct 2023 12:26:02 +0100 Subject: [PATCH] Bug 25672: Restore redirect on restricted upload This patch restores the immediate redirect from plugins-upload should uploads be restricted and an uploadlocation not be specified. Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Kyle M Hall --- .../prog/en/modules/plugins/plugins-upload.tt | 2 +- plugins/plugins-upload.pl | 113 +++++++++--------- 2 files changed, 56 insertions(+), 59 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt index b7b2ab8939..eb6bd9d32b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt @@ -46,7 +46,7 @@ [% END %]
-
NOTE: Only KPZ file format is supported.
+
NOTE: Only KPZ file format is supported.
  1. diff --git a/plugins/plugins-upload.pl b/plugins/plugins-upload.pl index cfc833fcf4..dff5a7536a 100755 --- a/plugins/plugins-upload.pl +++ b/plugins/plugins-upload.pl @@ -45,93 +45,90 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); -if ($plugins_enabled) { +my $uploadlocation = $input->param('uploadlocation'); + +# Early exists if uploads are not enabled direct upload attempted when uploads are restricted +if (!$plugins_enabled) { + output_html_with_http_headers $input, $cookie, $template->output; +} elsif ( $plugins_restricted && !$uploadlocation ) { $template->param( plugins_restricted => $plugins_restricted ); -} else { - # Exit early if uploads are not enabled output_html_with_http_headers $input, $cookie, $template->output; } my $uploadfilename = $input->param('uploadfile'); my $uploadfile = $input->upload('uploadfile'); -my $uploadlocation = $input->param('uploadlocation'); my $op = $input->param('op') || q{}; my ( $tempfile, $tfh ); my %errors; -if ($plugins_enabled) { - if ( ( $op eq 'Upload' ) && ( $uploadfile || $uploadlocation ) ) { - my $plugins_dir = C4::Context->config("pluginsdir"); - $plugins_dir = ref($plugins_dir) eq 'ARRAY' ? $plugins_dir->[0] : $plugins_dir; +if ( ( $op eq 'Upload' ) && ( $uploadfile || $uploadlocation ) ) { + my $plugins_dir = C4::Context->config("pluginsdir"); + $plugins_dir = ref($plugins_dir) eq 'ARRAY' ? $plugins_dir->[0] : $plugins_dir; - my $dirname = File::Temp::tempdir( CLEANUP => 1 ); + my $dirname = File::Temp::tempdir( CLEANUP => 1 ); - my $filesuffix; - $filesuffix = $1 if $uploadfilename =~ m/(\..+)$/i; - ( $tfh, $tempfile ) = File::Temp::tempfile( SUFFIX => $filesuffix, UNLINK => 1 ); + my $filesuffix; + $filesuffix = $1 if $uploadfilename =~ m/(\..+)$/i; + ( $tfh, $tempfile ) = File::Temp::tempfile( SUFFIX => $filesuffix, UNLINK => 1 ); - $errors{'NOTKPZ'} = 1 if ( $uploadfilename !~ /\.kpz$/i ); - $errors{'NOWRITETEMP'} = 1 unless ( -w $dirname ); - $errors{'NOWRITEPLUGINS'} = 1 unless ( -w $plugins_dir ); + $errors{'NOTKPZ'} = 1 if ( $uploadfilename !~ /\.kpz$/i ); + $errors{'NOWRITETEMP'} = 1 unless ( -w $dirname ); + $errors{'NOWRITEPLUGINS'} = 1 unless ( -w $plugins_dir ); - if ($uploadlocation) { - my $do_get = 1; - if ( $plugins_restricted ) { - my $repos = C4::Context->config('plugin_repos'); + if ($uploadlocation) { + my $do_get = 1; + if ($plugins_restricted) { + my $repos = C4::Context->config('plugin_repos'); - # Fix data structure if only one repo defined - if ( ref($repos->{repo}) eq 'HASH' ) { - $repos = { repo => [ $repos->{repo} ] }; - } - - $do_get = any { index($uploadlocation, $_->{org_name}) != -1 } @{ $repos->{repo} }; + # Fix data structure if only one repo defined + if ( ref( $repos->{repo} ) eq 'HASH' ) { + $repos = { repo => [ $repos->{repo} ] }; } - if ( $do_get ) { - my $ua = Mojo::UserAgent->new( max_redirects => 5 ); - my $tx = $ua->get($uploadlocation); - $tx->result->content->asset->move_to($tempfile); - } else { - $errors{'RESTRICTED'} = 1; - } - } else { - $errors{'RESTRICTED'} = 1 unless ( !$plugins_restricted ); - $errors{'EMPTYUPLOAD'} = 1 unless ( length($uploadfile) > 0 ); + $do_get = any { index( $uploadlocation, $_->{org_name} ) != -1 } @{ $repos->{repo} }; } - if (%errors) { - $template->param( ERRORS => [ \%errors ] ); + if ($do_get) { + my $ua = Mojo::UserAgent->new( max_redirects => 5 ); + my $tx = $ua->get($uploadlocation); + $tx->result->content->asset->move_to($tempfile); } else { - if ($uploadfile && !$plugins_restricted) { - while (<$uploadfile>) { - print $tfh $_; - } - close $tfh; - } + $errors{'RESTRICTED'} = 1; + } + } else { + $errors{'RESTRICTED'} = 1 unless ( !$plugins_restricted ); + $errors{'EMPTYUPLOAD'} = 1 unless ( length($uploadfile) > 0 ); + } - my $ae = Archive::Extract->new( archive => $tempfile, type => 'zip' ); - unless ( $ae->extract( to => $plugins_dir ) ) { - warn "ERROR: " . $ae->error; - $errors{'UZIPFAIL'} = $uploadfilename; - $template->param( ERRORS => [ \%errors ] ); - output_html_with_http_headers $input, $cookie, $template->output; - exit; + if (%errors) { + $template->param( ERRORS => [ \%errors ] ); + } else { + if ( $uploadfile && !$plugins_restricted ) { + while (<$uploadfile>) { + print $tfh $_; } + close $tfh; + } - Koha::Plugins->new()->InstallPlugins(); + my $ae = Archive::Extract->new( archive => $tempfile, type => 'zip' ); + unless ( $ae->extract( to => $plugins_dir ) ) { + warn "ERROR: " . $ae->error; + $errors{'UZIPFAIL'} = $uploadfilename; + $template->param( ERRORS => [ \%errors ] ); + output_html_with_http_headers $input, $cookie, $template->output; + exit; } - } elsif ( ( $op eq 'Upload' ) && !$uploadfile && !$uploadlocation ) { - warn "Problem uploading file or no file uploaded."; - } - if ( ( $uploadfile || $uploadlocation ) && !%errors && !$template->param('ERRORS') ) { - print $input->redirect("/cgi-bin/koha/plugins/plugins-home.pl"); - } else { - output_html_with_http_headers $input, $cookie, $template->output; + Koha::Plugins->new()->InstallPlugins(); } +} elsif ( ( $op eq 'Upload' ) && !$uploadfile && !$uploadlocation ) { + warn "Problem uploading file or no file uploaded."; +} +if ( ( $uploadfile || $uploadlocation ) && !%errors && !$template->param('ERRORS') ) { + print $input->redirect("/cgi-bin/koha/plugins/plugins-home.pl"); } else { output_html_with_http_headers $input, $cookie, $template->output; } -- 2.42.0