opensourcemirror
/
nextcloud-notes
mirror of https://github.com/nextcloud/notes.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix long duplicate title generation 

Long titles were trimmed to 100 characters even after appending numbered
suffixes for duplicates. This caused infinite recursion / hanging of the
service.
This fix removes some more characters from the end of title if there is
not enough room for the suffix.

Signed-off-by: Jacek Tomasiak <jacek.tomasiak@gmail.com>
This commit is contained in:
Jacek Tomasiak 2021-01-13 12:01:07 +01:00 committed by korelstar
parent e904daec80
commit e65a31d7eb
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Service/NoteUtil.php
View File

@ -9,6 +9,7 @@ use OCP\Files\IRootFolder;
use OCP\IDBConnection;
class NoteUtil {
private const MAX_TITLE_LENGTH = 100;
/** @var Util */
public $util;
private $db;
@ -71,17 +72,18 @@ class NoteUtil {
return $filename;
} else {
// increments name (2) to name (3)
$match = preg_match('/\((?P<id>\d+)\)$/u', $title, $matches);
$match = preg_match('/\s\((?P<id>\d+)\)$/u', $title, $matches);
if ($match) {
$newId = ((int) $matches['id']) + 1;
$newTitle = preg_replace(
'/(.*)\s\((\d+)\)$/u',
'$1 (' . $newId . ')',
$title
);
$baseTitle = preg_replace('/\s\(\d+\)$/u', '', $title);
$idSuffix = ' (' . $newId . ')';
} else {
$newTitle = $title . ' (2)';
$baseTitle = $title;
$idSuffix = ' (2)';
}
// make sure there's enough room for the ID suffix before appending or it will be
// trimmed by getSafeTitle() and could cause infinite recursion
$newTitle = mb_substr($baseTitle, 0, self::MAX_TITLE_LENGTH - mb_strlen($idSuffix), "UTF-8") . $idSuffix;
return $this->generateFileName($folder, $newTitle, $suffix, $id);
}
}
@ -98,7 +100,7 @@ class NoteUtil {
$title = preg_replace('/\s/u', ' ', $title);
// using a maximum of 100 chars should be enough
$title = mb_substr($title, 0, 100, "UTF-8");
$title = mb_substr($title, 0, self::MAX_TITLE_LENGTH, "UTF-8");
// ensure that title is not empty
if (empty($title)) {