michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert recent changes to add on the PR instead https://github.com/webmin/webmin/issues/1907#issuecomment-1555642036

Browse Source
This commit is contained in:
iliajie
2023-05-20 12:01:57 +03:00
parent f22bada12c
commit e288f1b955
1 changed files with 6 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
updown/fetch.cgi
View File

@@ -80,65 +80,14 @@ if ($ENV{'PATH_INFO'}) {
if (!$fetch_show) {
print "Content-Disposition: Attachment\n";
}
# Stat file
my @st = stat($file);
my $fsize = $st[7];
# Get and analyze the file contents first
my $fdata = "";
my $dangertypes = $type =~ /html|xml|pdf/i;
my $htmltype = $type =~ /html/i ? 1 : 0;
my $pdftype = $type =~ /pdf/i ? 'pdf' : 0;
my $bsize =
$dangertypes ? $fsize : &get_buffer_size_binary();
while(read(FILE, $buffer, $bsize)) {
if ($dangertypes) {
my $buffer_filtered = &filter_javascript($buffer, $pdftype);
# If content was changed upon filtering
if ($buffer_filtered ne $buffer) {
# For text simply return filtered but
# tell user that it was filtered out
if ($htmltype) {
# Add a banner showing content was changed
my $prefdata =
&ui_alert_box($text{'ui_jsblocked'}, 'danger');
# Pass filtered content with the banner
# Insert the banner in HTML body
if ($buffer_filtered =~ s/(<body.*?>)/$1$prefdata/) {
$fdata = $buffer_filtered;
}
else {
# Insert the banner to the top of HTML doc
$fdata = "$prefdata$buffer_filtered";
}
# Update content length
$fsize = length($fdata);
}
# For no text files simply force
# download if file was altered
else {
# Force send it
$type = "application/octet-stream";
print "Content-Disposition: Attachment\n";
# Pass original content
$fdata = $buffer;
}
}
# Buffere was not changed, just pass it as is
else {
$fdata = $buffer;
}
}
else {
$fdata .= $buffer;
}
}
close(FILE);
print "Content-length: $fsize\n";
@st = stat($file);
print "Content-length: $st[7]\n";
print "X-Content-Type-Options: nosniff\n";
print "Content-type: $type\n\n";
print "$fdata";
while(read(FILE, $buffer, &get_buffer_size_binary())) {
print("$buffer");
}
close(FILE);
}
# Switch back to root
@@ -170,4 +119,3 @@ else {
&redirect("fetch.cgi".$file);
}
}