Skip to content

Align mobile regex with server regex #4590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Withalion merged 5 commits into from
Jul 27, 2026
Merged

Align mobile regex with server regex #4590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71ad98d
Align mobile regex with server regex
Jul 10, 2026
d1c3289
Split rules to mimic server and Add file length rule
Jul 20, 2026
b6b08f9
Update regex flow
Jul 21, 2026
5441d9a
Merge remote-tracking branch 'origin/master' into bugfix/update-proje…
Jul 21, 2026
f9958d0
Update test and Update regex to work with unicode
Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/test/testcoreutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ void TestCoreUtils::testNameValidation()
{ QStringLiteral( "-project" ), true },
{ QStringLiteral( "proj_ect" ), true },
{ QStringLiteral( "proj.ect" ), true },
{ QStringLiteral( "proj!ect" ), true },
{ QStringLiteral( "proj!ect" ), false },

{ QStringLiteral( " project" ), false },
{ QStringLiteral( ".project" ), false },
Expand Down
24 changes: 21 additions & 3 deletions core/coreutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,27 @@ 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 );
QRegularExpressionMatch matchForbiddenNames = reForbiddenmNames.match( name );
return !matchForbiddenNames.hasMatch();
if ( name.length() > 255 )
return false;

// name must not start with whitespace, '^' or '.'
static QRegularExpression invalidFirstCharacterRe( R"(^[\s^\.].*$)", QRegularExpression::CaseInsensitiveOption );
if ( invalidFirstCharacterRe.match( name ).hasMatch() )
return false;

// name must not be a reserved Windows device filename (CON, PRN, AUX, NUL, COM1-9, LPT1-9)
static QRegularExpression invalidFilenameRe( R"(^CON$|^PRN$|^AUX$|^NUL$|^COM\d$|^LPT\d)", QRegularExpression::CaseInsensitiveOption );
if ( invalidFilenameRe.match( name ).hasMatch() )
return false;

// name must not be a word reserved by Mergin Maps / Lutra Consulting
static QRegularExpression reservedWordRe( R"(^support$|^helpdesk$|^merginmaps$|^lutraconsulting$|^mergin$|^lutra$|^input$|^sales$|^admin$)", QRegularExpression::CaseInsensitiveOption );
if ( reservedWordRe.match( name ).hasMatch() )
return false;

// name must contain only word characters, whitespace, '-' or '.'
static QRegularExpression validCharactersRe( R"(^[\w\s\-\.]+$)", QRegularExpression::UseUnicodePropertiesOption );
return validCharactersRe.match( name ).hasMatch();
}

QString CoreUtils::nameAbbr( const QString &name, const QString &email )
Expand Down
Loading