status: factoring out normalize_content_filename

Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>

diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm
index 70692444c6177b3847508d16719347ca6e3e39c7..11ad60f0058e05e96253c8eedf3c01fd9a55ee11 100644 (file)
--- a/PVE/API2/Storage/Status.pm
+++ b/PVE/API2/Storage/Status.pm
@@ -413,11 +413,7 @@ __PACKAGE__->register_method ({
        my $size = -s $tmpfilename;
        die "temporary file '$tmpfilename' does not exist\n" if !defined($size);
 
-       my $filename = $param->{filename};
-
-       chomp $filename;
-       $filename =~ s/^.*[\/\\]//;
-       $filename =~ s/[^-a-zA-Z0-9_.]/_/g;
+       my $filename = PVE::Storage::normalize_content_filename($param->{filename});
 
        my $path;
 

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 719fe5b329148d034f19a5f4951541576e7b65ba..b8e63114d7cd809a743475f1fb6cf6d92ff270c4 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -1945,4 +1945,16 @@ sub assert_sid_unused {
     return undef;
 }
 
+# removes leading/trailing spaces and (back)slashes completely
+# substitutes every non-ASCII-alphanumerical char with '_', except '_.-'
+sub normalize_content_filename {
+    my ($filename) = @_;
+
+    chomp $filename;
+    $filename =~ s/^.*[\/\\]//;
+    $filename =~ s/[^a-zA-Z0-9_.-]/_/g;
+
+    return $filename;
+}
+
 1;