Move the validation into one place only

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 14 insertions, 26 deletions

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 7866f90157e..67f89180994 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -53,8 +53,10 @@ use OC\Files\Storage\Storage;
 use OC\User\User;
 use OCP\Constants;
 use OCP\Files\Cache\ICacheEntry;
+use OCP\Files\EmptyFileNameException;
 use OCP\Files\FileNameTooLongException;
 use OCP\Files\InvalidCharacterInPathException;
+use OCP\Files\InvalidDirectoryException;
 use OCP\Files\InvalidPathException;
 use OCP\Files\Mount\IMountPoint;
 use OCP\Files\NotFoundException;
@@ -1788,39 +1790,25 @@ class View {
 	 * @throws InvalidPathException
 	 */
 	public function verifyPath($path, $fileName) {
-
-		$l10n = \OC::$server->getL10N('lib');
-
-		// verify empty and dot files
-		$trimmed = trim($fileName);
-		if ($trimmed === '') {
-			throw new InvalidPathException($l10n->t('Empty filename is not allowed'));
-		}
-		if (\OC\Files\Filesystem::isIgnoredDir($trimmed)) {
-			throw new InvalidPathException($l10n->t('Dot files are not allowed'));
-		}
-
-		if (!\OC::$server->getDatabaseConnection()->supports4ByteText()) {
-			// verify database - e.g. mysql only 3-byte chars
-			if (preg_match('%(?:
-      \xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
-    | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
-    | \xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
-)%xs', $fileName)) {
-				throw new InvalidPathException($l10n->t('4-byte characters are not supported in file names'));
-			}
-		}
-
 		try {
 			/** @type \OCP\Files\Storage $storage */
 			list($storage, $internalPath) = $this->resolvePath($path);
 			$storage->verifyPath($internalPath, $fileName);
 		} catch (ReservedWordException $ex) {
-			throw new InvalidPathException($l10n->t('File name is a reserved word'));
+			$l = \OC::$server->getL10N('lib');
+			throw new InvalidPathException($l->t('File name is a reserved word'));
 		} catch (InvalidCharacterInPathException $ex) {
-			throw new InvalidPathException($l10n->t('File name contains at least one invalid character'));
+			$l = \OC::$server->getL10N('lib');
+			throw new InvalidPathException($l->t('File name contains at least one invalid character'));
 		} catch (FileNameTooLongException $ex) {
-			throw new InvalidPathException($l10n->t('File name is too long'));
+			$l = \OC::$server->getL10N('lib');
+			throw new InvalidPathException($l->t('File name is too long'));
+		} catch (InvalidDirectoryException $ex) {
+			$l = \OC::$server->getL10N('lib');
+			throw new InvalidPathException($l->t('Dot files are not allowed'));
+		} catch (EmptyFileNameException $ex) {
+			$l = \OC::$server->getL10N('lib');
+			throw new InvalidPathException($l->t('Empty filename is not allowed'));
 		}
 	}