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

Fix endless loop created by ReadParseMime; fix other bugs

Browse Source
This commit is contained in:
Ilia Ross
2025-10-15 23:08:59 +03:00
parent 3f8f9539a2
commit 34263aae1f
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en
View File

@@ -320,6 +320,7 @@ readparse_cdheader=Missing Content-Disposition header
readparse_enc=Expecting form-data encoding, but got normal encoding
readparse_max=Data exceeded maximum size of $1 bytes
readparse_nofile=Missing filename for upload
readparse_cannotdir=Cannot open upload directory $1 : $2
password_expired=Your password has expired, and a new one must be chosen.
password_temp=You must select a new password to replace your temporary login.

32
web-lib-funcs.pl
View File

@@ -770,6 +770,7 @@ and store it in the global %in hash. The optional parameters are :
sub ReadParseMime
{
my ($max, $cbfunc, $cbargs, $arrays, $direct_dir) = @_;
$cbargs ||= [ ];
my ($boundary, $line, $name, $got, $file, $count_lines, $max_lines);
my $err = &text('readparse_max', $max);
$ENV{'CONTENT_TYPE'} =~ /boundary=(.*)$/ || &error($text{'readparse_enc'});
@@ -777,6 +778,7 @@ if ($ENV{'CONTENT_LENGTH'} && $max && $ENV{'CONTENT_LENGTH'} > $max) {
&error($err);
}
&$cbfunc(0, $ENV{'CONTENT_LENGTH'}, $file, @$cbargs) if ($cbfunc);
$got = 0;
$boundary = $1;
$count_lines = 0;
$max_lines = 1000;
@@ -785,10 +787,12 @@ while(1) {
$name = "";
# Read section headers
my $lastheader;
my %header;
while(1) {
$line = <STDIN>;
$got += length($line);
&$cbfunc($got, $ENV{'CONTENT_LENGTH'}, @$cbargs) if ($cbfunc);
&$cbfunc($got, $ENV{'CONTENT_LENGTH'}, $file, @$cbargs)
if ($cbfunc);
if ($max && $got > $max) {
&error($err)
}
@@ -797,15 +801,16 @@ while(1) {
if ($line =~ /^(\S+):\s*(.*)$/) {
$header{$lastheader = lc($1)} = $2;
}
elsif ($line =~ /^\s+(.*)$/) {
$header{$lastheader} .= $line;
elsif ($lastheader && $line =~ /^\s+(.*)$/) {
$header{$lastheader} .= $1;
}
}
# Parse out filename and type
$file = undef;
if ($header{'content-disposition'} =~ /^form-data(.*)/) {
$rest = $1;
if ($header{'content-disposition'} &&
$header{'content-disposition'} =~ /^form-data(.*)/) {
my $rest = $1;
while ($rest =~ /([a-zA-Z]*)=\"([^\"]*)\"(.*)/) {
if ($1 eq 'name') {
$name = $2;
@@ -836,7 +841,8 @@ while(1) {
}
# Save content type separately
if ($header{'content-type'} =~ /^([^\s;]+)/) {
if ($header{'content-type'} &&
$header{'content-type'} =~ /^([^\s;]+)/) {
my $foo = $name."_content_type";
if ($arrays == 1) {
$in{$foo} ||= [];
@@ -855,15 +861,15 @@ while(1) {
my $data = "";
my $dfile;
my $fh;
if ($direct_dir) {
if ($direct_dir && $file) {
# Save directly to disk
$file =~ /([^\\\/]+)$/;
my $filename = $1;
$filename || &error($text{'readparse_nofile'});
my $uppath = "$direct_dir/$filename";
open($fh, ">", $uppath) || next;
$file =~ s/.*[\\\/]//;
$file || &error($text{'readparse_nofile'});
my $uppath = "$direct_dir/$file";
open($fh, ">", $uppath) ||
&error(&text('readparse_cannotdir', $uppath, $!));
# Return file name, no data
$dfile = $filename;
$dfile = $file;
}
while (1) {
$line = <STDIN>;