Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-12-04 16:13:30 +01:00
Code Issues Projects Releases Wiki Activity
2,040 Commits 47 Branches 8 Tags 102 MiB
79eb0248f8
Commit Graph

1460 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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