Commit Graph

2980 Commits

Author SHA1 Message Date
ljacqu
1d6d9eb764 #1467 Rearrange old keys migration so no entries get lost
- 'error' was an old entry but now we have multiple entries under 'error' (which is now a section), so we need to ensure that we migrate the old 'error' entry before the migration sets anything under that path
2018-02-02 19:40:28 +01:00
ljacqu
f44353ed4c #1467 Fix messages verification tool task + remove empty messages in YML files 2018-02-01 23:09:08 +01:00
ljacqu
f67ddb0c77 #1467 Migrate all message files, make sure migrater keeps predefined order 2018-02-01 20:23:06 +01:00
ljacqu
abd19cdb86 #1467 Fix error in placeholder migration, create and fix tests 2018-01-29 22:15:39 +01:00
ljacqu
760a2a909c #1467 Fix export issues (style, encoding)
- Override yaml file resource to ensure that lines aren't wrapped
- Override yaml file reader to ensure the file is always read as UTF-8
2018-01-29 21:46:58 +01:00
ljacqu
f714e9d564 #1467 Change message keys and messages_en to new structure 2018-01-29 20:56:30 +01:00
ljacqu
dfe47066cd Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1467-message-keys-hierarchy 2018-01-29 20:04:38 +01:00
sgdc3
a92084ec60 Fix the deploy system 2018-01-29 15:08:59 +01:00
games647
be55437287
Use the correct javadoc deprecated tag for the lastlogin method 2018-01-27 22:56:42 +01:00
DNx
f7e9ac9685 Add support for delaying commands. 2018-01-26 14:28:02 +07:00
ljacqu
1eaf321575 #1467 Try to clean up abstract message file handler hierarchy
- Move some handling with the default file configuration down to the help message file handler since it is the only one with such a behavior now
2018-01-25 21:48:48 +01:00
ljacqu
820e443b81 #1467 Implement messages file migration
- Create messages updater called when a messages YML file is loaded
  - Work in progress
