jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 00:04:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Disallow usernames that contain certain words and RegExp (#2200)

Browse source 
* Add `disallowedwords` setting and perform check

Check if any of the words in `disallowedwords` are contained in the username. If
so, return false like other checks.

NOTE: Needs testing for advanced bugs.

* Remove "administrator" from `disallowedwords`

"administrator" contains "admin" anyway, so it is not needed.

* Add error message if username contains a disallowed word

* Add `disallowedregexp` setting and perform check

Check if each expression in `disallowedregexp` exactly matches the username. If
so, return false.

TODO: Add specific error to dialog in `window_main.cpp`.

* Add error message for username matching RegExp

* Fix indentation

* Compile `disallowedregexp` into a QList upon initialization

Reduces system load with each registration request.

* Clean up `isUsernameValid` function

* Fix indentation

* Add backwards compatibility to client

Client can accept either 7 or 9 rules to maintain compatibility with older
versions of server.

* Add examples and warnings to `servatrice.ini`
This commit is contained in:
Kevin Boxhoorn 2016-10-17 21:24:42 +11:00 • committed by ctrlaltca
parent f20e2ce2bd
commit 0b7f4c134c
5 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
servatrice/src/settingscache.h
View file

@ -3,6 +3,8 @@
#include <QSettings>
#include <QString>
#include <QList>
#include <QRegExp>
class SettingsCache : public QSettings {
Q_OBJECT
@ -11,6 +13,7 @@ private:
public:
SettingsCache(const QString & fileName="servatrice.ini", QSettings::Format format=QSettings::IniFormat, QObject * parent = 0);
static QString guessConfigurationPath(QString & specificPath);
QList<QRegExp> disallowedRegExp;
};
extern SettingsCache *settingsCache;