Commit Graph

2094 Commits

Author SHA1 Message Date
ljacqu
9ea75c502c #567 Move email validation logic to validation service 2016-04-03 20:44:13 +02:00
ljacqu
b6ccb3e632 #567 Add/change email should be aware of account threshold 2016-04-03 14:24:12 +02:00
Gabriele C
88e517635c wtf was that xD 2016-04-03 13:03:16 +02:00
ljacqu
c079692f1d Minor - code householding (tests)
- Remove redundant uses of WrapperMock
- Use assertThat() from JUnit, not hamcrest
- Use hamcrest Matchers everywhere (not BaseMatchers etc.)
- Favor Mockito's argThat() over using ArgumentCaptor (more succinct)
- Delete useless test classes
2016-04-03 07:38:13 +02:00
ljacqu
ba217a2595 Fix disable collisions setting 2016-04-03 07:26:23 +02:00
Gabriele C
c46c1251d9 fix wrong property in config.yml 2016-04-03 01:28:14 +02:00
Gabriele C
5a8ba7d462 fix wrong property in config.yml 2016-04-03 01:23:38 +02:00
ljacqu
4f86604699 Check valid password via service
- Create validation service; fixes same code being duplicated in four places
   - Goal is to remove Utils class, by moving methods to validation service or other services
 - Remove unused properties in legacy settings
