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

Add better duped uploads name; extract on upload predictably

Browse Source
This commit is contained in:
Ilia Rostovtsev
2022-01-06 14:47:47 +03:00
parent 0e1f7d8d72
commit 60a5ea924e
2 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
filemin/filemin-lib.pl
View File

@@ -486,11 +486,23 @@ foreach my $fref (@{$files_to_extract}) {
my $cwd = $fref->{'path'};
my $name = $fref->{'file'};
my $extract_to = "$cwd/" . fileparse("$cwd/$name", qr/\.[^.]*/);
if (-e $extract_to && !$in{'overwrite_existing'}) {
$extract_to .= "_" . int(rand(1000)) . $$;
my $extract_to = $cwd;
if (!$in{'overwrite_existing'}) {
my ($file_name) = $name =~ /(?|(.*)\.((?|tar|wbm|wbt)\..*)|(.*)\.([a-zA-Z]+\.(?|gpg|pgp))|(.*)\.(?=(.*))|(.*)())/;
if (!-e "$cwd/$file_name") {
$extract_to = "$cwd/$file_name";
} else {
my $__ = 1;
for (;;) {
my $new_dir_name = "$file_name(" . $__++ . ")";
if (!-e "$cwd/$new_dir_name") {
$extract_to = "$cwd/$new_dir_name";
last;
}
}
}
}
mkdir($extract_to);
mkdir("$extract_to");
my $archive_type = mimetype($cwd . '/' . $name);

37
filemin/upload.cgi
View File

@@ -62,13 +62,24 @@ MAINLOOP: while(index($line,"$boundary--") == -1) {
if (!$in{'overwrite_existing'}) {
if ($dirs[0] && -e "$cwd/$dirs[0]") {
# As only one directory upload at a time allowed
# check if parent exists and if it does add a suffix
# check if parent exists and if it does add
# predictable suffix, like `dir(1)` or `dir(2)`
if (!$uploaded_dir) {
$uploaded_dir = $dirs[0] . "_" . int(rand(1000)) . $$;
my $__ = 1;
for (;;) {
my $new_dir_name = "$dirs[0](" . $__++ . ")";
if (!-e "$cwd/$new_dir_name") {
$uploaded_dir = $new_dir_name;
last;
}
}
}
}
$file =~ s/^(\Q$dirs[0]\E)/$uploaded_dir/;
$dirs[0] = $uploaded_dir;
}
else {
$uploaded_dir = $dirs[0];
}
$file =~ s/^(\Q$dirs[0]\E)/$uploaded_dir/;
$dirs[0] = $uploaded_dir;
}
foreach my $updir (@dirs) {
$dir .= "$updir/";
@@ -82,11 +93,19 @@ MAINLOOP: while(index($line,"$boundary--") == -1) {
# In case of a regular file check for dupes
if (!$in{'overwrite_existing'}) {
if ($file && -e "$cwd/$file") {
# If file exists add a suffix
my ($file_name, $file_extension) = $file =~ /(?|(.*)\.([^.]+$)|(.*))/;
$file = $file_name . "_" . int(rand(1000)) . $$ . ($file_extension ? ".$file_extension" : "");
# If file exists add predictable suffix, like `file(1)` or `file(2)`
my ($file_name, $file_extension) = $file =~ /(?|(.*)\.((?|tar|wbm|wbt)\..*)|(.*)\.([a-zA-Z]+\.(?|gpg|pgp))|(.*)\.(?=(.*))|(.*)())/;
$file_extension = ".$file_extension" if ($file_extension);
my $__ = 1;
for (;;) {
my $new_file_name = "$file_name(" . $__++ . ")";
if (!-e "$cwd/$new_file_name$file_extension") {
$file = "$new_file_name$file_extension";
last;
}
}
}
}
}
# OK, we have a file, let`s save it
my $full = "$cwd/$file";