mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24341 from owncloud/scan-nfd-showwarning 

Add files:scan warning when NFD or incompatible encoding found
This commit is contained in:
Morris Jobke 2016-05-02 09:41:12 +02:00
parent a323111bd1 4326d73ff6
commit 6b12f96b14
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/files/command/scan.php
View File

@ -89,6 +89,15 @@ class Scan extends Base {
); );
} }
public function checkScanWarning($fullPath, OutputInterface $output) {
$normalizedPath = basename(\OC\Files\Filesystem::normalizePath($fullPath));
$path = basename($fullPath);
if ($normalizedPath !== $path) {
$output->writeln("\t<error>Entry \"" . $fullPath . '" will not be accessible due to incompatible encoding</error>');
}
}
protected function scanFiles($user, $path, $verbose, OutputInterface $output) { protected function scanFiles($user, $path, $verbose, OutputInterface $output) {
$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection(), \OC::$server->getLogger()); $scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection(), \OC::$server->getLogger());
# check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception # check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception
@ -126,6 +135,12 @@ class Scan extends Base {
} }
}); });
} }
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) {
$this->checkScanWarning($path, $output);
});
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function($path) use ($output) {
$this->checkScanWarning($path, $output);
});
try { try {
$scanner->scan($path); $scanner->scan($path);
@ -133,7 +148,9 @@ class Scan extends Base {
$output->writeln("<error>Home storage for user $user not writable</error>"); $output->writeln("<error>Home storage for user $user not writable</error>");
$output->writeln("Make sure you're running the scan command only as the user the web server runs as"); $output->writeln("Make sure you're running the scan command only as the user the web server runs as");
} catch (\Exception $e) { } catch (\Exception $e) {
# exit the function if ctrl-c has been pressed if ($e->getMessage() !== 'ctrl-c') {
$output->writeln('<error>Exception while scanning: ' . $e->getMessage() . "\n" . $e->getTraceAsString() . '</error>');
}
return; return;
} }
} }

2
apps/files_external/lib/storage/smb.php
View File

@ -100,7 +100,7 @@ class SMB extends \OC\Files\Storage\Common {
* @return string * @return string
*/ */
protected function buildPath($path) { protected function buildPath($path) {
return Filesystem::normalizePath($this->root . '/' . $path); return Filesystem::normalizePath($this->root . '/' . $path, true, false, true);
} }
/** /**

21
lib/private/Files/Filesystem.php
View File

@ -789,11 +789,12 @@ class Filesystem {
* Fix common problems with a file path * Fix common problems with a file path
* *
* @param string $path * @param string $path
* @param bool $stripTrailingSlash * @param bool $stripTrailingSlash whether to strip the trailing slash
* @param bool $isAbsolutePath * @param bool $isAbsolutePath whether the given path is absolute
* @param bool $keepUnicode true to disable unicode normalization
* @return string * @return string
*/ */
public static function normalizePath($path, $stripTrailingSlash = true, $isAbsolutePath = false) { public static function normalizePath($path, $stripTrailingSlash = true, $isAbsolutePath = false, $keepUnicode = false) {
if (is_null(self::$normalizedPathCache)) { if (is_null(self::$normalizedPathCache)) {
self::$normalizedPathCache = new CappedMemoryCache(); self::$normalizedPathCache = new CappedMemoryCache();
} }
@ -817,19 +818,13 @@ class Filesystem {
} }
//normalize unicode if possible //normalize unicode if possible
$path = \OC_Util::normalizeUnicode($path); if (!$keepUnicode) {
$path = \OC_Util::normalizeUnicode($path);
}
//no windows style slashes //no windows style slashes
$path = str_replace('\\', '/', $path); $path = str_replace('\\', '/', $path);
// When normalizing an absolute path, we need to ensure that the drive-letter
// is still at the beginning on windows
$windows_drive_letter = '';
if ($isAbsolutePath && \OC_Util::runningOnWindows() && preg_match('#^([a-zA-Z])$#', $path[0]) && $path[1] == ':' && $path[2] == '/') {
$windows_drive_letter = substr($path, 0, 2);
$path = substr($path, 2);
}
//add leading slash //add leading slash
if ($path[0] !== '/') { if ($path[0] !== '/') {
$path = '/' . $path; $path = '/' . $path;
@ -855,7 +850,7 @@ class Filesystem {
$path = substr($path, 0, -2); $path = substr($path, 0, -2);
} }
$normalizedPath = $windows_drive_letter . $path; $normalizedPath = $path;
self::$normalizedPathCache[$cacheKey] = $normalizedPath; self::$normalizedPathCache[$cacheKey] = $normalizedPath;
return $normalizedPath; return $normalizedPath;