2016-04-02 22:44:20 +02:00
Ivan Ip
0ff8430bf2 Fixed some typo, also updated zh_TW 2016-04-02 01:23:09 +08:00
Ivan Ip
c010a371d4 Fix placeholder and string sortings. 2016-04-02 01:11:19 +08:00
Ivan Ip
3a3ea4d228 First repairing commit to fix Chinese Lingual. 2016-04-02 01:06:21 +08:00
Gabriele C
de89244e0e #630 Disable collisions for unlogged players 2016-04-01 18:21:05 +02:00
Gabriele C
997c31a03e Cleanup warnings 2016-04-01 17:02:57 +02:00
DNx5
46a10da40f Fix test 2016-04-01 13:47:35 +07:00
DNx5
c63b9786f8 IpAddressManager should work with BungeeCord too. 2016-04-01 13:28:00 +07:00
DNx5
ff17e4ca6b Minor improvement. 2016-04-01 13:05:26 +07:00
DNx5
f7408c3e14 Improve AutoPurge feature, #627 2016-04-01 11:32:13 +07:00
DNx5
cb995a99a6 Fix Sqlite backend didn't remove old accounts. 2016-04-01 08:45:31 +07:00
DNx5
79eb0248f8 Run auto purge task asynchronously.
* prevent blocking server startup.
2016-04-01 08:33:11 +07:00
DNx
6f8b970c5c Update Log4JFilter.java 2016-03-31 20:20:11 +07:00
DNx
2c995168e3 this one, for sure. 2016-03-31 19:49:52 +07:00
DNx
b8336e31a6 Fix test. 2016-03-31 19:45:11 +07:00
DNx5
0fc15b8105 Fix removePassword option not working on KCauldron. 2016-03-31 19:16:05 +07:00
DNx5
8819f26c29 Fix #632
- Fix permissions manager is not initialized when constructing antibot instance.
2016-03-31 15:30:38 +07:00
ljacqu
95f5951587 Change message file consistency test to show all errors 2016-03-29 19:08:38 +02:00
ljacqu
55c24b8e64 Test AntiBot + SwitchAntiBotCommand 2016-03-24 22:11:40 +01:00
ljacqu
351b24fd14 Change AntiBot from static to instance
- Convert static methods in AntiBot
- Create BukkitService for operations requiring calls to static methods on the Bukkit class
2016-03-24 20:58:51 +01:00
ljacqu
20ad253926 #547 Add javadoc + unit tests for ProcessService 2016-03-21 20:06:49 +01:00
games647
bea43b3140 Fix possible race condition on login processing
(Fixes Xephi/AuthMeReloaded#619)
2016-03-21 14:40:37 +01:00
Gabriele C
2f850eed08 Disable tablist hider due to issues in 1.9 2016-03-20 13:51:23 +01:00
Gabriele C
19070c220b Blame eclipse warnings 2016-03-17 21:16:13 +01:00
ljacqu
00c8fa3b53 Minor - remove todo comment
- Difference between the tests is actually explained in the other class' javadoc
2016-03-16 21:14:31 +01:00
ljacqu
453f61233c Fix unit tests for settings by providing custom setting migration services
- Allow to provide custom plugin folder to test constructor
- #603 test all NewSetting methods
2016-03-16 20:57:41 +01:00
ljacqu
aef18a894a Move PropertyType functionality into Property class 2016-03-16 19:07:00 +01:00
ljacqu
89767b120c #603 Pass settings migration service as constructor parameter (work in progress) 2016-03-14 23:18:16 +01:00
ljacqu
4634213d75 #566 Test that all message files are valid YAML 2016-03-14 22:33:20 +01:00
ljacqu
2de3848cc3 #430 Remove PlayerAuth constructors in favor of builder
- Remove various PlayerAuth constructors
- Clean up FlatFile class
- Add some javadoc to PlayerAuth
2016-03-14 21:48:33 +01:00
ljacqu
ef980bd654 #603 Delete CustomConfiguration class 2016-03-14 20:45:46 +01:00
ljacqu
3522a5b0c0 #603 Various setting improvements
- Pass PropertyMap to settings class from the outside
- Fix tests not being reentrant due to real file writes
- Improve Node (internal tree for PropertyMap) interface
- Add code coverage for private constructors
2016-03-14 20:32:32 +01:00
ljacqu
374e2ff292 Fix Management initialization 2016-03-13 11:41:19 +01:00
ljacqu
5d12ec8b56 Minor fixes + code householding
- Fix SpawnCommandTest testing FirstSpawnCommand
- Fix javadoc errors
- Map TODO's to issue numbers where applicable
- Fix trivial TODO's
2016-03-13 11:09:27 +01:00
ljacqu
00125487f1 Create tests for admin commands 2016-03-13 10:17:09 +01:00
ljacqu
4d45b18759 Create test for PluginHooks 2016-03-12 18:25:57 +01:00
ljacqu
8293766f98 #421 Create SpawnLoader
- Non-static service class which handles the spawnpoints used in AuthMe
2016-03-12 18:25:38 +01:00
ljacqu
8b27444a49 #421 Create PluginHooks
- PluginHooks manages third-party plugins and allows to perform actions and queries on them, instead of public fields on the AuthMe main class
2016-03-12 18:24:34 +01:00
ljacqu
45fd241517 Update settings in PasswordSecurity upon reload 2016-03-12 08:16:57 +01:00
ljacqu
3d46339a78 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into fix-reload 2016-03-12 07:40:18 +01:00
Tim Vis'ee
44d50b1c59 Created it's own listener for the Permissions Manager 2016-03-11 11:41:41 +01:00
Tim Vis'ee
ae9cd626a5 Applied most PermissionsManager patches from original source 2016-03-11 11:33:37 +01:00
Tim Vis'ee
558b3fd997 Added API method to gather the plugin version 2016-03-11 11:25:21 +01:00
ljacqu
dfc713fde6 Reload only specific entities (work in progress)
- Remove attempt of reinitializing all components -> will lead to inconsistent states. Call reload on reloadable components instead
2016-03-09 18:39:04 +01:00
games647
4d55bedcaa Update Inventory protection for 1.9 (Fixes Xephi/AuthMeReloaded#587) 2016-03-09 17:06:27 +01:00
Gabriele C
d590e9ba71 Revert "Damn bossy essentials xD"
This reverts commit ab2c95869e.
2016-03-09 15:08:04 +01:00
Gabriele C
af84ba6fce Fix max email count #591 2016-03-09 15:00:17 +01:00
Gabriele C
ab2c95869e Damn bossy essentials xD
#503
2016-03-08 23:05:53 +01:00
ljacqu
654cebd5a7 Minor - rename LimboPlayer methods + code householding
- Rename *taskId methods to *task to reflect what they handle
- Remove usages of Wrapper where applicable
- Replace some uses of legacy Settings with NewSetting calls
2016-03-06 15:46:49 +01:00
ljacqu
3f4681c5ed Minor - fix merge conflicts 2016-03-06 14:45:28 +01:00
ljacqu
987c3fdb17 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 432-remove-public-ip-map 2016-03-06 14:42:32 +01:00
ljacqu
31bac6964f Various code householding
- Adjust javadoc
- Remove unused PlayerAuth constructor
- Replace legacy Settings with NewSetting calls
- Add process service to all (a)sync processes
- Change IP manager to only cache the calls to the VeryGames API
2016-03-06 14:42:19 +01:00
ljacqu
98df21d75a #575 Hotfix for reload support
- Create temporary method for reloading any stateful entities -> a lot of duplicated code, to be fixed soon within #432
- Remove unused methods
2016-03-05 22:30:35 +01:00
Gabriele C
9a5c84f3fc Revert "Use local shooter" 2016-03-05 21:33:56 +01:00
FabioZumbi12
9b13366e5f To use local shooter 2016-03-05 16:11:09 -03:00
Gabriele C
717f962473 Revert "Add a message about the workaround with MC 1.9"
This reverts commit aa914b9aa7.
2016-03-05 18:16:57 +01:00
ljacqu
9a412fac05 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 432-remove-public-ip-map
Conflicts:
	src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
2016-03-05 16:11:22 +01:00
ljacqu
19adcdcceb Move managers to the cache package
- Not entirely accurate name but not really worth to have a separate package for managers
2016-03-05 16:03:00 +01:00
ljacqu
fd8db2cd51 Add test for IP manager + create captcha manager (still unused) 2016-03-05 15:39:14 +01:00
Gabriele C
aa914b9aa7 Add a message about the workaround with MC 1.9 2016-03-05 13:55:40 +01:00
Gabriele C
c4684fd5f1 Booo we don't like UUIDS! (We need to keep 1.7.X compatibility!)
- Removed the useless OtherAccounts class!
2016-03-03 21:42:50 +01:00
Gabriele C
b0d230be60 Forgot about this... #570 2016-03-03 21:17:38 +01:00
Gabriele C
e4d2747fae Finally fix #570 2016-03-03 21:05:19 +01:00
DNx
1e0d31ebb7 Don't lowercase the real name, also..
the password. Fix #578
2016-03-03 11:11:56 +07:00
Gabriele C
681e352bdc Fix #570 add max_acc and reg_acc placeholders 2016-03-02 17:06:02 +01:00
Gabriele C
c5c0535fcd Ok, nevermind, it works. 2016-03-02 00:33:26 +01:00
ljacqu
aeb8307a46 #432 #547 Remove public IP cache map; make processes use ProcessService
- Create IP address manager for handling and caching IP addresses -> outside of the manager I do not want to care about caching details
- Make more processes use the ProcessService in favor of statically injected objects
2016-03-01 22:47:28 +01:00
Gabriele C
8bd9569c14 Disable the tablist hider due to bugs! (Invisible player, missing data resend after login...) 2016-03-01 22:19:40 +01:00
ljacqu
86042070e9 #573 Remove exclusion for permission node check in test 2016-03-01 20:48:15 +01:00
Gabriele C
8432e67fd8 1.9 API + Fix permissions (CRITICAL)
#573
2016-03-01 17:34:56 +01:00
games647
e57e457b62 Fixed VersionCommand is not using backwards compatible players method 2016-03-01 16:38:32 +01:00
ljacqu
dede592c55 #547 add process service to AsyncJoin 2016-02-28 20:03:06 +01:00
ljacqu
7dd1d52893 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 547-process-architecture
Conflicts:
	src/main/java/fr/xephi/authme/settings/Settings.java
2016-02-28 09:08:35 +01:00
ljacqu
8832c1ac0f Reduce output of resource closing tests 2016-02-28 09:05:30 +01:00
Xephi59
2a8ef88041 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2016-02-28 00:36:15 +01:00
Xephi59
e88b4eda53 Add %acc_nb tag to max_reg message - Fix #570 2016-02-28 00:36:06 +01:00
Gabriele C
c61345fd43 cleanup + fix test crypts test on windows systems 2016-02-28 00:32:25 +01:00
ljacqu
d664e7be26 #547 Create ProcessService
- Create ProcessService for common tasks within processes
- Integrate service into AsyncAddEmail
2016-02-27 23:15:31 +01:00
ljacqu
28108f00f1 #569 Update messages_de.yml by Platinteufel 2016-02-27 22:55:51 +01:00
ljacqu
63b31b0814 Create resource closing test
- Generic test for MySQL and SQLite checking that all generated (Prepared)Statement and ResultSet instances are closed afterwards
- Fix offending code for test to pass
2016-02-27 22:45:39 +01:00
ljacqu
5fce849ce7 Minor - Add datasource test, minor code householding 2016-02-27 21:11:35 +01:00
ljacqu
b916c9b2be Fix javadoc warnings + #421 add javadoc for new API 2016-02-27 16:31:58 +01:00
ljacqu
e79f325411 #443 Use correct message to ask to add email after login 2016-02-27 12:18:04 +01:00
ljacqu
1b818bd833 #457 Improve ForceFlatToSqlite conversion
- Change ForceFlatToSqlite converter to use a generic datasource destination (i.e. can be used for Flat2MySQL later)
- Add tests, including for FlatFile
- Check that user is not present in destination datasource before adding
- Persist last location from flatfile as well
2016-02-27 11:24:47 +01:00
ljacqu
27b1fa770f #392 Add datasource integration tests 2016-02-26 22:12:16 +01:00
DNx5
b4aebb685c Remove player from cache on quit. 2016-02-26 13:10:49 +07:00
DNx5
8bf6817a5f Removed unused private methods in AuthMe class. 2016-02-26 12:47:08 +07:00
DNx5
8324decfa1 Merge branch 'master' into db-improve
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
2016-02-26 12:42:32 +07:00
DNx5
1b65b285ac improve spawn location check. 2016-02-26 12:00:53 +07:00
DNx5
775e2f7039 Async refresh. 2016-02-26 11:37:47 +07:00
DNx5
8536f85361 Fix #558 2016-02-25 16:46:16 +07:00
ljacqu
69092e9a9c #392 Add datasource integration tests 2016-02-24 21:50:40 +01:00
ljacqu
95e3943be0 Datasource integration tests - fix split by newline
- Make split of SQL file aware that new lines may be \r\n
- Remove split of new lines in MySQL as it's not necessary
2016-02-24 20:38:05 +01:00
DNx5
1d1605314a Reload correctly. Fix #554 2016-02-24 22:41:09 +07:00
Xephi
f22bc4f395 Check if the connection is not null or already closed 2016-02-23 14:53:29 +01:00
DNx
13982011c7 Merge pull request #108 from AuthMe-Team/spawnloc
Spawn Location
2016-02-23 06:58:19 +07:00
ljacqu
5e16ca1490 #392 Create integration test for MySQL
- Relocate tests to AbstractDataSourceIntegrationTest to reuse tests for SQLite and MySQL
- Add H2 driver and create test class for MySQL
2016-02-22 21:52:10 +01:00
ljacqu
b6384da540 #542 Revert lastlogin column from timestamp to bigint
- While the timestamp type better represents what we store, we use timestamps internally in AuthMe and had to convert between the timestamp type to a long when communicating with a MySQL database. This ends up being inconsistent with SQLite, which does not support the storage of timestamps and an additional burden as the 0000-00-00 00:00:00 timestamp has a special meaning in MySQL we must otherwise check for before fetching values.
2016-02-22 21:04:01 +01:00
ljacqu
32159861d3 Update validation of message resources 2016-02-22 20:36:17 +01:00
ljacqu
72cf294056 Allow retrieval of messages with tag replacement 2016-02-22 20:32:44 +01:00
Edson Passos
bfc8058b03 Make "user other case" translatable
(cherry picked from commit ed5498e)
2016-02-22 20:23:30 +01:00
DNx5
5943537c26 cleanup
It's good now
2016-02-22 22:48:02 +07:00
DNx5
ed0ed2faf7 Bring back @games647 solution. 2016-02-22 22:26:10 +07:00
DNx5
3d90d478c2 remove uuid, only use player's name. 2016-02-22 22:16:14 +07:00
DNx5
4e011f437a Change message & timeout task to run synchronously. 2016-02-22 22:11:03 +07:00
DNx5
bebf1cf7d4 Clean cache on close. 2016-02-22 10:13:48 +07:00
ljacqu
e8f518711c #442 Fix email presence check being case-insensitive
- Add integration tests
- Change DataSource interface to return the number of accounts only, since that's all we require
2016-02-21 21:38:29 +01:00
ljacqu
203e954eea Minor test adjustments 2016-02-21 20:23:36 +01:00
DNx
1afe41d787 Merge pull request #107 from AuthMe-Team/reload-supp
Reload supp
2016-02-22 01:07:07 +07:00
DNx5
5e330398d3 Spawn Location 2016-02-22 01:01:05 +07:00
ljacqu
e8d627c0e1 #392 Start integration test for SQLite 2016-02-21 10:46:13 +01:00
ljacqu
dfa3921740 Close resources in MySQL (incomplete)
- Connection, (Prepared)Statement and ResultSet all should be closed. try-with-resources is the best way as it's less verbose than a finally block and it's better than putting close() calls inside the try{} as that will not be run if an exception happens beforehand
2016-02-20 23:09:48 +01:00
ljacqu
511f961d29 #534 Get default messages from the JAR's messages_en.yml
- Using new File(class.getResource(path)) apparently is the wrong approach for in-JAR files
2016-02-20 12:12:24 +01:00
DNx5
b66c4983ec Merge branch 'master' into reload-supp 2016-02-20 17:52:37 +07:00
ljacqu
8511a257ed #494 Fix conversion plaintext to SHA256
- Make sure database is set up before attempting to perform the migration
2016-02-20 11:16:25 +01:00
ljacqu
fd89915071 #517 Display welcome message for all logins 2016-02-20 08:23:02 +01:00
ljacqu
614d544edf #534 Send error if name is restricted (this time for real) 2016-02-20 07:26:58 +01:00
ljacqu
374113ff01 #534 Send error if name is restricted 2016-02-20 07:25:14 +01:00
DNx5
757f231ceb more ProtocolLib reload support. 2016-02-20 10:24:45 +07:00
DNx5
fd12efa2c0 Merge branch 'master' into cache 2016-02-20 09:48:27 +07:00
DNx5
de3fb61e60 Clear timeout & message task on remove. 2016-02-20 09:35:40 +07:00
DNx5
27642dd82c Rename DataFileCache to PlayerData 2016-02-20 09:32:08 +07:00
DNx5
2f75e03275 cache player's flying enabled state. 2016-02-20 08:56:08 +07:00
DNx5
cc29d8b628 Fix duplicate entry error, #528 2016-02-20 06:47:59 +07:00
ljacqu
90e0dc1875 Various code householding
- Remove unused API on DataSource
- Add some sensible javadoc to DataSource
- Minor code simplification
2016-02-19 23:19:38 +01:00
ljacqu
6f694cf818 #527 Persist email after changing it 2016-02-19 21:48:51 +01:00
ljacqu
964abdc0c5 Update add email tests (#527) 2016-02-19 19:26:16 +01:00
DNx5
05e79e6356 Fix email not getting updated in database #527 2016-02-19 23:26:11 +07:00
DNx5
6dfdcf103b I forget this one, Fix #507 2016-02-19 23:26:09 +07:00
Gabriele C
c11fa9f158 Merge pull request #101 from AuthMe-Team/move-convert-command
Move the converter command [WIP]
2016-02-19 16:49:11 +01:00
Gabriele C
4620ead311 Fix number of commands in test 2016-02-19 16:42:48 +01:00
DNx5
760d2a9fe6 I forget this one, Fix #507 2016-02-19 22:40:37 +07:00
Gabriele C
715622826f Fix command registration 2016-02-19 16:38:18 +01:00
DNx5
edc20debea Going back to GeoIP legacy. :) 2016-02-19 21:55:53 +07:00
DNx5
c3e3bdf3a4 Added getter for newSettings field. 2016-02-18 11:25:31 +07:00
DNx
10fedfb66d Merge pull request #105 from AuthMe-Team/geoip2 2016-02-18 10:43:52 +07:00
DNx
584fe1d67f Merge pull request #103 from AuthMe-Team/realname-update 2016-02-18 10:32:09 +07:00
DNx5
8c08bdb7f9 oops.. 2016-02-18 10:29:40 +07:00
DNx5
cc266a7bd6 Update javadoc. 2016-02-18 09:42:45 +07:00
DNx5
481cbaec2f Don't check the country if nothing defined on configuration.
- no need to enable protection to use country blacklist. #507
2016-02-18 09:34:04 +07:00
DNx5
fbdd56d9de Ignore country check for localhost.
- don't log exception to console
2016-02-18 09:15:43 +07:00
DNx5
64688c7ae6 Remove data file if older than 30 days 2016-02-16 09:30:22 +07:00
DNx5
7b8e5f8e4f GeoIP2 update 2016-02-16 08:31:47 +07:00
DNx5
7c1dd888cc Fix real name update. 2016-02-16 07:14:40 +07:00
DNx5
814bc8df4e Improve email recall task. Fix #529 2016-02-16 06:16:49 +07:00
bakatrouble
0992997483 Fix Django crypt
(cherry picked from commit 189f916)
2016-02-14 23:08:51 +01:00
ljacqu
ecc3048f52 Merge master into 'move-convert-command' 2016-02-14 22:32:12 +01:00
ljacqu
f5b5595f08 #525 Make "not owner" kick reason translatable 2016-02-14 21:46:47 +01:00
ljacqu
7f3246e416 #519 #515 #431 Tool task to update all docs; relocate to root/docs
- Move docs from src/tools to a root subfolder
- Add tag for displaying a "generated page" footer
- Create task to run all doc tasks
- Remove map builder in favor of Guava's
2016-02-14 21:43:01 +01:00
ljacqu
8c6db4a2c9 Improve logging in SendMailSSL
- for #522
2016-02-14 18:04:10 +01:00
ljacqu
2c9cb6d99a #521 #514 Update zhhk file and add TODO comments for missing messages
TODO comments added automatically by ToolTask verifyMessages
2016-02-14 17:49:58 +01:00
ljacqu
dbd896b462 Improving logging in SQLite 2016-02-14 17:49:56 +01:00
Gabriele C
15792f01e9 Fix docs 2016-02-14 17:38:13 +01:00
Gabriele C
d727def4ba Move the command 2016-02-14 17:06:52 +01:00
ljacqu
2dbcd50eea Merge pull request #100 from AuthMe-Team/415-perms-rework_NEW
#415 Move some permission nodes out of authme.player.*
2016-02-14 16:36:43 +01:00
ljacqu
d198eca1b6 #514 Messages tool adds missing messages as comments
- Add the English text as a TODO comment for all missing messages in the translations
- Add a TODO comment for missing tags
- Change the task and messages verifier to use YamlConfiguration
2016-02-14 16:31:35 +01:00
Gabriele C
c48b7c2327 Fix placeholders in zhhk 2016-02-14 14:26:44 +01:00
ljacqu
b3734f4010 #415 Move some permission nodes out of authme.player.*
- Move certain permission nodes outside of the authme.player branch
- Update classes / permissions list
- Remove wildcard node from code completely (since not used)
2016-02-14 14:15:02 +01:00
Gabriele C
048bfd2a6c Update zhhk language
Close #521
2016-02-14 13:50:21 +01:00
ljacqu
5dc1598f6e Wrap column names into class
- Load column names for data sources centrally
- Remove no longer used settings in legacy Settings
2016-02-14 13:25:16 +01:00
ljacqu
6e2528278a #477 Make updateSession() timestamp-aware; fetch timestamp safely 2016-02-14 09:51:13 +01:00
ljacqu
7b26dd25a0 Merge master into 477-lastlogin-timestamp
Conflicts:
    - Settings.java
2016-02-13 20:03:22 +01:00
Gabriele C
88ee5b5f92 Fix hide tablist 2016-02-13 13:12:19 +01:00
ljacqu
432ed4620c Fix AuthMe thinking config needs a migration
- Old, deprecated property now exists again -> stop checking for its presence as a reason for migration
- Create test for SettingsMigrationService to detect such issues in the future
2016-02-13 12:35:33 +01:00
ljacqu
fcfe26f34d Minor - fix incorrect javadoc and add unit test for Messages#reload 2016-02-12 23:38:00 +01:00
ljacqu
57da572b23 #421 Clean up events javadoc and interface
- Add proper javadoc to all events
- Use proper handling of the Eventlist in all events: each event has its own EventList and its static method, as specified by Bukkit's Event class
- Add common supertype to all AuthMe events
- Remove unused events
- Remove unused methods (setters to fields that we ignore entirely)
2016-02-12 23:31:55 +01:00
ljacqu
ea93a336c3 Minor - fix Javadoc warnings 2016-02-11 23:09:23 +01:00
ljacqu
cf52fdac1c #482 Remove English messages in translation files
- Messages now default to the one in messages_en.yml if not present in the translation file
2016-02-11 22:48:34 +01:00
ljacqu
9b1d524bdc Make SettingsMigrationService run all migrations 2016-02-11 22:21:06 +01:00
ljacqu
e04ca3c4ae #512 Fix inconsistent config names
- Harmonize configuration paths in code and in config.yml (fixes failing unit test)
- Add way to load Property objects in legacy Settings
- Create migration for delayJoinLeaveMessages to separate delayJoin..., removeJoin... and removeLeave...
2016-02-11 22:17:43 +01:00
ljacqu
39168bc818 #482 Provide better default messages and merge MessagesManager
- Return message from the JAR's messages_en.yml file instead of an unusable error for the end user
- Merge MessagesManager into Messages
2016-02-11 21:27:16 +01:00
Gabriele C
2d8a80049b Fix tests 2016-02-11 21:05:58 +01:00
Gabriele C
0afa5f0535 change join/leave messages behaviour 2016-02-11 20:53:25 +01:00
Gabriele C
131cc22248 Hide tablist feature 2016-02-11 20:36:07 +01:00
Nathan Guedes
ccc6aa55cf Update messages_br.yml 2016-02-11 00:48:21 -02:00
ljacqu
806fd4731e Update readme to refer to AuthMe-Team/AuthMeReloaded
- Updated various "build badges" to display data for the AuthMe repository of AuthMe-Team
- Move Gource video a little down
- Mention support of IPB4 in readme and config
2016-02-10 21:52:11 +01:00
ljacqu
b8e2f5fe1d Use RandomString for IPB4 implementation; minor documentation
- Improve RandomString and create new generateLowerUpper method
- Add documentation to the IPB4 class to explain why the salt is stored twice
2016-02-10 21:16:12 +01:00
games647
ee962bce11 Add missing imports -> fixes building finally 2016-02-10 18:52:34 +01:00
games647
225df4f9c9 Add missing imports -> fixes building finally 2016-02-10 18:51:15 +01:00
games647
248ea2666b Fix correct package declaration -> Fixes building 2016-02-10 18:48:04 +01:00
ljacqu
a16f6ae2d0 Add IPB4 to hash algorithm enum 2016-02-10 18:28:04 +01:00
ljacqu
cb50f7b8c4 Minor - move IPB4 to correct package 2016-02-10 18:23:30 +01:00
Gabriele C
07e5a67ad5 Merge pull request #97 from AuthMe-Team/ipb4
IPB4 Support
2016-02-09 00:14:24 +01:00
DNx5
8e38384a0d Implement the encryption method and test unit. 2016-02-09 05:58:59 +07:00
DNx5
9959c0f7d5 Cleanup BCryptService class 2016-02-09 05:04:29 +07:00
DNx5
600c70ad9f Create new class for IPB4 encryption method. 2016-02-09 04:48:12 +07:00
Gabriele C
49e6b309ab Fix test 2016-02-07 22:41:22 +01:00
Gabriele C
4d057cf05d Fix unit test 2016-02-07 18:17:11 +01:00
Gabriele C
2f2af829b0 Fix event listener priorities 2016-02-07 15:35:02 +01:00
ljacqu
db4d4a7cce #477 Change lastlogin column from bigint to timestamp (work in progress)
- Alter column type
- Create migration for MySQL
- Unrelated: move DataSource enum to its own file
2016-02-07 14:27:03 +01:00
Gabriele C
9cf7405f63 Merge pull request #96 from Maxetto/patch-1
Updating IT Language
2016-02-07 13:08:53 +01:00
games647
d3d377ca02 Do not require a password on registration if two factor is enabled 2016-02-07 11:36:02 +01:00
Maxetto
f581cd5dc6 Update messages_it.yml 2016-02-07 03:48:52 +01:00
games647
6a75184ad9 Add 2fa support 2016-02-07 00:49:18 +01:00
Gabriele C
5a256cc49d Fix captcha placeholder in messages_br.yml 2016-02-06 23:17:11 +01:00
Gabriele C
b090a2fa2b Merge pull request #91 from nathampa0909/patch-1
Updated messages_br.yml.
2016-02-06 23:13:34 +01:00
ljacqu
2cd2b48a1a #437 Email uniqueness in admin command; finalization
- Check also in admin command that email is not already used
- Misc bug fixing (logic errors, changes lost during large merge)
- Use "email" and "setemail" as main labels for /authme subcommands
2016-02-06 21:56:08 +01:00
ljacqu
b4b679d3b9 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 437-add-email
Conflicts:
	src/main/java/fr/xephi/authme/datasource/MySQL.java
	src/main/java/fr/xephi/authme/datasource/SQLite.java
	src/main/java/fr/xephi/authme/process/Management.java
	src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
2016-02-06 18:01:23 +01:00
ljacqu
92f81c32c9 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 450-new-settings-rewrite 2016-02-06 17:17:45 +01:00
ljacqu
99b7b80f1d #450 Fix copying of JAR files to plugin folder
- Create SettingsMigrationService#copyFileFromResource (inspired from CustomSettings)
- Use new method to copy missing files in plugin folder from JAR
- Create YamlFileConfiguration inside NewSetting: FileConfiguration object provided by JavaPlugin#getConfig() sets default values from the JAR's config.yml :(
- Change ConsoleLogger to take logger from plugin (work in progress)
2016-02-06 17:10:00 +01:00
Nathan Guedes
37fce732f7 Updated messages_br.yml.
I put accents and I did a new translation better than old.
2016-02-06 12:21:16 -02:00
Gabriele C
1205a86cd2 Disable "must register" message if the interval is <= 0 2016-02-06 13:52:06 +01:00
ljacqu
85868ca830 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 450-new-settings-rewrite
Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java
	src/main/java/fr/xephi/authme/settings/Settings.java
	src/main/java/fr/xephi/authme/settings/custom/NewSetting.java
2016-02-05 23:28:16 +01:00
ljacqu
a103aee4da Addendum - only write to log if specified by settings
- Commit forgotten removal of `!` during refactoring
2016-02-05 23:13:09 +01:00
ljacqu
c28a1b537f #495 Create ConsoleLogger method dedicated to logging exceptions 2016-02-05 23:11:38 +01:00
ljacqu
ab719c4204 Minor - remove messages language from old settings 2016-02-05 22:30:57 +01:00
Gabriele C
bd3761ad13 Move metrics management to another class 2016-02-05 19:34:54 +01:00
DNx5
190b4c2c2e - Removed executor service and all uses from CachedDataSource. 2016-02-06 00:53:43 +07:00
DNx5
ef89ab02b4 Cleanup imports. 2016-02-05 23:27:34 +07:00
DNx5
c9b884624d - Make cache RemovalListener sync (no longer use executor).
- Fix #433
2016-02-05 23:26:46 +07:00
DNx5
05aec0f4fe - Removed code for waiting Bukkit tasks to complete. 2016-02-05 23:18:35 +07:00
Xephi
4f76398ce8 #495 - Done 2016-02-05 13:24:38 +01:00
Gabriele C
e8a9b5c2e2 Add missing setting to the new Settings manager. 2016-02-04 23:00:41 +01:00
Gabriele C
4c265f1879 Add an option to allow unlogged users to run all the commands
Fix #456
2016-02-04 15:03:52 +01:00
ljacqu
3e30a34714 #450 Move Settings#loadEmailText and #getWelcomeMessage 2016-02-03 22:36:01 +01:00
Gabriele C
15ca8284f4 Update messages_hu.yml
Thanks to foxi69
2016-02-01 23:26:33 +01:00
ljacqu
d3c1f06efb Update Hungarian messages
- Thanks to falconhome, via issue #470
2016-01-31 21:52:03 +01:00
ljacqu
155881ef05 Merge master into '450-new-settings-rewrite'
Conflicts:
  - PerformBackup.java
  - Settings.java
2016-01-31 21:32:29 +01:00
ljacqu
42ae30ed3a #450 Move Settings#isEmailCorrect to Utils class 2016-01-31 21:22:19 +01:00
Gabriele C
b299e4be91 Fix missing setting 2016-01-31 19:08:28 +01:00
ljacqu
9653354135 #450 Move Settings#getRestrictedIp() 2016-01-31 18:50:57 +01:00
ljacqu
fbd5265a0b #450 Fix YAML export of enum values
- Move writing logic to PropertyType
- Remove unused double property type
- Add sample enum property type to tests
2016-01-31 10:49:30 +01:00
ljacqu
e747dfeb7f #450 Make reload & messages functionality use NewSetting
- Change ReloadCommand to use the new setting functionality
- Check and construct the messages file in NewSetting
- Unrelated: change MessagesManager not to extend CustomConfiguration anymore
2016-01-31 09:55:02 +01:00
ljacqu
a40b06344a Minor - remove override of equals() in PropertyMapComparator
- The Comparator map defines equals(Object) but this is obviously already implemented by the Object superclass
2016-01-30 15:32:48 +01:00
ljacqu
059175f14e #450 Port usages of Settings#set(), #setValue() to NewSettings 2016-01-30 15:12:26 +01:00
ljacqu
724296e02b #449 Migrate some properties to new settings
- Use new settings class for retrieving help header & backup configs
- Delete migrated configs from old settings
2016-01-30 13:19:05 +01:00
Gabriele C
a101ce915b Don't print warning messages if backup on start/stop is disabled. 2016-01-29 20:22:15 +01:00
games647
0b4ddce3c4 Fixes NPE on forceRegister (Fixes #473) 2016-01-28 11:43:08 +01:00
ljacqu
dedb3fce26 #450 Add integration test for potentially difficult values
- Ensure that edge cases such as backslashes, apostrophes and new lines are handled properly by the YAML writer & reader
2016-01-28 10:38:44 +01:00
ljacqu
c626521dc8 #473 Add logConsole setting
- Add missing logConsole setting
- Set true as default value, as suggested by games647
2016-01-27 21:34:10 +01:00
games647
678891d0b8 Don't schedule more tasks if the plugin is disabled
(Fixes Xephi/AuthMeReloaded#433)
2016-01-26 21:30:11 +01:00
ljacqu
ec87c662e1 #450 Use SnakeYAML for writing properties 2016-01-26 13:41:00 +01:00
DNx5
726861a2a1 Set PlayerJoinEvent listener priority to lowest. 2016-01-23 19:31:02 +07:00
Gabriele C
3c88482e22 Maven enhancements 2016-01-21 16:12:39 +01:00
ljacqu
d4e3e55e07 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 437-add-email 2016-01-19 17:16:05 +01:00
ljacqu
b432223b88 #437 Avoid LOWER() for SQLite
- Implement review comment by DNx5 - avoid use of LOWER()
- Close PreparedStatement/ResultSet in call
2016-01-19 17:15:49 +01:00
ljacqu
4012421d80 #450 Create migration service for new settings
- Create service to check if new settings is up-to-date
- Remove up-to-date checks from old Settings
- Update tests
2016-01-19 16:50:54 +01:00
games647
0aa6f753be Set utf-8 encoding for MySQL connections
Fixes Xephi/AuthMeReloaded#458
2016-01-19 14:31:29 +01:00
ljacqu
200af9c4c4 Move new configs outside of 'custom' package
- Create properties package for storing the config properties
- Move NewSetting class to main settings pkg
2016-01-19 09:20:55 +01:00
games647
dd03045bab Fix typo for delay join message configuration loading 2016-01-18 22:11:16 +01:00
games647
a3a3e94cd4 Fix logic of waiting unfinished tasks 2016-01-18 22:00:17 +01:00
Gabriele C
854e73d2ed Merge pull request #88 from AuthMe-Team/unfinishedTasks
Wait for unfinished tasks of the Bukkit scheduler
2016-01-18 21:30:12 +01:00
games647
5b2909d7d6 Wait for unfinished tasks of the Bukkit scheduler before closing
the executor service
2016-01-18 20:38:18 +01:00
ljacqu
393f1a0f36 Minor: replace self-closing tags in javadoc 2016-01-18 15:17:02 +01:00
ljacqu
07e7a8815b Fix #391 Wordpress algorithm fails sometimes 2016-01-18 14:19:04 +01:00
ljacqu
3b33dc774d #369 Fix WBB4 algorithm
- Update BCrypt implementation version
- Separate third-party BCrypt implementation from our BCRYPT EncryptionMethod extension
- Fix WBB4: ensure password is hashed with bcrypt twice and that we check accordingly
2016-01-18 13:31:54 +01:00
ljacqu
125c45d715 Minor - remove debug line 2016-01-17 20:46:19 +01:00
ljacqu
b0ba893827 #437 Add/change email should check if email is already used
- Untested/incomplete implementation
2016-01-17 20:41:19 +01:00
games647
ff034d5a44 Fix resetting of sendPlayerTo setting by removing a typo
(Fixes Xephi/AuthMeReloaded#451)
2016-01-17 19:40:55 +01:00
ljacqu
4a85eedd2c Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 347-config-rewrite
# Conflicts:
#	src/main/java/fr/xephi/authme/AuthMe.java
2016-01-17 12:35:14 +01:00
ljacqu
e18be3024a #347 Use NewSetting properties for change password command 2016-01-17 12:33:29 +01:00
ljacqu
fb6cff2e07 #347 Add remaining missing properties 2016-01-17 09:23:01 +01:00
ljacqu
ace95f750a Add more tests for async change email process 2016-01-16 07:57:43 +01:00
ljacqu
8c05c8df98 Add tests for change email process 2016-01-15 21:16:06 +01:00
ljacqu
5996d58081 #437 Create test for AddEmail task; fix bugs 2016-01-15 20:38:12 +01:00
ljacqu
391e1b04a2 Fix #440 Hash algo's sometimes skipped for old algorithm support
- Fix check that discards potentially trying all encryption methods if password didn't match
- Wrap call to encryption method properly to avoid calling methods with hasSeparateSalt() = true and a null salt
2016-01-14 21:55:09 +01:00
ljacqu
8ed8b32589 #437 Add email should not allow to change email
- Create separate test for adding email
- Check that no email is yet registered for add email
2016-01-13 22:08:40 +01:00
Xephi59
4042ced5f2 Fix #433 2016-01-10 22:32:35 +01:00
ljacqu
36a57c5f02 Fix format of messages_zhcn.yml
- Possibly broken in b8abe71?
2016-01-10 00:02:26 +01:00
ljacqu
ac164c73b9 #347 Add missing properties (incomplete) 2016-01-09 23:42:56 +01:00
ljacqu
4321d0b938 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 347-config-rewrite 2016-01-09 23:07:20 +01:00
ljacqu
4d2f39f06e #306 Add tests for CommandHandler and CommandMapper 2016-01-09 22:51:22 +01:00
Xephi
e5bd73d899 Remove Checks for #308 2016-01-09 22:12:55 +01:00
Xephi
6ac51d97f5 Remove checks - #308 2016-01-09 22:04:05 +01:00
ljacqu
fc0b7c46ac #306 Add permission manager to command service
- Inject permission manager into command service explicitly via constructor
- Change command mapper to only care about generating FoundCommandResult objects, and command handler to worry about dealing with it later on
2016-01-09 21:57:20 +01:00
Xephi
5cc5ee8cae Little fail 2016-01-09 21:39:27 +01:00
Xephi
9c4331e3e6 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2016-01-09 21:30:24 +01:00
Xephi
607380e59c Use PreparedStatement in all case needed it - #308 2016-01-09 21:30:13 +01:00
games647
663e3063d7 Use Low priority for join events in order to allow plugins
to change the delayed join message.
2016-01-09 21:15:56 +01:00
Xephi
2f1338b08b little forgot 2016-01-09 17:16:14 +01:00
Xephi
fd7bdcd3c2 Change node to authme.player.seeownaccounts #423 2016-01-09 16:21:44 +01:00
Xephi
bebea0dd36 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2016-01-09 14:46:13 +01:00
Xephi
18ed62b096 Fix #423 2016-01-09 14:45:59 +01:00
ljacqu
3845c1e0eb #347 Add NewSetting to command service
- Adjust NewSetting constructor to match needs in AuthMe
- Add NewSetting to the command service
- See CaptchaCommand for a sample replacement from Settings to NewSetting
2016-01-09 12:45:58 +01:00
ljacqu
88629702f5 #347 Test that all read properties exist as Property field
- Create consistency test to verify that all properties in config.yml are defined as a Property field in a SettingsClass implementation (currently fails)
- Add some missing properties
- Minor: convert tabs to spaces
2016-01-09 09:30:49 +01:00
DNx5
7eeabd68e7 Fix saveAuth method didn't save email. 2016-01-09 06:26:36 +07:00
DNx5
5187ce152a Enabled cachePrepStmts properties. 2016-01-09 06:19:09 +07:00
DNx5
b380893847 Serialize Xenforo hash before put it into table.
- Fix #417
2016-01-09 06:13:47 +07:00
ljacqu
0603243c86 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 347-config-rewrite 2016-01-08 23:44:16 +01:00
ljacqu
752ebe5022 Fix cast exception in integration test
- Although the class only has fields of Property type it would appear that CircleCI et al. may use libraries that add fields to classes later on, so we need to check for the field type
2016-01-08 23:40:54 +01:00
DNx5
642a40724b Used Bukkit API to format color codes. 2016-01-09 05:40:03 +07:00
ljacqu
d0b7d0ff06 #347 Create consistency and integration tests for NewSetting
- Ensure that the project's config.yml contains all settings that NewSetting is aware of
- Add extensive, more generic integration tests
2016-01-08 23:20:42 +01:00
ljacqu
69c225c850 #347 Create tests and add check for missing settings in NewSetting 2016-01-08 21:22:26 +01:00
Xephi
c8fa9a146e reduce check 2016-01-08 19:26:26 +01:00
Xephi
b8ae8d995b Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2016-01-08 19:16:06 +01:00
DNx
05ccd77d09 Merge pull request #86 from AuthMe-Team/137-xenforo-support
Xenforo support
2016-01-08 06:51:47 +07:00
ljacqu
30db03837a #347 Add 'contains' method to PropertyType 2016-01-07 21:58:28 +01:00
ljacqu
7d749801f9 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 347-config-rewrite 2016-01-07 21:51:20 +01:00
ljacqu
acda03bb40 #347 Create enum property + consistency tests 2016-01-07 21:38:03 +01:00
ljacqu
120e69ac67 Fix null pointer in tests 2016-01-07 20:49:41 +01:00
Xephi
7ec46e2940 Add strict mode 2016-01-07 09:31:32 +01:00
DNx5
fa31fd92b8 Fix #417 2016-01-07 14:14:08 +07:00
DNx5
fab13c586f Remove skip test for Xenforo hash. 2016-01-07 07:41:09 +07:00
DNx5
d6ab7d5da8 Ask player to change email if email already added. 2016-01-07 07:24:26 +07:00
DNx5
2c13783c6c Created test for XFBCRYPT. 2016-01-07 07:12:30 +07:00
DNx5
6855fb93fc Fix #416 2016-01-07 06:47:45 +07:00
DNx5
da5de58afb Rename XF class into XFBCRYPT. 2016-01-07 06:15:39 +07:00
DNx5
781a005c25 Merge remote-tracking branch 'origin/137-xenforo-support' into 137-xenforo-support
Conflicts:
	src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java
2016-01-07 05:43:49 +07:00
DNx5
e0c3affa33 Merge branch 'master' into 137-xenforo-support
Conflicts:
	src/main/java/fr/xephi/authme/datasource/CacheDataSource.java
	src/main/java/fr/xephi/authme/datasource/DataSource.java
	src/main/java/fr/xephi/authme/datasource/SQLite.java
	src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java
2016-01-06 12:15:27 +07:00
DNx5
2081fd7e34 Removed AuthMeServerStop shutdown hook.
- Players now will be kicked if AuthMe was disabled.
 - Fix #413
2016-01-06 10:24:46 +07:00
DNx5
44d35154aa Register permissions properly in "plugin.yml".
so permissions manager plugin can read what available permissions for AuthMe
2016-01-06 10:02:32 +07:00
ljacqu
204a564a9a Move new configuration packages and add test for PropertyMap 2016-01-05 21:59:08 +01:00
DNx5
fd73ce1562 Attempt to Fix permissions wildcard problem. 2016-01-05 07:21:24 +07:00
DNx5
627db6b9cf Attempt to Fix #407 2016-01-05 06:33:43 +07:00
ljacqu
5ec1b67e03 Fix #408 Player quit location is not updated
- Ensure that the cache data source updates the quit location on the actual source
2016-01-04 21:52:39 +01:00
ljacqu
cb07b3df3d Create enum property type, trivial code simplification 2016-01-04 20:33:31 +01:00
DNx5
6d7d856ebe Wait executor to complete the submitted task before shutting down
* Fix #403
2016-01-04 05:04:52 +07:00
ljacqu
7d41ccbc9c Settings: use class constants for properties, create custom writer
- Create Property class for defining config properties
  - Create logic for typed retrival of properties from YAML file
- Add custom save method
  - Retain comments from Comment annotations in the classes
  - Write in a sorted order: first discovered properties are first written to config.yml
- Adjust properties to reflect the current config.yml
- Add sample tests for the retrieval and writing of properties with the new setup
2016-01-03 15:22:32 +01:00
Xephi
c2deb9d0b5 Start rework of Settings
Please move to another branch :3
(cherry picked from commit 0c5d835)
2016-01-03 15:15:52 +01:00
DNx5
fe31b5cabb I forgot to remove the old check. 2016-01-03 09:38:30 +07:00
DNx5
774b7513c9 Attempt to update player's IP on login if they have default IP in database. 2016-01-03 09:34:46 +07:00
DNx5
4161dcaa94 Fix SingleSession check order. 2016-01-03 09:34:44 +07:00
DNx5
052e414ff3 Moved VeryGames IP check into AsyncJoin process.
- Updated VeryGames IP check method.
- Remove player's IP from realIp map on quit.
2016-01-03 09:34:41 +07:00
DNx5
4ea6cc9d69 Fix player name case check. 2016-01-03 09:34:38 +07:00
ljacqu
9533965095 Minor - update JavaDoc for HashAlgorithm
- Replace incorrect description
2016-01-02 01:09:42 +01:00
ljacqu
561e21f5e2 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 137-xenforo-support
Conflicts:
	src/main/java/fr/xephi/authme/datasource/DataSource.java
	src/main/java/fr/xephi/authme/datasource/SQLite.java
	src/main/java/fr/xephi/authme/security/crypts/BCRYPT.java
2016-01-02 00:52:08 +01:00
DNx5
6cae520604 Use Guava's Files.toString API to read the email file. 2016-01-02 06:24:44 +07:00
DNx5
266c979319 Use Bukkit API to extract "email.html" from plugin file. 2016-01-02 06:24:42 +07:00
ljacqu
071800481a Minor - fix failing build 2016-01-01 10:34:38 +01:00
ljacqu
94c836376e Revert "Start rework of Settings" from master
- Revert 1f55e85 because it's simpler to have ljacqu revert a commit on master, create a new branch and cherry-pick the reverted commit than to enter one command to change branch
2015-12-31 17:02:15 +01:00
Xephi
0c5d835f47 Start rework of Settings
Please move to another branch :3
2015-12-31 16:35:38 +01:00
Xephi
1f55e85172 Start rework of Settings 2015-12-31 16:35:08 +01:00
ljacqu
d46a2f0755 Fix test in PasswordSecurity for new savePassword() 2015-12-31 13:52:16 +01:00
ljacqu
209cc23c4b Fix markdown table in hash algorithms overview
- GitHub requires at least 3 dashes between two column separators |. Most markdown previewers don't have this restriction.
2015-12-31 13:42:41 +01:00
ljacqu
6475cecd79 Add tools task to generate an encryption algorithm overview 2015-12-31 13:33:00 +01:00
ljacqu
a0da423a7b Minor - Javadoc changes
- Add/replace/improve javadoc in the commands and encryption section
- Note: A simple <p> is the javadoc way to make a new paragraph
http://www.oracle.com/technetwork/java/javase/documentation/index-137868.html#format
- Note: Do not escape '<' and '>' inside of {@code }
- Note: '>' does not need to be escaped
2015-12-31 13:32:41 +01:00
DNx5
0c305a6287 Added new updatePassword method in DataSource class 2015-12-31 12:55:34 +07:00
DNx5
9eeb510b08 Messing up the test. 2015-12-31 12:20:48 +07:00
DNx5
bd5d341e67 Xenforo support.
- Added getPassword method in DataSource and all implementations.
2015-12-31 11:05:18 +07:00
Xephi59
e1a84448a2 Fix the whole Javadoc syntax 2015-12-31 01:06:09 +01:00
ljacqu
aed23cb1ef Revert removal of XENFORO enum, hash class and custom SQL
- Undo commits 121d323 and 1c12278
- Add TODO's with issue number
- Add slight, necessary adjustments for code changes since the reverted commits
2015-12-31 00:36:08 +01:00
ljacqu
52222d98e0 Fix #321 Message verifier should understand line breaks
- Make messages verifier understand that indented lines belong to the same message
- Revert newline to &n replacements done in f5583f4
2015-12-30 23:56:09 +01:00
ljacqu
eea3697fa4 #364 Add test for bogus hashes
- Verify that a "hash" in the wrong format doesn't throw exception (this is relevant when the supportOldPasswordHash setting is enabled)
2015-12-30 23:24:36 +01:00
ljacqu
c0a393b8b3 Minor - rename EncryptedPassword to HashedPassword
- We hash passwords; we don't encrypt them
2015-12-30 22:51:59 +01:00
ljacqu
e85dbe81e5 #358 Ensure lowercase player name, issue cleanup
- Ensure within PasswordSecurity that the player name is lowercase
- Remove check for MD5VB separate salt (we only generate hashes with the salt embedded, so either we need to change that or we don't need this check)
- Remove obsolete TODO
2015-12-30 22:45:18 +01:00
Gabriele C
300a621e1c cleanup 2015-12-30 22:28:45 +01:00
ljacqu
71f8a01179 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 358-encryptn-mthd-refactor 2015-12-30 21:37:52 +01:00
ljacqu
3328656134 #358 Create test for PasswordSecurity, create salt column if not exists
- Add test class for PasswordSecurity
- Check and create the salt column in MySQL and SQLite when necessary
- Add javadoc to some classes
2015-12-30 21:36:07 +01:00
ljacqu
8b60c66cc8 Minor - adjust PlayerAuth builder methods
- Rename hash() to password()
- Add location(Location) builder method
- Replace usages of password(new EncryptedPassword(hash, salt)) to the more terse password(String, String) builder method
2015-12-30 18:28:06 +01:00
ljacqu
a3402d573f #358 Handle hash + salt as one "unit"
- Rename HashResult to EncryptedPassword to reflect its broader use
- Use EncryptedPassword in methods that require the hash and the salt, instead of passing them as strings separately
- Store EncryptedPassword as field in PlayerAuth; updatePassword() thus processes the entire data in the EncryptedPassword object
2015-12-30 17:56:22 +01:00
ljacqu
9c4a578bec #358 Remove old methods on PasswordSecurity, unify hash + salt
- For encryption methods with a separate salt, the hash is useless without the salt, so hash and salt should always be persisted and retrieved together
2015-12-30 15:43:25 +01:00
Xephi
81a9811c9b Revert "Add a way to handle a player logout in playerquit into bungeecord"
This reverts commit a3a3907586.
2015-12-30 15:11:17 +01:00
Xephi
a3a3907586 Add a way to handle a player logout in playerquit into bungeecord 2015-12-30 14:40:19 +01:00
Xephi
bf6ef0f4a0 don't take care about message :D 2015-12-30 13:54:54 +01:00
ljacqu
ce6951bcfe Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 358-encryptn-mthd-refactor 2015-12-30 13:53:53 +01:00
Xephi
edffae3a36 Add TabComplete support through ProtocolLib 2015-12-30 13:20:24 +01:00
Xephi
ac0225c621 Revert "Start a rework of some SQL Queries, add a Query builder"
This reverts commit da1adb632e.
2015-12-30 13:14:53 +01:00
Xephi
bfbddd466a Revert "Change to QueryType"
This reverts commit f7010f1d3b.
2015-12-30 13:14:48 +01:00
Xephi
668535d93f Revert "Pass args through PreparedStatement"
This reverts commit 14e130eaee.
2015-12-30 13:14:41 +01:00
Xephi
0a2941ed4e Revert "Remove source from constructor"
This reverts commit dbacf7754d.
2015-12-30 13:14:32 +01:00
Xephi
dbacf7754d Remove source from constructor 2015-12-30 12:05:24 +01:00
Xephi
14e130eaee Pass args through PreparedStatement 2015-12-30 12:03:48 +01:00
Xephi
f7010f1d3b Change to QueryType 2015-12-30 09:59:28 +01:00
Xephi
da1adb632e Start a rework of some SQL Queries, add a Query builder 2015-12-29 17:07:33 +01:00
ljacqu
922082f312 #364 Add HashAlgorithm integration test, fix failing tests
- Create integration test for the HashAlgorithm enum
- Create AsciiRestricted annotation and make test aware of it
- Add option to skip "same hash for same salt" test (for wordpress)
- Change some EncryptionMethods to extend from a common superclass
2015-12-29 13:29:26 +01:00
ljacqu
531327dd9b Minor - make AuthMe.database private
- In favor of AuthMe.getDataSource()
2015-12-29 11:55:57 +01:00
ljacqu
571cb6d36b Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 358-encryptn-mthd-refactor 2015-12-29 10:54:09 +01:00
ljacqu
b3b751920a #358 Replace usage of static PasswordSecurity methods
- Replace static methods to instance methods
- Use PlayerAuth builder instead of constructor
2015-12-29 00:13:20 +01:00
ljacqu
1c12278c4b #369 Remove XENFORO enum entry 2015-12-28 22:39:15 +01:00
ljacqu
121d323221 #369 Delete Xenforo (XF) encryption algorithm
Rationale:
- Seems not to have been working since it was added to the codebase
- Seems not to correspond to the actual Xenforo password hashing (class does some sort of JSON extraction?)
- It would be easier to rewrite it from scratch if someone requests it later
2015-12-28 22:32:24 +01:00
ljacqu
47f4275225 #358 Update EncryptionMethod to new interface
- Add new methods to the EncryptionMethod interface
- Delete temporary interface (NewEncrMethod)
- Remove temporary checks and casts to NewEncrMethod
2015-12-28 22:00:43 +01:00
ljacqu
9b73475b9a Minor - clean up bcrypt 2y implementation
- Update Recommendation annotation
- Add proper length check to hash
- Remove check that is always true
2015-12-28 21:27:47 +01:00
ljacqu
73bc6e286a #369 Fix bcrypt 2y implementation
- Change salt length to 22: it was once changed on accident during some other commit
2015-12-28 21:03:33 +01:00
ljacqu
48d0a65724 #358 Create encryption method supertypes, add new methods 2015-12-28 20:10:45 +01:00
ljacqu
31730699ac #358 Start refactoring PasswordSecurity
- Add new methods temporarily to NewEncrMethod interface
   - No data source access within EncryptionMethod implementations
   - Generate the salt within the EncryptionMethod implementation
- Deprecate static methods on PasswordSecurity
- Adjust AbstractEncryptionMethodTest to test the classes with the new interface
- Add getter for data source instead of accessing field directly
2015-12-28 16:23:08 +01:00
Xephi
2de077e71b Fix for #386 2015-12-28 14:35:37 +01:00
Xephi
8fec53eda3 Remove todo for #368 2015-12-28 14:26:37 +01:00
ljacqu
37604e6a51 Always check for "testable" methods in listener consistency test
- Add check to overlooked test
2015-12-28 14:05:20 +01:00
ljacqu
48dce83892 Exclude all methods containing '$' in ListenerConsistencyTest 2015-12-28 13:56:54 +01:00
ljacqu
6ac1967364 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 358-encryptn-mthd-refactor 2015-12-28 13:33:18 +01:00
Xephi
c4fa2a756a Remove an old todo 2015-12-28 12:48:20 +01:00
Xephi
0688a8645a Deprecated PLAINTEXT support 2015-12-28 12:29:00 +01:00
Xephi
806201e1cc Add Hostname to restricted ip method 2015-12-28 11:59:30 +01:00
Xephi
c94b6223a1 Add wildcard to perform reset position for each players 2015-12-28 11:50:16 +01:00
Xephi
0103c5e2e5 Cannot do this async 2015-12-28 11:37:13 +01:00
ljacqu
1cabc47ff9 Minor - remove debug println from test 2015-12-27 23:40:32 +01:00
ljacqu
804a670e08 Create test for HashUtils and RandomString 2015-12-27 23:37:07 +01:00
ljacqu
513ff9a928 #358 Make RandomString static & generate all rand. strings with it
- Remove dubious random String generator on HashUtils
- Make further hash classes use HashUtils
2015-12-27 22:16:16 +01:00
ljacqu
68e5f636ae Minor: Converters - reduce visibility
- Change fields from public to private
- Make classes package-private where appropriate
- Remove redundant javadoc
2015-12-27 21:21:09 +01:00
ljacqu
25a9b6cb00 Fix #382 Add missing placeholder to message key 2015-12-27 00:08:59 +01:00
ljacqu
90a0325194 #358 Add future interface methods, remove exception throwing
- Create Utils class for a common implementation of md5/sha1
- Create "foolproof" way of getting the MessageDigest for md5 etc. (MessageDigestAlgorithm enum)
- Create description annotations to annotate algorithms with usage recommendation and salt type
2015-12-26 23:59:32 +01:00
ljacqu
2bb386c488 Merge master into 306-commands-service - Conflicts 2015-12-26 21:33:53 +01:00
ljacqu
103ebb44f0 Merge master into 306-commands-service
Conflicts:
- AuthMe
- CommandInitializer
- ConverterCommand
2015-12-26 21:33:25 +01:00
ljacqu
f37fc32717 Simplify listener classes
- Remove unused fields
- Use Service methods where possible
2015-12-26 21:26:19 +01:00
ljacqu
47e97244a7 #306 Create tests for CommandService and PlayerCommand 2015-12-26 20:58:05 +01:00
ljacqu
27fee3ca64 #306 Create PlayerCommand abstract type
- Create PlayerCommand to handle player-only command checks centrally and consistently
- Adjust tests
2015-12-26 19:47:47 +01:00
ljacqu
5ab3a1f9ef Minor - remove StringUtils#getStackTrace
- Remove StringUtils#getStackTrace in favor of Guava's Throwables#getStackTraceAsString
2015-12-26 18:01:09 +01:00
ljacqu
74ceb66430 #306 Remove singleton getters in admin commands
- Note: this commit does not remove all singleton getters
2015-12-26 17:57:53 +01:00
Xephi59
41e400e9dd Deprecate flatile datasource, force flat to sqlite conversion #344 2015-12-26 15:38:16 +01:00
ljacqu
72365bc6e4 #336 Remove new lines before base commands
- GitHub doesn't seem able to add a space before a new base command without adding random new lines in the entire list
2015-12-26 14:07:28 +01:00
Xephi59
0abfd5705c Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2015-12-26 14:05:18 +01:00
Xephi59
625369db5a Add BungeeCord playerSendTo config 2015-12-26 14:05:10 +01:00
ljacqu
e5e7e04c2b Fix #336 Create task to generate a commands page
- Fix logic for optional tags
- Fix file output format
- Add generated file to repository
2015-12-26 14:00:15 +01:00
ljacqu
37918e845c Minor - remove checks for no longer supported legacy Permissions 2015-12-26 13:06:30 +01:00
ljacqu
283bb7c113 Minor - add change lost during merge 2015-12-26 13:05:43 +01:00
ljacqu
c73969256c Merge master into '306-command-service'
Conflict:
- HelpCommand.java
2015-12-26 13:01:00 +01:00
ljacqu
71a9f4140b #375 Issue warning instead of failing test for non-ASCII password
- Add javadoc to fields
2015-12-26 12:52:05 +01:00
games647
9314612050 Also load the configuration option of forceSurvivalMode 2015-12-25 16:40:24 +01:00
ljacqu
418fbabcc8 Fix #376 Check not to show alternatives for base command
- Fix wrong assumption in HelpCommand that the incoming arguments size always corresponds to the label count of the mapped command
2015-12-24 15:47:05 +01:00
ljacqu
9e8f51c616 #306 Fully test HelpProvider and CommandSyntaxHelper 2015-12-24 15:26:25 +01:00
ljacqu
050275a0a6 #306 Fully test AccountsCommand 2015-12-24 12:19:14 +01:00
Xephi
3b33781b0b Send Email as UTF-8 2015-12-24 12:07:05 +01:00
ljacqu
cb2ffca6d3 #306 Change help provider to non-static / add calls to help functionality 2015-12-23 23:51:39 +01:00
ljacqu
9ae20df670 Minor - update setting name in config.yml 2015-12-23 22:51:11 +01:00
ljacqu
a9fc658db0 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 306-command-service 2015-12-23 18:09:21 +01:00
ljacqu
be942c2b36 #306 Fix tests for command mapper and command handler
- Export initializing and retrieval of test commands to a separate class
2015-12-23 18:04:46 +01:00
games647
0beb937b8f Re add force survival gamemode option on join 2015-12-23 16:04:49 +01:00
Gabriele C
da84efe090 Merge pull request #84 from games647/gamemode
Remove gamemode and flying switching
2015-12-23 15:42:24 +01:00
ljacqu
c50741e1ca #375 Remove Ignore annotation on password hash check test 2015-12-23 15:28:52 +01:00
games647
8c1eef3f59 Remove gamemode and flying switching
Fixes Xephi/AuthMeReloaded#355
Fixes Xephi/AuthMeReloaded#320
Fixes Xephi/AuthMeReloaded#258
Fixes Xephi/AuthMeReloaded#246
2015-12-23 15:00:44 +01:00
ljacqu
14f6ecd716 #306 Adjust ExecutableCommand implementations to interface 2015-12-23 14:55:04 +01:00
ljacqu
8ef1b2ae3e #306 Add command service and set up constructor dependency injection
(work in progress)
- Pass all dependencies via constructor
- Encapsulate command handling more (e.g. split CommandHandler with new CommandMapper)
- Add help command to all base commands at one central point

See AccountsCommand or HelpCommand for an example of the advantages - all necessary functions come from CommandService; objects aren't retrieved through a singleton getInstance() method anymore
2015-12-23 14:54:45 +01:00
Gabriele C
c231da7849 new plugin file (TODO) 2015-12-23 13:30:37 +01:00
Xephi
1ded09b5ab Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2015-12-23 12:48:12 +01:00
Xephi
57a22c101b Add changepassword to Bungee Hook 2015-12-23 12:48:00 +01:00
ljacqu
857042ba5f Minor - mark password confirmation as optional for /register 2015-12-23 12:39:48 +01:00
Gabriele C
1d21333c94 I'm a noob 2015-12-23 12:27:41 +01:00
Gabriele C
0a2f26deea Start main class cleanup 1/? 2015-12-23 12:12:00 +01:00
Gabriele C
8bfb56f34e fix blindness when timeout = 0 2015-12-23 11:51:06 +01:00
ljacqu
f785d9d357 Revert 799ecf8 and apply Ignore annotation to test failing locally
- Revert commit (undo formatting changes, commented out code)
- Add ignore to not run the test due to local problems (probably because of some character encoding issue)
2015-12-23 09:19:59 +01:00
Xephi59
799ecf8f7e Comment these test for this moment 2015-12-23 00:46:08 +01:00
Xephi59
3860b3ba5a Fix some problems with Emails 2015-12-23 00:45:43 +01:00
Xephi59
cc67d6daea Update Changepassword command 2015-12-23 00:44:03 +01:00
ljacqu
f835a95bac Verify only one listener per event; #367 verify listener not using MONITOR 2015-12-21 23:14:42 +01:00
ljacqu
fc3f503ac8 Minor - small addition to SendMailSSL refactor 2015-12-21 22:21:56 +01:00
ljacqu
02c366637e Refactor SendMailSSL, rename 'stoping' to 'stopping',
- Refactor SendMailSSL into smaller portions and with proper exception handling (do not catch the Exception superclass and do not nest try-catch blocks; always pass on the exception type and message)
- Clean prose in config.yml
2015-12-21 22:14:40 +01:00
Gabriele C
874d7cd59f Fix remove speed 2015-12-21 20:20:35 +01:00
Xephi
20b1f08c46 Remove stacktrace, use getMessage instead 2015-12-21 17:10:28 +01:00
Xephi
3601eab591 Try using email.send() :/ 2015-12-21 17:08:12 +01:00
Xephi
644ffe954d [DEV] [NEED TEST] Implement OAuth2 authentification to mail recovery! 2015-12-21 17:03:12 +01:00
Xephi
48b845b1f5 Change how welcome message is send 2015-12-21 15:52:58 +01:00
Xephi
37eedfde62 Add a way to convert SQLite to MySQL (/converter sqlitetosql) 2015-12-21 15:43:36 +01:00
Xephi
8f09893337 Cannot use '%'char, replace with tag instead 2015-12-21 15:19:10 +01:00
Xephi
61735b4941 Add switch between SSL and StartTLS security on email 2015-12-21 15:15:02 +01:00
Xephi
5d21d1bb87 Add timeout to Verygames call 2015-12-21 13:27:46 +01:00
Xephi
a5956555a5 Little fix (prev commit) 2015-12-21 13:13:03 +01:00
Xephi
705cc7ba8d Fix Verygames Ipclean issue 2015-12-21 13:06:25 +01:00
Xephi
00bf25794a Oops >.> 2015-12-21 12:06:49 +01:00
Xephi
e272a3bfb5 Add a way to kick players before a server stop 2015-12-21 12:04:28 +01:00
Xephi
5c2547cd82 Change from Monitor to Highest, why the hell was them on monitor :O 2015-12-21 11:38:52 +01:00
ljacqu
1f11537b85 #364 Add more tests for encryption algorithms
- Rename getHash() to computeHash(): get.. suggests it's just retrieving some field but it's really doing a computation, which is quite complex depending on the hash algorithm
2015-12-20 23:43:54 +01:00
ljacqu
f809d91c45 Minor refactoring in listeners; create listener consistency test
- Export duplicated code into a service
- Remove canConnect attribute from AuthMe class - was unused and doesn't seem sensible
- Add consistency test for listener classes
2015-12-20 20:26:01 +01:00
ljacqu
51d1705b1f #364 Add tests for more encryption algorithms 2015-12-20 14:08:43 +01:00
Gabriele C
acfc4dba3e Forgot this 2015-12-20 13:26:38 +01:00
Gabriele C
e9a2c8ad18 Finish permissions cleanup 2015-12-20 13:25:32 +01:00
ljacqu
bf7a0c5a49 #364 Create first EncryptionMethod tests 2015-12-20 00:51:15 +01:00
ljacqu
efa458cae1 Finalization for #305 - command refactor 2015-12-19 20:25:12 +01:00
ljacqu
3cc35baa5e Merge master into commands-refactor 2015-12-19 18:26:40 +01:00
ljacqu
b64b6177fa Fix invoking help command throwing exception
- ConcurrentModificationException was being thrown because labels was being modified again in transformForHelpCommand
2015-12-19 17:45:58 +01:00
ljacqu
a928a4092d #305 Fix label handling, add extensive tests for command handler 2015-12-19 16:27:00 +01:00
ljacqu
42c34c56a0 Fix command formatting after refactor
- Fix spacing issues (too few or too many spaces)
- Handle base commands with invalid arguments properly
- Add highlighting function for command syntax
2015-12-19 12:20:52 +01:00
ljacqu
bf9724dd34 Fix label handling issues after reformatting
- Pass the correct arguments to HelpCommand
- Fix minor formatting / conditional check issues
2015-12-19 10:35:02 +01:00
ljacqu
268cc03321 Minor - update AuthMe version in tools setvars.bat 2015-12-19 09:53:53 +01:00
ljacqu
7b2be4ca47 Remove redundant JavaDoc in security package
- Remove all JavaDoc in security package that has no additional information than in the code
- Reduce visibility of class members where appropriate
2015-12-19 09:53:52 +01:00
ljacqu
01a294a334 #305 Adjust behavior of label handling; cleanup
- Fix bugs in behavior (wrong labels being shown for help)
- Change order of labels and arguments in FoundCommandResult constructors
- Move FoundResultStatus enum to its own class
- Create test class for HelpProvider
2015-12-18 22:19:26 +01:00
games647
feac0c6c49 Properly restore walk and flight speed (Fixes Xephi/AuthMeReloaded#356) 2015-12-18 18:27:42 +01:00
Gabriele C
7614b263b0 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded 2015-12-18 17:11:33 +01:00
Gabriele C
7e6abf0441 Clean permission/group providers 2015-12-18 17:10:57 +01:00
ljacqu
d871939793 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor
Conflicts:
	src/main/java/fr/xephi/authme/command/CommandUtils.java
	src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
2015-12-17 22:32:26 +01:00
ljacqu
cbf0996197 Logic for FoundCommandResult.Status / Add tests for CommandHandler
- Fix other tests
- Add logic for smaller pending FIXME's
2015-12-17 22:23:43 +01:00
Gabriele C
f195054303 Should fix the /register auto-login feature 2015-12-16 23:58:21 +01:00
ljacqu
879aa24a6e Minor - fix spelling in messages return to the player 2015-12-16 22:48:06 +01:00
ljacqu
dcc365c22f Fix #349 Create method on Messages to pass tag replacements
- Add tests
- Fix placeholder in some files
2015-12-16 20:46:40 +01:00
Gabriele C
558a1240a6 whoops 2015-12-16 13:30:34 +01:00
ljacqu
94356bb23f #349 Add tags field to MessageKey, add test to verify presence in files 2015-12-15 13:21:53 +01:00
ljacqu
3de7a7584e Merge prefix tests for AdminPermission and PlayerPermission 2015-12-15 09:00:41 +01:00
ljacqu
bfebf6dc44 Add tests for CommandUtils, move purgeDirectory to its only use 2015-12-14 21:37:20 +01:00
ljacqu
282f777311 #336 Create command list generator in tools
- Add new conditional template tags [...] blabla [/...]
- Create logic for generating a list of commands
2015-12-14 21:07:03 +01:00
ljacqu
0fdc8d2810 Fix #338 Create test to verify consistent argument count 2015-12-14 16:24:09 +01:00
Alexandre Vanhecke
1c68f596bd Update messages_hu.yml 2015-12-14 12:06:31 +01:00
DNx5
7383242599 Attempt to fix #339 2015-12-13 23:07:58 +07:00
ljacqu
3e928cddf0 CommandInitializer - consistent indent and setter order 2015-12-13 10:49:15 +01:00
ljacqu
c48c56f08c Change to new HelpProvider, adjust classes to new methods 2015-12-13 10:12:54 +01:00
ljacqu
01cba2a508 #315 #305 Refactor HelpProvider - add bit flags, reduce duplication (wip) 2015-12-12 22:50:07 +01:00
ljacqu
d26cbfbd14 Use Guava for CommandDescription builder validation 2015-12-12 22:28:05 +01:00
DNx5
21c136fbdf Lost my changes. 2015-12-12 21:04:57 +07:00
ljacqu
4d8d9de733 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor
Conflicts:
	src/main/java/fr/xephi/authme/command/executable/authme/AccountsCommand.java
	src/main/java/fr/xephi/authme/command/executable/authme/ResetNameCommand.java
	src/main/java/fr/xephi/authme/command/executable/authme/SetEmailCommand.java
2015-12-12 14:25:01 +01:00
DNx5
2fc55c5e7f Added player's real name check. Prevent login with other name case. 2015-12-12 20:17:03 +07:00
DNx5
973bfd2590 Added cache removal listener.
* Re-add auth object if player is still authenticated
2015-12-12 20:16:59 +07:00
DNx5
efcdca4087 Use Guava cache for caching PlayerAuth object. 2015-12-12 20:16:56 +07:00
ljacqu
d5b2058124 Change ExecutableCommand interface (wip – doesn't compile)
- Change interface to use (CommandSender, List<String> arguments)
- Use CommandArgumentDescription#name instead of "label" (to prevent confusion between command labels and arguments)
- Simplify command difference computation in CommandHandler (no longer consider argument difference)
2015-12-12 12:48:39 +01:00
ljacqu
2f3738aa9a Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor 2015-12-12 11:59:19 +01:00
ljacqu
169e38be59 Fix HelpPrinter printing the enum name instead of the permission node 2015-12-12 11:58:16 +01:00
ljacqu
eecad80748 Change ExecutableCommand interface (wip – doesn't compile)
- Change interface to use (CommandSender, List<String> arguments)
- Use CommandArgumentDescription#name instead of "label" (to prevent confusion between command labels and arguments)
- Simplify command difference computation in CommandHandler (no longer consider argument difference)
2015-12-12 11:39:19 +01:00
ljacqu
1e2a0f98ba Tools: pass Scanner to tasks and revert options management
- Remove TaskOption and central logic for processing options. It is not flexible and clear enough without investing a lot of effort. Fix is easy - just pass the scanner and let the task do what it needs to do.
2015-12-12 10:37:08 +01:00
ljacqu
0efb419149 Minor - add JavaDoc to tools classes 2015-12-12 10:24:04 +01:00
ljacqu
23d6801baa Run tool tasks from one entry point
- Create scanner which scans for existing tasks
- Unify options management (mostly because multiple Scanner's are a bad idea)
2015-12-12 10:09:38 +01:00
ljacqu
2f153fb85c #305 Modularize logic / separate from data classes (wip – doesn't compile)
- Remove permission logic on command side; make PermissionsManager handle checks for all CommandSender objects (not only Player), cf. #314
- Remove unnecessary redundancies in passed arguments ("command references" that can be inferred from the FoundResult)
- Extend FoundCommandResult to represent all possible error cases
2015-12-12 00:43:55 +01:00
ljacqu
ec9009d776 Separate command handler into smaller parts (wip – doesn't compile)
- Move logic from CommandMapper to CommandHandler
- Create "ResultStatus" on FoundCommandResult to precisely return the error case
Naming and structure not final
2015-12-11 23:16:13 +01:00
ljacqu
550eecebdc Add command similarity check to mapper (work in progress) 2015-12-11 22:08:36 +01:00
ljacqu
56c005587c Create basic outline of command mapper 2015-12-11 20:33:09 +01:00
DNx5
a14e3260dc Merge branch 'db-improve'
Conflicts:
	src/main/java/fr/xephi/authme/settings/Settings.java
2015-12-11 21:47:19 +07:00
DNx5
cd1c861b47 Bungee message update, whatever. 2015-12-11 12:16:29 +07:00
Gabriele C
1ecee76b60 clean imports 2015-12-10 20:53:46 +01:00
Xephi
50c18c4093 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2015-12-10 20:45:53 +01:00
Xephi
dff4e6d135 Use ByteStreams from Guava 2015-12-10 20:45:46 +01:00
ljacqu
52b61b10f6 Tools: Remove I/O without user confirmation, minor refactoring
- Permissions: Do not write to generated file without explicit consent by user (default behavior of runners should be _not_ to do any I/O)
- Fix wrong check in messages; minor output adjustment
- Remove hacky check to see if last char of a file is a new line
2015-12-10 20:24:20 +01:00
ljacqu
3253b43a63 Merge branch 'messages-verifier' of https://github.com/AuthMe-Team/AuthMeReloaded 2015-12-10 19:53:23 +01:00
ljacqu
37d769a3ce Add missing keys to messages file 2015-12-10 19:51:29 +01:00
ljacqu
f5583f4435 Manual messages fixes; refine messages verifier
- Add messages with new line to same line with &n
- Add German translation for missing key
- Adjust messages filename pattern to include Chinese files (with 4-letter codes)
- Change verifier to only output errors (more "to-the-point" output)
2015-12-10 19:42:19 +01:00
ljacqu
c50c9efe83 Refine messages file verifier
- Fix minor open issues
- Add documentation
- Rename to [hopefully] more suitable names
2015-12-10 19:31:56 +01:00
ljacqu
186ef965ca Message files verifier - refactoring
- Separate logic from output (still potential for improvement)
- Prompt user for options (single file mode / write missing keys or not)
2015-12-10 19:18:05 +01:00
Xephi
12de593ec4 Add an info in console when player login from other server 2015-12-10 18:48:22 +01:00
Xephi
75084e62ec [PREV COMMIT] If we set a custom channel, maybe listen at it :') 2015-12-10 18:36:31 +01:00
Xephi
3975e65655 [DEV] [BungeeCord] Fix reading data 2015-12-10 18:34:50 +01:00
Xephi
1ce4a11147 [PREV COMMIT] Oops, it's logout here :D 2015-12-10 18:32:41 +01:00
Xephi
d01713a2f5 [DEV] [NEED TEST] BungeeCord
Add a way to send player login on other AuthMe instance through
BungeeCord plugin channel
2015-12-10 18:31:46 +01:00
ljacqu
5b92b30a96 Revert sorting of messages
- Comments in the files were out of order and then removed manually. Sorting will therefore be done in a comment-friendly way in Java
2015-12-10 18:15:46 +01:00
ljacqu
935e9892c4 Tools - Create message files verifier (work in progress)
- Create utility to test the message files for any unknown or missing message keys
2015-12-10 18:11:31 +01:00
Gabriele C
9c86fbd8bf cleanup listener class 2015-12-10 15:44:24 +01:00
Xephi
e99161f3ac Add Shell script to sort file content 2015-12-09 16:43:27 +01:00
Xephi
30f4a00e3b One left 2015-12-09 14:54:05 +01:00
Xephi
7d7cf0909f Fix latest commit 2015-12-09 14:53:24 +01:00
Xephi
c3d724ebce Sort messages.yml file 2015-12-09 11:35:29 +01:00
Xephi
49da659d93 Add SH Helpers tools 2015-12-09 11:15:09 +01:00
Xephi
dcd06760ce Display a message on bad email.html 2015-12-09 10:38:41 +01:00
ljacqu
6a503772e2 Close Scanner in tools/permissions; make use of more generic services
- Close scanner for all cases
- Replace read from file with the one from the File service
- Rename file service class to FileUtils to better reflect its purpose
2015-12-08 22:08:22 +01:00
ljacqu
0710c4f531 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor 2015-12-08 21:58:35 +01:00
ljacqu
595879b95e #307 Finish changes to incomplete solution (f40d75e)
- Remove deprecated builder
- Fix introduced typos
2015-12-08 21:51:33 +01:00
Gabriele C
e4fbe4ec53 Fix npc issues (#320)
This will fix 1 bug..... and will generate new ones! :P
2015-12-08 20:52:45 +01:00
Gabriele C
6ee07160bb cleanup and update deps 2015-12-08 20:07:10 +01:00
DNx5
6f040fe8ac Added permission check for vip login. Fix #323 2015-12-07 19:59:26 +07:00
Xephi
a212a0c0fd Fix Captcha count 2015-12-06 11:08:33 +01:00
Xephi
9236c1fb12 Fix Build, my bad, sorry 2015-12-06 05:30:28 +01:00
Gabriele C
06b7ad88d5 console mode during mvn build 2015-12-06 01:44:48 +01:00
ljacqu
d059d4f00d Fix possible NPE - permissions in CommandDescriptions can be null
- Fix missed null situation during previous code changes
2015-12-06 01:13:12 +01:00
ljacqu
22ad305506 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor 2015-12-06 00:52:34 +01:00
ljacqu
d5a1af0380 Add bat helpers to tools 2015-12-06 00:40:11 +01:00
DNx5
7ba54123db Update PlayerAuth builder class. 2015-12-06 06:14:30 +07:00
DNx5
c196f45854 Change getAccountsRegistered method to use normal Statement.
- Log the stacktrace if something weird happens.
2015-12-06 06:12:45 +07:00
DNx5
1f001f2225 Removed max mysql connections options from config. 2015-12-06 06:10:16 +07:00
DNx5
45c6bf0a78 Removed DatabaseCalls class.
* this class only contains wrapper of selected datasource type which every method included a code to run the task inside a new Thread. But this class doesn't help improving performance, because it's still running the task synchronously.
2015-12-06 06:08:52 +07:00
ljacqu
af9078c24b Merge branch 'allow-global-perms' of https://github.com/AuthMe-Team/AuthMeReloaded 2015-12-05 23:56:54 +01:00
ljacqu
d3edbbcb49 #285 #319 Add support for wildcard permissions
- Fix accidental recursive call
2015-12-05 23:55:58 +01:00
ljacqu
63a7cd00df #285 #319 Add support for wildcard permissions
- Add wildcard attribute to permission nodes that are checked additionally in the permissions manager
2015-12-05 23:33:09 +01:00
ljacqu
f99bba4b5f #314 Encapsulate permissions package better
- Move permissions responsibilities from command to permissions (remove some logic from CommandPermissions, add DefaultPermission enum to permissions package)

- Start possible interface for the future per-permission system implementations of permissions managers
2015-12-05 23:05:42 +01:00
Xephi
1e5a29a502 Add a case checker option 2015-12-05 22:27:23 +01:00
Xephi
f40d75e4aa Finish change to CommandBuilder 2015-12-05 22:17:49 +01:00
ljacqu
f1c3eed069 Update permissions page 2015-12-05 21:19:20 +01:00
ljacqu
8cde4a1896 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into tools 2015-12-05 21:17:44 +01:00
ljacqu
40a83d4366 Revert permission nodes from "authme.command" back to simple "authme" 2015-12-05 21:17:16 +01:00
ljacqu
90a04e477a Remove ALL perm node from command initializer; JavaDoc householding 2015-12-05 21:10:09 +01:00
ljacqu
7c36f087fc Fix failing test
Detailed description of a command must end in '.'
2015-12-05 21:04:14 +01:00
ljacqu
4d082388a5 Create tag template / auto-generate page for all permissions incl. description 2015-12-05 20:53:44 +01:00
Xephi
8460725c83 Part of CommandBuilder rework 1/? 2015-12-05 19:16:16 +01:00
Xephi
1db24adb5d Add a wildcard command permission 2015-12-05 19:00:44 +01:00
ljacqu
c91fb46951 Include the JavaDoc description for permission node enums 2015-12-05 15:26:50 +01:00
ljacqu
e81bcf9bf7 Create GeneratedFileWriter and basic permission nodes list creater 2015-12-05 14:13:20 +01:00
ljacqu
a8b3fe2648 RegisterAdminCommand - fix wrong message key 2015-12-05 12:08:09 +01:00
ljacqu
61875f26fa #305 Prepare to remove CommandParts - replace getCount() to List#size()
- Preparations to remove the CommandParts as it's a "decorated list".
2015-12-05 12:06:44 +01:00
ljacqu
9d39fc1127 Undo wrong renaming of test class falsely including 'Admin' 2015-12-05 10:55:05 +01:00
ljacqu
b419c72271 Fix #316 Ordinary player can use /authme unregister
- Change wrong player permissions to admin permissions
- Rename command class names that were the same for the ordinary vs. admin task
- Create test to ensure that commands with OP_ONLY default require an admin permission node
2015-12-05 10:48:42 +01:00
ljacqu
44aa91dfff Remove unnecessary constructor in CommandDescription
- Remove one of two unnecessary constructors in CommandDescription (in favor of the builder)
- Remove TODO about unlimited arguments (not currently a priority, will create a story instead of leaving a dangling TODO for ages in the code)
2015-12-05 00:10:45 +01:00
ljacqu
8eb1b38d21 Slim down CommandParts API
- Remove all methods that aren't constructors / fancy get() on list; almost possible to remove class entirely
2015-12-04 23:47:48 +01:00
ljacqu
2faad44ffa Move most API of CommandParts to util classes
Gradual transition to removing CommandParts altogether.
 - Move logic from CommandParts to utils classes
2015-12-04 23:19:37 +01:00
ljacqu
bb93c7164a Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into command-perms-refactor 2015-12-04 22:00:44 +01:00
ljacqu
9140ebe602 Change initialized command descriptions to Set
- Set is more efficient if it's frequently used for `contains()`, which is what we use it for after initialization
2015-12-04 21:58:16 +01:00
DNx5
fda7822644 Merge please 2015-12-05 03:45:52 +07:00
ljacqu
c78e12de04 Refactorings - prepare to remove FoundCommandResult
- Reduce tight coupling by passing list of available commands as param to CommandHandler
- Split command processing method into several smaller ones
- Remove unfinished logic for unlimited command arguments (reason: was not implemented and not used, probably needs another way to handle it once the need for it arises)
- Create test for CommandHandler
2015-12-04 21:33:50 +01:00
DNx5
93484a3449 Merge remote-tracking branch 'origin/master' into authme-process
Conflicts:
	src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java
	src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
	src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
	src/main/java/fr/xephi/authme/settings/Settings.java
2015-12-05 03:23:50 +07:00
ljacqu
0c1589f93a Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into command-perms-refactor 2015-12-04 19:35:57 +01:00
Xephi
e781115d7c Change from mailText to a dedicated file email.html 2015-12-04 17:57:10 +01:00
Xephi
8336dc848e Fix #301 2015-12-04 17:24:56 +01:00
Xephi
0d1cf8c7e2 Idk how it can be null, but well ... 2015-12-04 17:17:35 +01:00
Gabriele C
a1f963adf8 update hikari 2015-12-04 13:23:17 +01:00
ljacqu
152a0cabb5 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into command-perms-refactor
Conflicts:
	src/main/java/fr/xephi/authme/command/CommandInitializer.java
2015-12-03 22:16:52 +01:00
ljacqu
1fbe4e0c3b #298 Change password shows wrong 'pw cant be username' error
- Change MessageKey to the proper message
- Change permissions for admin changepassword to admin
- Rename player changepassword command arguments to reflect their actual meaning
2015-12-03 22:07:18 +01:00
ljacqu
1ca6bcffe1 Make AuthMe.management private; create test for CaptchaCommand 2015-12-02 22:13:43 +01:00
ljacqu
f698c9241b Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into command-perms-refactor
Conflicts:
	src/main/java/fr/xephi/authme/output/Log4JFilter.java
2015-12-02 21:56:53 +01:00
ljacqu
cafad5b088 Fix #296 Reloading doesn't update settings
- Replace Settings to encapsulate a YamlConfiguration instance provided by AuthMe, rather than loading the config file again.
2015-12-02 21:42:39 +01:00
Xephi
a18ea851be Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded.git 2015-12-02 16:34:43 +01:00
Xephi
41b6b4184e Remove StackTrace for production 2015-12-02 16:34:28 +01:00
Gabriele C
42416c4bdc Update config.yml 2015-12-02 16:28:00 +01:00
DNx5
ee3fe45d7f Fix unclosed Statement object. 2015-12-02 06:36:41 +07:00
DNx5
35d73b2d4a Mysql Improvements.
* Contains lot of changes
2015-12-02 06:29:43 +07:00
DNx5
a8f3a441d5 Lowercase PlayerAuth nickname in constructor and setter. 2015-12-02 04:53:12 +07:00
DNx5
69361de262 Merge remote-tracking branch 'origin/db-improve' into db-improve 2015-12-02 04:48:30 +07:00
ljacqu
923020bf07 Reduce duplication in Log filter implementations 2015-12-01 22:17:18 +01:00
DNx5
8d9e212b15 Improve register process.
* Removed double check for email settings
* Use builder for PlayerAuth
* Handle exceptions in process method
2015-12-02 04:14:18 +07:00
DNx5
3d8e63699d Merge branch 'db-improve' into authme-process 2015-12-02 04:11:21 +07:00
DNx5
e02af46d65 Lowercase the name input. 2015-12-02 04:10:56 +07:00
ljacqu
c288d3285e Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into command-perms-refactor 2015-12-01 21:59:19 +01:00
ljacqu
b0e619d412 Refine JavaDoc and move Log filters to 'output' 2015-12-01 21:53:18 +01:00
ljacqu
690a8d67a3 Abstract Messages into two layers; move to new 'output' package
- Abstract Messages into two layers: the top layer 'Messages' is how Messages can be retrieved and sent as before. In the background, package-private, MessagesManager actually does the file read and worries about I/O while Messages takes care of higher-level things (such as joining two lines or checking the current language).
2015-12-01 21:45:02 +01:00
DNx5
7ec79afe4a Set speed into 0.0 2015-12-02 03:22:27 +07:00
ljacqu
54d8ede5bc Add changes missed during merge 2015-12-01 20:44:44 +01:00
ljacqu
c4df2589b7 Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into command-perms-refactor
Conflicts:
	src/main/java/fr/xephi/authme/command/CommandDescription.java
	src/main/java/fr/xephi/authme/command/CommandInitializer.java
2015-12-01 20:43:49 +01:00
Tim Visée
2550e04112 Fixed player permission tests, improved test structure consistency 2015-12-01 16:44:49 +01:00
Tim Visée
7ac39d80fd Fixed admin permission tests 2015-12-01 16:40:00 +01:00
Tim Visée
ccb9e24ce5 Fixed invalid permission reference. 2015-12-01 16:35:28 +01:00
Tim Visée
a0ed554514 Moved permission from player to admin space 2015-12-01 16:34:54 +01:00
Tim Visée
3d0bf674bd Added JavaDocs to PlayerPermission class, fixed various permission nodes 2015-12-01 16:34:22 +01:00
Tim Visée
42cebacd60 Added JavaDocs to AdminPermission class 2015-12-01 16:29:47 +01:00