- Does not yet include changes to any message keys
2018-01-24 22:19:25 +01:00
ljacqu
b3a191d7e2 Minor: simplify CheckMessageKeyUsages task and make check more strict 2018-01-22 19:56:51 +01:00
Maxetto
0b096ea56e
[Messages_IT] Add specific message for register captcha success 2018-01-21 23:42:37 +01:00
ljacqu
6f2c586441 Test initialization of permission handlers in PermissionManager 2018-01-21 22:11:47 +01:00
ljacqu
610a699c95 Refactor message handlers into injectable components (preparation for #1467) 2018-01-21 20:47:29 +01:00
ljacqu
847991b658 #1474 Don't log /email changepassword command (exposes password) 2018-01-21 19:06:51 +01:00
ljacqu
761ee2f05b #1035 Migrate other accounts config from config.yml to commands.yml 2018-01-21 18:58:20 +01:00
Playhi
ad7a0ffe9b
Update messages_zhcn.yml
theCaptcha
2018-01-20 19:43:51 +08:00
Playhi
35e9858c30
Update messages_zhcn.yml 2018-01-19 21:27:00 +08:00
ljacqu
1e16f251ef
Merge pull request #1477 from AuthMe/1035-handle-alt-accounts-in-commandsYml
1035 handle alt accounts in commands yml
2018-01-17 21:49:29 +01:00
ljacqu
fe4ea6d22b Remove migration of commands from config.yml to commands.yml
- Migration was shipped with the 5.2 release and is now becoming harder to maintain; since it's quite old we drop it
2018-01-17 21:42:17 +01:00
Gabriele C
cdd14bee18
Merge pull request #1475 from RikoDEV/patch-3
Update messages_pl.yml
2018-01-17 20:30:03 +01:00
Jacek Maciejak
fb989a8955
Update messages_pl.yml 2018-01-17 18:40:27 +01:00
Jacek Maciejak
cc701772f4
Update messages_pl.yml 2018-01-17 18:36:06 +01:00
Jacek Maciejak
045bb1b669
Update messages_pl.yml 2018-01-17 18:33:46 +01:00
ljacqu
7f77f30439 Minor: Fix forgotten param documentation in JavaDoc 2018-01-16 20:40:21 +01:00
ljacqu
f19f8502d8 #1035 Forced commands: add more tests, rename account constraints, update commands.yml comments 2018-01-16 20:32:17 +01:00
ljacqu
3c0236e15e #1035 Fix handling of new login command constraints
- Incorporate ConfigMe fix
- Various fixes in the integration
2018-01-15 22:39:29 +01:00
RatchetCinemaESP
8a44dad548
Fix error in placerholder
<theCaptcha>
2018-01-15 17:45:43 +01:00
RatchetCinemaESP
0bbe109b55
Update messages_es.yml
1. Fix one error in current translation (Line 88)
2. Translated two strings of Captcha. (Line 101 & 102)
2018-01-15 17:13:09 +01:00
Jacek Maciejak
95bbbd9ba0
Update messages_pl.yml 2018-01-15 15:40:49 +01:00
ljacqu
8dbba1dc93 #1035 Add optional constraints to onLogin and onFirstLogin commands for number of alt accounts
- Extend Command to add specific constraints
- Currently doesn't work because of missing ConfigMe support
2018-01-14 12:23:04 +01:00
ljacqu
1cd5a6acce #1472 Add zhtw translation changes by @haer0248 2018-01-14 11:16:23 +01:00
ljacqu
d9c1af4311 #1454 Run other accounts command in sync mode 2018-01-08 23:08:37 +01:00
Twonox
e906a6abfa Update messages_fr.yml (#1469) 2018-01-08 21:20:41 +01:00
ljacqu
a29738e2a8 #1460 Fix null handling in recent players command
- Last login might be null
2018-01-06 20:26:07 +01:00
ljacqu
ea87075cd2 #930 Add specific message for register captcha success 2018-01-06 20:01:45 +01:00
ljacqu
9afd8679e9 Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 930-captcha-for-register 2018-01-06 19:04:14 +01:00
ljacqu
23c246748a #930 Register captcha: avoid circular dependency by handling limbo message in captcha command
- Set limbo message in captcha command (as is done for login captcha)
- Add clarifying comments to captcha command
- Remove classes handling circular dependencies
2018-01-06 19:04:03 +01:00
ljacqu
94cf310d5b Minor: fix code climate config test 2018-01-06 18:06:30 +01:00
ljacqu
84b376d2a5 #930 Change captcha storage to change code internally upon failure
- Within CaptchaStorage#checkCode, a player's captcha code is overridden with a new one on failure or cleared on success
- Fixes inconsistencies in the retrieval / regeneration of codes
2018-01-06 02:31:26 +01:00
ljacqu
180bbbf0be #930 Refactor captcha managers to have a crude captcha storage class instead of inheritance
- Remove abstract captcha manager in favor of a primitive captcha code storage (composition over inheritance)
- Supply player when checking captcha code for further usage (fixes open point from previous commit)
2018-01-05 01:26:25 +01:00
ljacqu
0494886518 Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 930-captcha-for-register 2018-01-05 00:17:39 +01:00
ljacqu
7cf3f6d77b #930 Registration captcha: update message shown to player on failed captcha
- Show message with new captcha code when a captcha has failed
- Requires implementation of circular dependency handler (initial draft)
2018-01-05 00:17:22 +01:00
KKHaneul
aea581c367
Update messages_ko.yml 2018-01-04 17:46:25 +09:00
KKHaneul
9918d532a4 Korean Translation #1 2018-01-03 18:17:34 +09:00
Gabriele C
30b9e034bc
Merge pull request #1462 from Maxetto/patch-1
[Messages_IT] Translate new messages
2017-12-27 20:05:32 +01:00
Maxetto
0a7e57b6a7 Improve security of Console and Log files (#1461)
* Finally kill removePassword option

* Cleanup

* Cleanup

* Cleanup

* Cleanup

* Final Cleanup

* Fix compile warning

* Revert "Cleanup"
2017-12-27 13:05:06 +01:00
Maxetto
b2b7eaa8e5
[Messages_IT] Translate new messages 2017-12-27 11:28:12 +01:00
ljacqu
c8d82a23e0 Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 930-captcha-for-register 2017-12-22 21:54:58 +01:00
ljacqu
8bae71e1bd #1435 Send password recovery emails in async 2017-12-21 21:54:23 +01:00
Gabriele C
779c4a2b33 Fix build 2017-12-19 10:53:07 +01:00
Gabriele C
0b91b8ba77
Merge pull request #1455 from rebirth00723/patch-1
Update messages_zhtw.yml
2017-12-17 17:45:10 +01:00
Adam Harrison
6f52449d49
Deprecate getLastLogin, replace with java 8 getLastLoginTime
(Resolves #1421)
2017-12-17 11:42:25 +01:00
rebirth00723
79d897e7ce
Update messages_zhtw.yml
Added some translations
2017-12-17 14:33:05 +08:00
Gabriele C
26a69297ce Disable the automatic poolSize option
it creates more issues than benefits
2017-12-13 23:13:28 +01:00
Thibaut DAVID
2d77f54695 Add new hash method (#1446)
Add new hash method for a CMS : http://craftmywebsite.fr/
2017-12-07 19:58:19 +01:00
Gabriele C
8f4171c436
Merge pull request #1438 from Twonox/patch-2
Update messages_fr.yml
2017-12-05 11:59:53 +01:00
Gabriele C
8fd402add3 #1442 Don't send bungee messages if the plugin is disabled
+ fix unit test on windows env
2017-12-05 00:30:08 +01:00
Twonox
0ac2524037
Update messages_fr.yml 2017-12-03 18:27:18 +01:00
Twonox
5e360ab8a4
Update messages_fr.yml 2017-12-03 12:11:58 +01:00
Twonox
952d58c87f
Update messages_fr.yml 2017-12-02 00:48:23 +01:00
ljacqu
1a60036592 #930 Extract common captcha functionality into abstract superclass
- Create AbstractCaptchaManager
- Add tests
2017-12-01 23:40:20 +01:00
ljacqu
33904c09e9 #930 Create registration captcha manager
- Introduce registration captcha manager, rename login captcha manager accordingly
- Integrate reg. captcha manager into /register command

Open points:
- Refactor common captcha functionality into abstract superclass
- If captcha before /register necessary, show appropriate message to player immediately
- Unit tests
2017-12-01 21:12:35 +01:00
ljacqu
67a6a42dfe Minor Javadoc fix: one "yet" is enough :) 2017-12-01 20:33:33 +01:00
ljacqu
058ac22462 Update docs 2017-12-01 19:16:49 +01:00
Timofey
ad6e13c396 messages_ru: verification code (#1432)
* ru: update
2017-12-01 19:02:40 +01:00
Gabriele C
a4550f786f
Merge pull request #1433 from montlikadani/patch-3
Updated messages_hu.yml file to the latest version
2017-12-01 17:08:53 +01:00
Gabriele C
755163c328
Merge pull request #1427 from Twonox/patch-1
Update messages_fr.yml
2017-12-01 17:08:19 +01:00
Twonox
a0982e2e92
Update messages_fr.yml 2017-12-01 16:57:19 +01:00
montlikadani
c5015381e2
Updated messages_hu.yml file to the latest version
TODO-s have been deleted and translated.
2017-12-01 16:17:08 +01:00
ljacqu
c784fc7f2e #1423 Fix ignored review remarks 2017-11-29 19:43:35 +01:00
Gabriele C
81db4168e4
Merge pull request #1428 from AuthMe/1423-cmi-support
#1423 Implement CMI spawn integration
2017-11-29 08:44:09 +01:00
Gabriele C
610fed3c7b Fix codestyle, add test 2017-11-29 08:38:34 +01:00
Gabriele C
7235a3b860
Merge pull request #1430 from AuthMe/1046-onFirstLogin-in-commandsYml
#1046 Add onFirstLogin to commands.yml
2017-11-29 01:11:25 +01:00
ljacqu
f1c1848985 #1046 Add onFirstLogin to commands.yml
- Allow to configure commands run on player's first login (login of player with a previously null lastlogin date)
2017-11-28 21:41:30 +01:00
ljacqu
50dbbb8d87 #1254 Create command to see recently logged in players
- Create datasource method to fetch most recent players by last login date
- Add command to view last logged in players
2017-11-28 21:07:10 +01:00
Gabriele C
c7c8e673f0 #1423 Implement CMI spawn integration 2017-11-28 12:57:39 +01:00
Twonox
1f898b05b6
Update messages_fr.yml 2017-11-27 18:04:13 +01:00
ljacqu
7932c1bf90 Update to injector 1.0
- Includes Factory and SingletonStore so our custom implementation is removed
2017-11-25 21:27:18 +01:00
ljacqu
6365926cf0 Fix test in AntiBotServiceTest 2017-11-23 20:06:21 +01:00
ljacqu
53f7bf155f Fix wrong check in CodeClimateConfigTest 2017-11-23 18:13:17 +01:00
ljacqu
1053440b15 Refactor util for setting BukkitService mock behavior
- Move helper methods for setting BukkitService mock behavior into their own class
- Change methods to use Mockito's answer instead of verification + argument capture -> calling the methods now belongs to the test setup (given clause) and allows the behavior to take effect more than once
2017-11-22 00:24:11 +01:00
ljacqu
4717dc148c #1413 Don't run onUnregister command in async 2017-11-21 23:48:15 +01:00
Jacek Maciejak
f6423f5072 Update of Polish translation file. (#1420)
* Update of Polish translation file.

Translated: # Verification code
Updated: email > e-mail

* Update messages_pl.yml
2017-11-21 20:59:36 +01:00
sgdc3
3ca97f5d30 #1418 Cleanup 2017-11-20 13:15:20 +01:00
Dimatert9
0e0d8dff3d Do not use Bukkit#sendPluginMessage 2017-11-20 13:56:05 +02:00
Gabriele C
ce490304ea Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded 2017-11-15 18:08:01 +01:00
Gabriele C
2f019dbb0e Fix connectPlayerOnLogin
#1412
2017-11-15 18:07:55 +01:00
Gabriele C
a2430299b8
Merge pull request #1409 from Playhi/patch-8
Update messages_zhcn.yml
2017-11-15 17:57:25 +01:00
Playhi
b70e994341
Update messages_zhcn.yml
Add '
2017-11-15 23:03:19 +08:00
RatchetCinemaESP
3e31bcc2a1
Translate Email Verification messages.
Translated to Spanish
2017-11-12 17:07:48 +01:00
Playhi
19745f7052
Update messages_zhcn.yml 2017-11-12 20:58:12 +08:00
Gabriele C
b7c3d4b42e
Implement AuthMeBungee autologin (#1402)
* Implement AuthMeBungee autologin

There is a failing test due to cyclic dependency injection, @ljacqu could you take a quick look at this?

* Try to fix recursive dependency injection

* Fix codestyle

* Fix the subchannel name, again...

* Split BungeeService into BungeeSender and BungeeReceiver
2017-11-09 11:19:24 +01:00
Gabriele C
7e079d0b9c Whoops... fix the listening messaging subchannel name 2017-11-06 08:00:20 +01:00
ljacqu
c693901330 Merge branch '1400-phpbb-hash' of https://github.com/AuthMe/AuthMeReloaded 2017-11-04 11:32:44 +01:00
ljacqu
5c40cb3b73 Insert null email as DEFAULT so column default may take effect
Ugly implementation to fit into AuthMe 5.4. If email on PlayerAuth is null, do not supply NULL as the email value but use DEFAULT instead so that the default value is used if present in the column configuration.
2017-11-04 11:29:21 +01:00
ljacqu
7d6c61258b Fix #1401 bungeecord message sent even if disabled 2017-11-04 10:17:52 +01:00
ljacqu
80ab41ae5a #1400 Sync AuthMe's phpBB hash implementation with phpBB3's
- phpBB3 seems to favor using BCrypt $2y$ now
- Keep unsalted MD5 and phpass salted MD5 comparisons for backwards compatibility
2017-11-04 09:58:51 +01:00
Gabriele C
80f9ec88b8 fix javadoc syntax 2017-11-03 21:29:13 +01:00
Gabriele C
937ae0afaf
Merge pull request #1393 from AuthMe/bungee-messaging-integration
Implement bungee messaging, CacheDataSource sync across network
2017-11-03 20:23:14 +01:00
Gabriele C
4206efc791 Merge branch 'bungee-messaging-integration' of https://github.com/AuthMe/AuthMeReloaded into bungee-messaging-integration 2017-11-03 20:02:13 +01:00
ljacqu
c7ba06e2b9 Fix test / use new DataSource method / add space before keywords 2017-11-03 19:57:40 +01:00
Gabriele C
ff53ff1ce6 Codestyle cleanup 2017-11-02 13:00:48 +01:00
Gabriele C
273c318e96 Cleanup 2017-11-02 11:24:17 +01:00
Gabriele C
cb8b2cbbad
Merge pull request #1396 from AuthMe/1350-optional-async-register-checks
#1350 Add option to force using the sync PlayerLoginEvent
2017-11-02 11:04:05 +01:00
Gabriele C
b307a5d7c2
Merge pull request #1381 from lifehome/patch-2
Initial commit for help_zhhk.yml
2017-11-02 10:59:45 +01:00
ljacqu
44a7baff9a #1350 Add option to force using the sync PlayerLoginEvent
- Introduce new configuration (taken from @sgdc3)
- Create JoiningPlayer, based on a Player object or String name, determining how permissions will be checked
2017-11-01 21:02:22 +01:00
Gabriele C
6505538240 Fix codestyle issues 2017-10-30 11:54:19 +01:00
Gabriele C
2d2eb740e3 Implement bungee messaging, CacheDataSource sync 2017-10-30 10:38:13 +01:00
Gabriele C
a5542051f4 Add a way to load user's permission data from the permission handler on demand.
#1350
2017-10-29 19:35:23 +01:00
games647
316f8fc642 Fix Java 9 support for Pbkdf2Django (#1390)
* Replace DatatypeConverter in Pbkdf2Django to support Java 9

* Fix NPE in AuthMeInitializer and CastException in Recovery tests

* Set logger for SetPasswordTest to prevent NPE on logging

* Use TestHelper for initializing ConsoleLogger
2017-10-29 12:11:24 +01:00
Gabriele C
d8d87c8b67 Add option to force using the generic Vault permission handler hook
Requested in #1350
2017-10-29 11:47:38 +01:00
ljacqu
e3dd719b0e
#792 Migrate last IP column if is NOT NULL without default value (#1385)
- Move MySQL migrations into a separate class
- Add migration for last IP column to be nullable if it has a not null constraint without a default value
2017-10-29 07:52:11 +01:00
ljacqu
2c6181d150 Add missing tests for API package 2017-10-28 23:15:53 +02:00
ljacqu
b687c68d46 Create test for HelpTranslationGenerator 2017-10-28 19:36:35 +02:00
ljacqu
8127d70058
Merge pull request #1386 from AuthMe/1367-mysql-notNull-toggle
Improve MySQL not null toggle / authme debug commands output
2017-10-28 18:49:23 +02:00
ljacqu
20ca4f9dc9 #1368 Improve the look of /authme debug
- Add a colored title for each command execution within /authme debug
- Fit more texts on one line
2017-10-28 17:19:47 +02:00
ljacqu
c6fbc1187f #1367 MySQL not null changer: List 'not null' and default values separately
- Check not only for NOT NULL constraint but also if a column has a default value
- Use suffixes instead of colors only so the command is usable via console
2017-10-28 15:41:16 +02:00
ljacqu
04c5224e99
#1190 Show settings warnings on reload also (#1384)
- Extract setting checks into their own class, called on startup and reload
2017-10-28 14:15:38 +02:00
ljacqu
d40109929c Fix describeHashAlgos tool task
- Handle case when Argon2 library is not loaded
- Account for hash algorithms with `null` as associated impl. class
2017-10-28 13:40:06 +02:00
ljacqu
fbd8049af5 Minor: Make email check in '/email change' case-insensitive 2017-10-28 13:10:24 +02:00
HexelDev
ba65633182 Email verification code (#1382)
* Base verification code implementation, must define command, manager, events
* VerificationManager, verification command and messages, handled some sensible commands, configuration values
* Improved manager and sensible commands trigger
* Updated messages
* Updated verification code manager, fixed tests
* Switched to a permission based command
* Verification manager and command improved and added tests
* Edited messages
2017-10-28 12:23:14 +02:00
lifehome
bae16f5998 Fix filetype typo 2017-10-26 14:25:14 +08:00
lifehome
80cf712dbc Create help_zhhk
Initial commit of help strings in Traditional Chinese (Hong Kong)
2017-10-26 14:19:01 +08:00
Adam Szczygieł
df69f144c9 Update help_pl.yml
One translation is incorrect, others lacked a translation or had some errors.
2017-10-25 15:20:24 +01:00
lifehome
5a329efb4a Update strings and fix color codes (#1375) 2017-10-23 11:03:57 +02:00
Gabriele C
39647013b2 Cleanup 2017-10-23 08:36:49 +02:00
Gabriele C
cd85c51fbe Perform join process only on player join
Should fix some issues like #1365
2017-10-23 08:31:06 +02:00
Alexandre Vanhecke
8fe92da119 #1150 - Add Argon2 support
- Add argon2 implementation

- Extract argon2 library check to method on Argon 2
- Add link to Wiki page on errors
- Check within Argon2Test if the test cases should be run, not in the abstract parent
2017-10-23 00:10:48 +02:00
Kacper Duras
90a7b47217 Improve Polish translation in help messages. (#1376)
* Improve Polish translation in help messages.
* Typo, `rerejestracja` -> `rejestracja`.
2017-10-22 22:48:14 +02:00
ljacqu
78e2763984 Help translations: remove entry for /authme purge second argument (no longer exists)
- Remove unknown entries as found by the verifyHelpTranslations tool task
2017-10-22 09:51:32 +02:00
ljacqu
b211c97395 Minor: delete PlainText implementation
- It never gets used anymore and could cause security issues if we did accidentally use it as EncryptionMethod
2017-10-22 09:27:03 +02:00
ljacqu
d6e2369f36 #792 Force migration of SQLite when necessary (#1371)
- Detect if a migration is necessary
- Create a backup
- Perform the migration
2017-10-22 09:16:48 +02:00
ljacqu
c37c0ce436 Fix CodeClimate config test to account for new test exclusion entry 2017-10-21 19:55:56 +02:00
montlikadani
241b17a1c8 Update HU messages
(cherry picked from commit 9b74a12)
2017-10-21 18:33:18 +02:00
ljacqu
4e8deec258 Move #isNpc method to PlayerUtils
- After dropping our hook to CombatTagPlus it is not relevant for it to be in PluginHooksService anymore
2017-10-21 12:08:23 +02:00
ljacqu
58657f5d3f Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 792-add-registration-date-and-ip 2017-10-21 10:46:17 +02:00
ljacqu
1651a61063 #792 #814 Implement SQLite migration, allow last IP to be nullable in MySQL
- Old SQLite setups have the last IP column as NOT NULL but without a default value. With the new concept (where we don't set a last IP on player registration) it fails.
  - Create an /authme debug child that allows to migrate SQLite (tricky because SQLite does not support dropping or modifying columns)
  - Allow last IP column to be NOT NULL in MySQL as well (extend MySQL /authme debug child)
- Add TODO comments with follow-up issue to extend our commands with new registration IP field
2017-10-21 10:45:48 +02:00
ljacqu
b5ea48085c #792 DataSource: when creating registrationDate column, set all rows to the current date 2017-10-20 21:31:58 +02:00
ljacqu
a425eacf2d #792 Add missing tests / fix CodeClimate issues 2017-10-20 17:49:30 +02:00
sgdc3
251eca9ccd Fix #1360 2017-10-20 00:11:42 +02:00
ljacqu
ea824ea3f0 #1016 Update hash algorithms list, add test that Deprecated annotation is in sync between enum and hash impl. class 2017-10-19 21:52:55 +02:00
ljacqu
fca77b940f #1016 Deprecate MD5, SHA1, SHA512: no longer allowed for active use
- Deprecate unsalted hashes: if such a hash is configured, move it to the legacy hashes setting to still support the existing hashes in the database but hash all passwords from now on with our default, SHA256.
2017-10-19 21:30:19 +02:00
ljacqu
7d445217d6 Merge redundant ConsoleLogger#debug overloads
- No need to distinguish between String[] and Object[] because log4j only has methods for Object[]
2017-10-19 20:14:17 +02:00
ljacqu
90073ef95d Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 792-registration-date-and-ip
Conflicts:
	src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java
	src/main/java/fr/xephi/authme/datasource/Columns.java
	src/main/java/fr/xephi/authme/datasource/SQLite.java
	src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java
	src/main/java/fr/xephi/authme/service/SessionService.java
	src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
	src/test/java/fr/xephi/authme/service/SessionServiceTest.java
	src/test/resources/fr/xephi/authme/datasource/sql-initialize.sql
2017-10-15 23:45:41 +02:00
Gabriele C
22e95493de #1031 Introduce hasSession field in datasource (#1351)
* Introduce hasSession field in datasource

That makes isLogged more consistent as it will be '1' only when the player is online.

* Fixes

* Fix unit testing

* Update config doc

* Create SessionService

* Create test for SessionService, avoid DB operations if sessions are disabled

* Cleanup: remove outdated warning for session timeout = 0
- Remove outdated warning
- Encapsulate session enabled check in SessionService

* Fix failing SessionServiceTest, add data source integration tests for session methods
2017-10-15 18:32:51 +02:00
ljacqu
ea58e20c3d #792 Include registration date into purging logic
- Take MAX(reg_date, login_date) as timestamp to compare against
- Remove the second "all" parameter to include entries with 0 registration date -> we expect registration date to always be set to the current date, so the parameter becomes obsolete
2017-10-15 18:29:01 +02:00
ljacqu
1df5308e56 #792 #814 Create command to remove NOT NULL constraints
- Create command under /authme debug that allows to change the 'nullable' status of MySQL columns (currently last date and email only)
   - We need to offer a default value for forum integrations that have a NOT NULL email column. Offering a command avoids us from force-migrating existing databases while still offering migrations in both directions
- Change in default value handling: lack of values are not handled by setting default values to the PlayerAuth anymore, and reading a default value from the database into a PlayerAuth will be translated into null by the PlayerAuth builder
- When a new database is created, email and lastlogin are now nullable and lack a default a value

Open points:
- Finish MySqlDefaultChangerTest
- Revise purging logic (#792)
- Allow to have more columns nullable (#814)
2017-10-15 12:56:13 +02:00
ljacqu
718c38aa24 Fix failing LoginSecurityConverterTest: allow tolerance for java.sql.Date to millis conversion 2017-10-14 19:51:26 +02:00
ljacqu
52d6476058 #792 Add columns for registration IP and registration date
- Add columns for reg date and IP
- Rename "ip" to "last IP"
2017-10-14 17:37:34 +02:00
RatchetCinemaESP
01e0381d93 Create complete help_es.yml
Complete help messages in Spanish.
2017-10-10 18:43:33 +02:00
Gabriele C
a39edde297 Add note to caching option 2017-10-09 10:19:27 +02:00
Gabriele C
29c30f6c22 Fix unit testing 2017-10-09 09:44:22 +02:00
Gabriele C
41af94aab2 Add DisplayNameNoColor tag in welcome/join messages #1344 2017-10-09 09:25:20 +02:00
Gabriele C
fafbef6be7 Prevent another deadlock in LuckPermsHandler #1350 2017-10-09 09:05:09 +02:00
Gabriele C
45dda0deba Prevent deadlock in LuckPermsHandler #1350 2017-10-09 09:02:14 +02:00
ljacqu
7afda20288 #1338 Implement ''/authme messages help' to generate a fully complete help text file (#1349) 2017-10-09 07:19:38 +02:00
ljacqu
5be3f8facc #1095 Update SMF hash algorithm to generate salt as SMF does
- The salt isn't used for password hashing but SMF requires that there be one to generate the authentication cookie. This does not yet enable registration from Minecraft: SMF has other non-null columns that need to be tackled. This is a first step.
2017-10-08 22:42:37 +02:00
ljacqu
f21605bbb1 Fix failing test 2017-10-08 20:08:46 +02:00
ljacqu
83d6d92a5c Minor - don't read welcome message if unused 2017-10-08 20:05:04 +02:00
ljacqu
5b1d8c6429 Use String#replace over String#replaceAll (the latter uses regex) 2017-10-08 17:32:05 +02:00
ljacqu
f1bed873d5 Minor - remove code duplication 2017-10-08 01:22:25 +02:00
ljacqu
278146a206 Merge branch '1347-change-password-api' of https://github.com/AuthMe/AuthMeReloaded 2017-10-05 23:47:19 +02:00
ljacqu
867b32194b #1347 Adapt tests for new change password architecture 2017-10-05 23:44:16 +02:00
sgdc3
0630c270ca Apply color codes to welcome message #1344 2017-10-04 20:29:30 +02:00
sgdc3
e268c3a624 Start working on the changepassword api method
TODO: fix unit testing
2017-10-04 20:12:53 +02:00
Gabriele C
816e751fe7 Fix minor codestyle issues #1341 2017-10-02 09:40:37 +02:00
Gabriele C
d6e2f35efd Fix unit test #1344 2017-10-02 09:03:30 +02:00
Gabriele C
10c09dbf17 Whoops, wasn't thread safe #1344 2017-10-02 08:48:22 +02:00
Gabriele C
3d08e1bae5 Fix some minor configuration issues #1344 2017-10-02 08:43:20 +02:00
Gabriele C
caf2a0ee9e Fix non-spigot server support 2017-10-02 08:05:35 +02:00
Platinteufel
60c7499cf4 Update messages_de.yml (#1342)
* Update messages_de.yml

* Update messages_de.yml
2017-10-01 23:04:14 +02:00
sgdc3
843baa8e4a Fix 1.7 and 1.8 compatibility 2017-10-01 19:53:15 +02:00
Gabriele C
d9399568a3 Add custom tempban unit testing 2017-09-30 21:16:02 +02:00
Gabriele C
7d61f2679c Fix unit testing 2017-09-30 20:51:49 +02:00
Gabriele C
3ea250cb10 Implement #794 2017-09-30 19:57:27 +02:00
Stefatorus
5d87f1fb51 Update messages_ro.yml 2017-09-30 20:30:40 +03:00
Stefatorus
4934d9f72a Update messages_ro.yml 2017-09-30 20:22:50 +03:00
Stefatorus
edf072eabb Fixed Grammar & spelling issues
I fixed some grammar and spelling isues, and made some messages be more explicit.
2017-09-30 20:18:38 +03:00
Stefatorus
a3a9bc7e0f Translated /authme help in romanian.
Translated /authme help in romanian.
2017-09-30 19:51:13 +03:00
Gabriele C
ceba761b7b Fix session timeout
whoops xD
2017-09-30 18:22:06 +02:00
ljacqu
37dc918ece Minor: remove commented out code 2017-09-30 17:44:34 +02:00
Gabriele C
e59df84a84 Fix session system (#1337)
* Old session system

* Actually check if sessions are enabled

* Cleanup

* Don't use cached isLogged value
2017-09-30 15:15:25 +02:00
sgdc3
f45092bdd2 Fix limbo player location on join 2017-09-30 15:13:35 +02:00
sgdc3
574fa9034d Cancel PlayerItemHeldEvent for unlogged users 2017-09-28 00:50:25 +02:00
sgdc3
920e65c4f4 Codestyle cleanup 2017-09-27 15:16:33 +02:00
sgdc3
dc4124de0a Fix unit tests 2017-09-27 14:48:26 +02:00
sgdc3
32f8e354df Should fix issues like #1336 and #592
The #592 fix will be effective only on 1.9+ servers
2017-09-27 14:41:23 +02:00
ljacqu
bd7d84a6d2 Small docs cleanup
- NewAPI class will be removed in 5.5, not 5.4
- Add entry for "Deprecated" recommendation in hash algorithms page
- Mention possibility of wildcards for restricted user rules
2017-09-17 11:33:24 +02:00
ljacqu
649b027e5b Output used permission system in /authme debug perm 2017-09-17 09:09:11 +02:00
Gabriele C
6c6fbaf12d Login performance (#1331)
* Ignore intellij tmp files

* Enhance onLogin performance
2017-09-17 09:05:13 +02:00
sgdc3
3d67305e9e Fix country code link #1330 2017-09-16 14:04:32 +02:00
sgdc3
3d26357df6 Use Utils.isEmailEmpty #1329 2017-09-16 14:02:16 +02:00
Gabriele C
9392291b36 Fix luckperms permission check 2017-09-14 21:03:08 +02:00
Gabriele C
a5466a8937 Fix luckperms user cleanup 2017-09-14 20:50:09 +02:00
Gabriele C
f754331de6 Implement LuckPerms permission handler
#1324
2017-09-14 20:39:15 +02:00
Gabriele C
e1466425a1 Print the "Forgot your password? ..." message only if the user has set the recovery email address #1329 2017-09-14 18:24:14 +02:00
dboecker
f13daff0c7 Update messages_de.yml (#1328)
Did the To-Do of German translation strings.
2017-09-10 04:01:02 +02:00
Gabriele C
45db55a081 Whoops, fix test 2017-09-06 04:11:02 +02:00
Gabriele C
08182e41f6 Fix null address 2017-09-06 00:56:27 +02:00
Gabriele C
8ae8ccf5cf Fix failing tests 2017-09-03 02:54:29 +02:00
Gabriele C
9e28700acf Attempt to fix #592
Should teleport the player before chunks/world are sent to the player
2017-09-03 02:43:34 +02:00
Gabriele C
2fbdd46919 #1298 Make permission manager accept OfflinePlayers + fix permission purge 2017-09-03 02:07:00 +02:00
Gabriele C
72da27e734 Fix #1324 2017-09-03 01:04:05 +02:00
Gabriele C
58aad9ed41 Fix unit tests 2017-09-03 00:53:45 +02:00
Gabriele C
c0a0a7e2a3 Use TestHelper.mockPlayerIp in tests 2017-09-02 12:47:26 +02:00
Gabriele C
97f580d9ec Fix permission node description 2017-09-02 12:26:03 +02:00
Gabriele C
6b875a9ba4 Add permission to bypass country check (#1323)
* Add permission to bypass country check

#1321 Still need to fix unit tests

* Fix test
2017-08-31 19:36:57 +02:00
Gabriele C
b96ae61697 Remove some old plugin hooks, update dependencies 2017-08-31 11:47:55 +02:00
HexelDev
1dfb3575b5 #1119 email show permission and privacy improvements (#1312)
* #1119 new permission and email hider

* Updated commands.md

* Improved email hiding method

* Revert "Improved email hiding method"

This reverts commit cb60d7b

* New config option, updated tests, config.md and permission_nodes.md

* Moved to service import, fixed typo and updated config.md

* Removed unused imports O.o
2017-08-12 16:20:06 +02:00
ljacqu
3df2dd5740 CZ update by Shadowhackercz (#1310)
* Last changes for CZ language file

* Last few changes
2017-08-10 22:22:28 +02:00
Thymue
bb5e10fcb1 Update messages_sk.yml (#1306)
* Update messages_sk.yml

* Update messages_sk.yml

* Update messages_sk.yml

* Update messages_sk.yml

* Update messages_sk.yml
2017-08-10 09:29:50 +02:00
ljacqu
df2fe2ea89 Add missing apostrophe 2017-08-07 22:19:25 +02:00
Bl4ckSpr4y
e7aa567021 Update messages_et.yml
I updated the Estonian translation.
2017-08-07 12:46:19 +03:00
ljacqu
30cb55dabd Update translations page 2017-08-05 14:07:02 +02:00
Foorack
81fcf0abdb Created help_eo.yml 2017-08-04 18:23:50 +02:00
Gabriele C
7e957cb8c7 Add missing api methods #1304 2017-08-01 16:41:00 +02:00
ljacqu
a801f03cf2 Merge pull request #1296 from AuthMe/5.4-Dev
Merge 5.4 development
2017-07-29 15:25:01 +02:00
HexelDev
a973dc3f6d Implement restricted users rules with * wildcard support (Enhancement #1278 and #1227) (#1297) 2017-07-25 21:39:31 +02:00
ljacqu
027d0fc775 Create TestHelper method to make Settings mock return defaults 2017-07-23 18:00:51 +02:00
ljacqu
efc06ef2a6 #1255 Create resource-closing tests for the MySQL extensions
- Remove test runs with different hash algorithms in the abstract super class
- Create resource-closing tests for the new extension classes
2017-07-23 17:29:36 +02:00
ljacqu
8eceaa8cbb #1255 Simplify MySQL data source extensions
- Mostly oving the logic of getting the ID from the DB to the extensions superclass
2017-07-23 16:38:35 +02:00
ljacqu
cbc794ba20 #1255 Extract forum-specific data source actions into separate extension classes 2017-07-23 14:19:28 +02:00
wolfwork
70d7249e12 Delete swear words (#1288)
* Delete swear words

* Update messages_ko.yml

* Update messages_ko.yml
2017-07-20 10:15:28 +02:00
ljacqu
f88350b06d Fix Checkstyle violations
- Mostly missing Javadoc on large methods
- CommandInitializer: split command building method into multiple methods
2017-07-16 23:07:13 +02:00
ljacqu
4ac980111d Add some tests, minor Checkstyle fixes 2017-07-16 13:00:55 +02:00
ljacqu
7c48cf59c7 Make default regex for password characters more user-friendly (#1285)
- Change regex pattern per input of @sgdc3
- Add clarifying comments
2017-07-15 19:38:05 +02:00
ljacqu
822818cf33 Revert: Fix default password regex
- The regex pattern allows all visible, non-whitespace ASCII symbols, including '0'
2017-07-15 18:41:01 +02:00
Gabriele C
b196d3e022 Whoops, allow simbols 2017-07-15 18:31:19 +02:00
Gabriele C
c208cdcf97 Fix default password regex 2017-07-15 15:36:12 +02:00
Jacek Maciejak
4f89d49744 Small fixes in Polish translation and addition of missing color in the messeages. (#1283)
I could do it before, I'll do it now. :)
2017-07-13 18:11:20 +02:00
DNx
87b9bf140d Add database setting to configure HikariCP 'maxLifetime' #1279 2017-07-12 07:21:05 +07:00
ljacqu
e1826c75c8 #1280 Add NOTHING as possible flight restore type 2017-07-10 21:45:05 +02:00
polarcn
ce2138a65c Create help_zhcn.yml (#1281) 2017-07-10 02:17:14 +02:00
ljacqu
276ce80edb #1276 Fix wrong multiplication of reset threshold 2017-07-09 14:31:17 +02:00
Gabriele C
1c4594b53d Use RESTORE_NO_ZERO as default restore walk speed behaviour 2017-07-08 23:47:40 +02:00
ljacqu
cb73160bcd Minor - simplify CodeClimateConfigTest
- No need to load the class when we just want to ensure that the file exists
2017-07-08 23:10:42 +02:00
Gabriele C
919a715ded Cleanup 2017-07-08 22:51:01 +02:00
Gabriele C
d8e7203bb0 Revert "Always revoke limbo states synchronously #1222"
This reverts commit 7bb701b126.
2017-07-08 22:45:48 +02:00
Gabriele C
fe770ac29d Revert "Fix limbo service unit test"
This reverts commit 4cbfc8a812.
2017-07-08 22:45:32 +02:00
Gabriele C
2cf1f22b13 Fix javadocs 2017-07-07 20:50:17 +02:00
Gabriele C
4cbfc8a812 Fix limbo service unit test 2017-07-07 20:41:31 +02:00
Gabriele C
cd4693eedf GeoIP: ignore local addresses 2017-07-07 20:41:10 +02:00
Gabriele C
001e5d0376 Pom cleanup, fix LimboService test dependencies
@ljacqu Could you fix the test please?
2017-07-07 15:06:02 +02:00
DNx
7bb701b126 Always revoke limbo states synchronously #1222 2017-07-07 06:06:01 +07:00
Gabriele C
4e61117ef7 Add xf table prefix to config
#957
2017-07-06 18:46:24 +02:00
Gabriele C
cd4766e0a1 Add regex support to restricted users ip addresses #1227
Seems to work: https://regex101.com/r/zSp6Ke/1
@ljacqu What do you think?
2017-07-03 01:43:56 +02:00
Gabriele C
b24dcfed3c Try to fix #1261 2017-07-02 13:21:04 +02:00
ljacqu
f150668fc1 Minor - remove unused imports
- As determined by CodeClimate
2017-07-02 11:00:17 +02:00
ljacqu
ff99b63385 #1265 Limbo: fallback to old "group" during deserialization, favor old limbo's groups over new limbo's 2017-07-02 10:55:51 +02:00
Gabriele C
c758e15cd7 Store the entire player's list of groups instead of primary group 2017-07-01 19:18:42 +02:00
Anh Craft
1fde9bf534 Create help_vn.yml
New translation
2017-06-30 02:57:53 +02:00
Anh Craft
3718b22ef9 Update messages_vn.yml
translated "to do"
2017-06-30 02:57:53 +02:00
Timofey
d17b857410 ru: update (#1267)
* ru: update

* <theCaptcha> & THE_CAPTCHA
2017-06-30 01:01:16 +02:00
Gabriele C
e6e023a032 Remove legacy jar hint 2017-06-22 23:57:04 +02:00
ljacqu
886e3b2f1e #1238 Save player after restoring data from limbo player 2017-06-18 08:36:03 +02:00
Maxetto
e05e346a32 Fix Typo (#1256) 2017-06-15 01:30:42 +02:00
ljacqu
08214aeee6 Debug limbo viewer: don't get primary group if not supported
- Reported via #1238, the primary group of a player should not be queried if the permissions plugin does not have group support
- Use the reverse order for showing player / limbo / disk limbo info
2017-06-11 15:14:32 +02:00
Twonox
ed07bdc995 Update messages_fr.yml 2017-06-03 18:59:50 +02:00
ljacqu
591d6f1d4c #1232 #1239 Show legacy hint if Guava's MoreObjects class is missing 2017-06-02 15:42:21 +02:00
timvisee
cae29a2f99 Revert "Implement ARGON2 hash (#1165)" due to an unwanted added binary.
This reverts commit bf38782790.
2017-06-01 13:06:15 +02:00
nicuch
160a0877b3 Update messages_ro.yml 2017-06-01 11:02:01 +02:00
Gabriele C
00699ed7fb Use guava 21, add 1.12 support 2017-05-29 23:40:44 +02:00
ljacqu
9385fc8f4c Fix placeholders in messages_ko 2017-05-28 21:35:15 +02:00
ljacqu
56dff703ac Korean translation by Kirito9515 (#1229)
* Korea Translation Change

* Korean Translation Change 2

* Korean Translation Final

* Help Message Korean Translation

* Korean Translation
2017-05-28 18:50:34 +02:00
Gabriele C
20e72b355b change restoreFlySpeed default value to RESTORE_NO_ZERO
Should fix issues like #1222
2017-05-21 18:51:50 +02:00
Alexandre Vanhecke
a167429fbc perf(datasource): Use try-with-resources when it's possible 2017-05-21 15:13:40 +02:00
ljacqu
5ca9112c12 Add missing properties to commands.yml on start and reload 2017-05-21 14:21:40 +02:00
ljacqu
5c6af0330e #1218 Add onLogout to commands.yml 2017-05-21 13:44:28 +02:00
ljacqu
1c46c92b4e #1146 List available converter, reference converters Wiki page in config.yml 2017-05-21 12:28:35 +02:00
Gabriele C
cff8ccd76a Implement onSessionLogin trigger for commands.yml (#1198)
* Implement onSessionLogin trigger for commands.yml

Needs test methods, @ljacqu any advice?

* Add simple onSessionLogin test
2017-05-19 19:21:05 +02:00
ljacqu
e5bfbf6304 #1023 LoginSecurity converter: fix last login conversion, extend test 2017-05-13 09:37:36 +02:00
Playhi
fd48ff884c Update messages_zhcn.yml (#1214)
I think maybe the annotations also need to be translated.
2017-05-12 19:34:53 +02:00
ljacqu
2021113732 #1023 Create LoginSecurity converter 2017-05-10 19:45:20 +02:00
Playhi
a0fbb6a78a Update messages_zhcn.yml (#1210)
Fix some translation issues.
2017-05-09 14:30:25 +02:00
Jacek Maciejak
e00138166d Small fixes, sorry. (#1206) 2017-05-07 20:27:27 +02:00
ljacqu
1f8307c8f6 Fix minor checkstyle issues
- Add JavaDoc where checkstyle expects it
- Fix line too long issues
- ...
2017-05-07 11:59:01 +02:00
ljacqu
1a48348824 Add missing tests for listeners 2017-05-07 09:43:59 +02:00
ljacqu
6ecb0ea75c Create test to verify that messages have their tags 2017-05-06 21:36:31 +02:00
Jacek Maciejak
7ddc7a7264 Update messeages_pl (#1203)
* Update messeages_pl

and small fixes

* Update messages_pl.yml
2017-05-06 14:44:22 +02:00
ljacqu
57cd2e4caf Fix placeholders in translations + update translations page 2017-05-05 21:28:38 +02:00
Rainer
954c536dbd Estonian translation of AuthmeReloaded (#1202)
* Create help_et.yml

* Create messages_et.yml
2017-05-05 18:02:59 +02:00
exys228
6226abdc4b Update messages_ru.yml (#1201)
Fixed some bad grammar and added new keys.
2017-05-05 15:40:12 +02:00
Gabriele C
5dfb63c00f #1194 Add API methods to access the GeoIpAPI 2017-05-04 16:34:38 +02:00
ljacqu
c803822fa8 #1188 Create and keep encryption method instance (#1191)
- Avoid creating the same object over and over; instead keep it and only change it on settings reload
2017-04-30 17:41:51 +02:00
ljacqu
e0e4cd112d #761 Restore permission group in sync with limbo players
- Couple AuthGroupHandler closer to the LimboService: whenever a limbo player is restored, the auth group should be restored as well. This fixes some consistency issues.
- Move AuthGroupHandler into limbo package and make it package-private
- Change permission handler to skip any empty groups (prevents odd command output e.g. for BukkitPermissions)
2017-04-29 22:37:34 +02:00
ljacqu
d4c1370da6 #923 Add commands to run on unregister 2017-04-29 19:11:13 +02:00
ljacqu
578f63b944 #923 Create /authme purgeplayer command
- Create command to purge a specific player name
- Update docs
2017-04-29 18:31:37 +02:00
ljacqu
88d839cab4 #620 Add a cancellable session restore event 2017-04-29 15:44:29 +02:00
ljacqu
b652d89088 #1169 Create UnregisterEvent 2017-04-29 15:22:27 +02:00
ljacqu
d65556d893 #857 Create event for failed authentication 2017-04-29 14:46:06 +02:00
Playhi
dbb8ea7f38 Update messages_zhcn.yml (#1186) 2017-04-29 09:31:17 +02:00
ljacqu
a75150e7bf #836 Update HU translations by @rErEaT 2017-04-29 09:28:58 +02:00
ljacqu
b7c35cb3a7 Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into explicit-getters-from-db 2017-04-29 08:19:30 +02:00
ljacqu
82d74ca0a7 Move close methods out of sql datasource utils class
As noticed by @Gnat008
- We need two different implementations for MySQL and SQLite because SQLite uses an older version where #isClosed is not implemented
2017-04-29 08:18:43 +02:00
RatchetCinemaESP
1720a4d842 Update messages_es (#1181)
Translated the new messages.
2017-04-24 14:38:07 +02:00
ljacqu
0e923b6a70 #1180 Create command for performing a backup 2017-04-23 20:23:40 +02:00
Eufranio
e75e22d624 Update brazilian messages (#1174) 2017-04-23 12:02:55 +02:00