From 71ad98d3d7f0ee7989b697c97094efdfdec91da4 Mon Sep 17 00:00:00 2001 From: Richard Kello Date: Fri, 10 Jul 2026 08:15:58 +0200 Subject: [PATCH 1/2] Align mobile regex with server regex --- core/coreutils.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/coreutils.cpp b/core/coreutils.cpp index a17b38aa8..b50940045 100644 --- a/core/coreutils.cpp +++ b/core/coreutils.cpp @@ -271,9 +271,13 @@ bool CoreUtils::isAuthConfigFile( const QString filePath ) bool CoreUtils::isValidName( const QString &name ) { - static QRegularExpression reForbiddenmNames( R"([@#$%^&*\(\)\{\}\[\]\\\/\|\+=<>~\?:;,`\'\"]|^[\s^\.].*$|^CON$|^PRN$|^AUX$|^NUL$|^COM\d$|^LPT\d|^support$|^helpdesk$|^merginmaps$|^lutraconsulting$|^mergin$|^lutra$|^input$|^sales$|^admin$)", QRegularExpression::CaseInsensitiveOption ); + static QRegularExpression reForbiddenmNames( R"(^[\s^\.].*$|^CON$|^PRN$|^AUX$|^NUL$|^COM\d$|^LPT\d|^support$|^helpdesk$|^merginmaps$|^lutraconsulting$|^mergin$|^lutra$|^input$|^sales$|^admin$)", QRegularExpression::CaseInsensitiveOption ); + static QRegularExpression reValidCharacters( R"(^[\w\s\-\.]+$)" ); + QRegularExpressionMatch matchForbiddenNames = reForbiddenmNames.match( name ); - return !matchForbiddenNames.hasMatch(); + QRegularExpressionMatch matchValidCharacters = reValidCharacters.match( name ); + + return !matchForbiddenNames.hasMatch() && matchValidCharacters.hasMatch(); } QString CoreUtils::nameAbbr( const QString &name, const QString &email ) From d1c3289e079941a21502c7c6fa11af9ddbab539c Mon Sep 17 00:00:00 2001 From: Richard Kello Date: Mon, 20 Jul 2026 16:37:51 +0200 Subject: [PATCH 2/2] Split rules to mimic server and Add file length rule --- core/coreutils.cpp | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/core/coreutils.cpp b/core/coreutils.cpp index b50940045..e5146780b 100644 --- a/core/coreutils.cpp +++ b/core/coreutils.cpp @@ -269,15 +269,36 @@ bool CoreUtils::isAuthConfigFile( const QString filePath ) return filePath == AUTH_CONFIG_FILENAME; } -bool CoreUtils::isValidName( const QString &name ) +static bool hasValidFirstCharacter( const QString &name ) { - static QRegularExpression reForbiddenmNames( R"(^[\s^\.].*$|^CON$|^PRN$|^AUX$|^NUL$|^COM\d$|^LPT\d|^support$|^helpdesk$|^merginmaps$|^lutraconsulting$|^mergin$|^lutra$|^input$|^sales$|^admin$)", QRegularExpression::CaseInsensitiveOption ); - static QRegularExpression reValidCharacters( R"(^[\w\s\-\.]+$)" ); + static QRegularExpression re( R"(^[\s^\.].*$)", QRegularExpression::CaseInsensitiveOption ); + return !re.match( name ).hasMatch(); +} - QRegularExpressionMatch matchForbiddenNames = reForbiddenmNames.match( name ); - QRegularExpressionMatch matchValidCharacters = reValidCharacters.match( name ); +static bool isInvalidFilename( const QString &name ) +{ + if ( name.length() > 255 ) + return true; - return !matchForbiddenNames.hasMatch() && matchValidCharacters.hasMatch(); + static QRegularExpression re( R"(^CON$|^PRN$|^AUX$|^NUL$|^COM\d$|^LPT\d)", QRegularExpression::CaseInsensitiveOption ); + return re.match( name ).hasMatch(); +} + +static bool isReservedWord( const QString &name ) +{ + static QRegularExpression re( R"(^support$|^helpdesk$|^merginmaps$|^lutraconsulting$|^mergin$|^lutra$|^input$|^sales$|^admin$)", QRegularExpression::CaseInsensitiveOption ); + return re.match( name ).hasMatch(); +} + +static bool hasValidCharacters( const QString &name ) +{ + static QRegularExpression re( R"(^[\w\s\-\.]+$)" ); + return re.match( name ).hasMatch(); +} + +bool CoreUtils::isValidName( const QString &name ) +{ + return hasValidFirstCharacter( name ) && !isInvalidFilename( name ) && !isReservedWord( name ) && hasValidCharacters( name ); } QString CoreUtils::nameAbbr( const QString &name, const QString &email )