Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,957 Commits 10 Branches 53 Tags
Commit Graph

205 Commits

Author SHA1 Message Date
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
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
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
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
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
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
72cf294056 Allow retrieval of messages with tag replacement 2016-02-22 20:32:44 +01: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
ljacqu
e8d627c0e1 #392 Start integration test for SQLite 2016-02-21 10:46:13 +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
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
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
bakatrouble
0992997483 Fix Django crypt 
(cherry picked from commit 189f916)
 2016-02-14 23:08:51 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
b0ba893827 #437 Add/change email should check if email is already used 
- Untested/incomplete implementation
 2016-01-17 20:41:19 +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