Delete trailing whitespaces on rename and mkdir

Whitespace at end of filename cause errors while accessing those files and dirs via WebDAV (e.g. Nautilus, Caja, etc). This patch tries to avoid creation of such nodes.
pydio · Oct 18, 2016 · c2aa1de · c2aa1de
1 parent 78328fc
commit c2aa1de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/InputFilter.php b/core/src/core/src/pydio/Core/Utils/Vars/InputFilter.php
@@ -333,4 +333,4 @@ public static function fromPostedFileName($filesystemElement)
     }
 
 
-}
+}
diff --git a/core/src/plugins/access.fs/FsAccessDriver.php b/core/src/plugins/access.fs/FsAccessDriver.php
@@ -1113,7 +1113,8 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
                     $destNode = $selection->nodeForPath($dest);
                     $this->filterUserSelectionToHidden($ctx, [$destNode->getLabel()]);
                 }else if(isSet($httpVars["filename_new"])){
-                    $filename_new = InputFilter::decodeSecureMagic($httpVars["filename_new"]);
+					$filename_new = InputFilter::decodeSecureMagic($httpVars["filename_new"], InputFilter::SANITIZE_FILENAME);
+					$filename_new = rtrim($filename_new);
                     $this->filterUserSelectionToHidden($ctx, [$filename_new]);
                 }
                 $renamedNode = $this->rename($originalNode, $destNode, $filename_new);
@@ -1148,6 +1149,7 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
                     $parentDir = PathUtils::forwardSlashDirname($newDirPath);
                     $basename = PathUtils::forwardSlashBasename($newDirPath);
                     $basename = substr($basename, 0, $max_length);
+					$basename = rtrim($basename);
                     $this->filterUserSelectionToHidden($ctx, [$basename]);
                     $parentNode = $selection->nodeForPath($parentDir);
                     try{
@@ -2545,4 +2547,4 @@ public function makeSharedRepositoryOptions(ContextInterface $ctx, $httpVars)
     }
 
 
-}
+}