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
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
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