Commit Graph

241 Commits

Author SHA1 Message Date
Jamal Kaabi-Mofrad
de94938b0d Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
135804 jkaabimofrad: APPSREPO-35, APPSREPO-118: Added tests for reset password service and REST API.
       - Added a utility class (EmailUtil) to work with MailActionExecutor in test mode
       - Added a new workflow task responsible for sending the reset password confirmation email (per peer review)
       - Changed the reset-password endpoint to return a 202 response for an inactive workflow or invalid workflow id, key or mismatched user
       - Some other minor changes as the result of adding tests
       - Also, fixed tests failures by changing the reset password workflow definition target namespace URI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-16 19:39:31 +00:00
Jamal Kaabi-Mofrad
b96832b0fd Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)
135590 jkaabimofrad: APPSREPO-35: Added password reset V1 API.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-03-16 19:39:24 +00:00
Alex Mukha
88f99d6e9a Merged DEV to 5.2.N (5.2.1)
133903 sglover: MNT-17247 "Disabled user can log into Alfresco Share using external authentication" take user disabled status in to account for external authentication subsystem + tests
   133907 sglover: MNT-17247 "Disabled user can log into Alfresco Share using external authentication" don't propagate user disabled exception
   133930 sglover: MNT-17247 "Disabled user can log into Alfresco Share using external authentication" move test class and add to a test suite
   134295 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
      - Added a test to simulate creation of missing person during external auth log in.
   134315 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
      - Added a fallback to supprt the logging in by non provisioned users.
   134354 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
      - Added a test with deauthorized user. Refactored existing test to start context once.
   134359 jvonka: REPO-1227: External authentication - prevent disabled user from authenticating
      - add log warning (with masked username, similar to brute force attack) if authentication bypassed when setting user details
   134372 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
      - Updated core and data model (contain new logging)
   134390 amukha: MNT-17247: Disabled user can log into Alfresco Share using external authentication
      - isEnabled flag for users is returned correctly
      - Added tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134396 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2017-01-17 13:57:05 +00:00
Alex Mukha
5a2abbd721 REPO-1687: ACE-5662: The AuthenticationServiceImpl.ProtectedUser is not suitable for clustered cache
- Added additional check to avoid problems with very small usernames.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133443 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-07 16:37:35 +00:00
Alex Mukha
16e7095d93 REPO-1687: ACE-5662: The AuthenticationServiceImpl.ProtectedUser is not suitable for clustered cache
- Changed the implementation to use Serializable objects in cache.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-12-06 20:23:04 +00:00
Alex Mukha
2cce1b76d5 REPO-1489: Slowdown of brute force attack on passwords
- Added a fix to when the Warn is shown (next login after protection is enabled)
   - extended tests to cover protection enabled flag.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133276 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-29 13:02:59 +00:00
Alex Mukha
75286950f1 REPO-1489: Slowdown of brute force attack on passwords
- Added the implementation based on REPO-1539.
   - Added JUnit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133149 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-25 21:20:31 +00:00
Martin Muller
88818dca9a Fixed some javadoc errors. REPO-466
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@128510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-07-01 08:34:26 +00:00
Andreea Dragoi
17f25f685c Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125832 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125670 abalmus: MNT-16188 : [Kerberos] Users Search doesn't work
         MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
            - Fixed NPE in AuthenticationServiceImpl.getAuthenticationEnabled (I guess sometimes the PersonService bean is not injected)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-27 12:28:45 +00:00
Raluca Munteanu
9b22c4303f Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125621 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      125577 abalmus: MNT-15038 : Unexpected behavior when disabling Active Directory user (New feature to sync userAccountControl)
         - Implemented new requirements and tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 14:18:45 +00:00
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
dc6b2852d0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Alan Davis
99bc1f16ac Merged 5.1.N (5.1.1) to HEAD (5.1)
117930 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      117707 aleahu: MNT-14341 : FTP authentication fails when External authentication is enabled
         - Checked that the instance of the authenticator used is not the same as the one from which the call is made


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:27:10 +00:00
Alex Mukha
e33ac7c249 Merged AMUKHA/PLAT-HEAD-2016-01-11 (5.1) to HEAD (5.1)
120772 amukha: ACE-4909: [Win 10, Chrome] - Site Members: Searching users with two chars results in wrapped exception
      - Added a check if the tenant is disabled;
      - Added JUnit test for disabled tenant and for deleted tenant.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-12 15:52:52 +00:00
Jean-Pierre Huynh
76dfb467ff Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119073 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117356 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117263 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114898 gjames: BCRYPT MNT-14892 RA-609, better logging messages and added OnStartup validation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:01:39 +00:00
Jean-Pierre Huynh
1d9ad4fcac Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119071 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117354 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117261 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114795 gjames: BCRYPT RA-609: Ensure system does not double hash encoders if not safe


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119910 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:01:25 +00:00
Jean-Pierre Huynh
9b124acb5b Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119070 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117353 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117260 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114674 gjames: BCRYPT MNT-14892 RA-604, Handling MD4 hashing as default


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:01:19 +00:00
Jean-Pierre Huynh
91e21c3bd6 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119068 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117351 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117258 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114531 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114416 gjames: Added debug on startup MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:01:09 +00:00
Jean-Pierre Huynh
5d17b7e9f3 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119066 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117349 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117256 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114527 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114255 gjames: createUser with a password that has already been hashed MNT-14892,RA-601


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:58 +00:00
Jean-Pierre Huynh
cb6e5c77c0 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119065 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117348 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117255 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114526 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114254 gjames: Making sure md4 doesn't use a salt MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:52 +00:00
Jean-Pierre Huynh
7e58e926d0 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119064 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117347 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117254 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114524 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114104 gjames: Added trace debugging MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119903 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:44 +00:00
Jean-Pierre Huynh
9b89c2c4c4 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119063 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117346 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117253 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114523 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114045 gcornwell: MNT-14892: Enabled the UpgradePasswordHashJob (it won't run until 2099 though due to the default cron experssion) and tweaked log statements.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119902 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:34 +00:00
Jean-Pierre Huynh
ae043651cb Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119059 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117341 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117249 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114518 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114018 gcornwell: MNT-14892: Fixed tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119898 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:00:09 +00:00
Jean-Pierre Huynh
47373d2dc0 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119058 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117340 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117248 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114517 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114012 gcornwell: MNT-14892: Updates to upgrade password hash job and test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:59 +00:00
Jean-Pierre Huynh
1670fcce1e Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119057 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117339 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117247 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114516 adavis: Merged BCRYPT to 5.0.2-CLOUD
               114004 gjames: Added a hashUserPassword method, and working on UpgradePasswordHashTest MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:53 +00:00
Jean-Pierre Huynh
05375c63fc Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119056 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117338 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117246 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114515 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113961 gcornwell: MNT-14892: Added UpgradePasswordHashWorker job and skeleton test class


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:44 +00:00
Jean-Pierre Huynh
5cd45df966 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119054 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117336 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117244 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114513 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113804 gcornwell: MNT-14892: More test fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:09 +00:00
Jean-Pierre Huynh
eda3bd18fc Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119053 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117335 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117243 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114512 adavis: Merged BCRYPT to 5.0.2-CLOUD (PARTIAL MERGE)
               113778 gcornwell: MNT-14892: Fixed tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119891 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:59:04 +00:00
Jean-Pierre Huynh
133c8bf8ca Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119052 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117334 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117242 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114511 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113774 gjames: Better updateUser and test MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119890 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:59 +00:00
Jean-Pierre Huynh
fc74df4ab8 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119051 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117333 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117241 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114510 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113765 gcornwell: MNT-14892: Users password now gets re-hashed when they login if it is not using the preferred encoding (removes old MD4 and SHA encoded passwords)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:31 +00:00
Jean-Pierre Huynh
cdb95db67c Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119050 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117332 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117240 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114509 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113728 gjames: Changed updateUser to use a List MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119888 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:23 +00:00
Jean-Pierre Huynh
d97bed0aaa Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119045 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117327 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117235 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114504 adavis: Merged BCRYPT to 5.0.2-CLOUD (PARTIAL MERGE)
               113666 gjames: Initial integration of CompositePasswordEncoder for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:57:42 +00:00
Jean-Pierre Huynh
01ffcc2511 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119044 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117325 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117234 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114503 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113532 gjames: Adding a CompositePasswordEncoder for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:57:28 +00:00
Steven Glover
66157b10db ACE-3542 "server.maxusers count does not work correctly - TicketCountAll can be greater MaxUsers"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 11:10:00 +00:00
Alex Mukha
b66cdbed12 ACE-979: WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
- Fixed the solution and failed tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-03 12:05:26 +00:00
Alex Mukha
bb47289edf Merged DEV to HEAD (5.1)
110726: ACE-979: WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
      - Implemented a JUnit test.
      - Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-09-02 07:17:48 +00:00
Tatyana Valkevych
7dd2291753 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00
Tatyana Valkevych
08363286f0 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104179: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      104080: Merged DEV (5.0.2) to 5.0.N (5.0.2)
         104074: MNT-13989: securing external authentication with non null external.authentication.proxyUserName fails
            - Added SSL certificate subject DN validation in case of external.authentication.proxyUserName is set.
            - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-15 10:29:27 +00:00
Tatyana Valkevych
9509f5b6af Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
101930: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101819: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101764: MNT-13697: Merged V4.2.4 (4.2.4.7)  to V4.2-BUG-FIX (4.2.5)
            101112: MNT-13736 : CLONE - bad LDAP connection management: connections maintained IDLE unnecessarily
               - Added possibility to configure ldap connection pool parameters through the standard alfresco properties file.
               - Pooling may be disabled completely.
               - Updated logic of LDAPUserRegistry.java for better handling of unused objects (mainly by calling close() method).,
            101119: MNT-13736 : CLONE - bad LDAP connection management: connections maintained IDLE unnecessarily
               - Corrected the way of applying pool properties. They should be set as system properties (not environment!).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-04-17 09:57:42 +00:00
Alan Davis
a4a7c5f8e7 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
40d0ff9f62 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99768: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      99699: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         99634: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            99442: Merged DEV to V4.1-BUG-FIX (4.1.10)
               99036:   MNT-13357: LDAP SSL Certificate not checked.
                 - Create custom socket factory for LDAPS.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100495 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 22:56:51 +00:00
Alan Davis
46a73e07e5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
97694: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      97684: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
         97652: Merged DEV to PATCHES/5.0.1 
          97486 : MNT-13315 : CLONE - Share SSOAuthenticationFilter and non-ascii username strings
           External authentication supports non-ASCII symbols for user name. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@97706 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-21 07:53:17 +00:00
Alan Davis
cadf017c30 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96479: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96424: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96414: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            96401: Merged DEV to V4.1-BUG-FIX 
             96343 : MNT-11041 : Share SSOAuthenticationFilter and non-ascii username strings
              'userHeader' for alfrescoHeader connector is detected to apply userName base64 encoded (support non-ASCII symbols) or not.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:33:50 +00:00
Alan Davis
b732ec7175 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
96478: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      96419: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         96413: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            96399: MNT-11041: Reverting previous commits 93709 and 93669


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96507 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-02-07 10:33:41 +00:00
Alan Davis
ab8fb3979d Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93984: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93857: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         93852: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
            93669: Merged DEV to V4.1-BUG-FIX
             93636 : MNT-11041 : Share SSOAuthenticationFilter and non-ascii username strings
              "X-Alfresco-Remote-User" and userHeader for alfrescoHeader connector is now base64 encoded to support non-ASCII symbols.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:28:06 +00:00
Alan Davis
46244028c5 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
90771: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud)
      90565: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76855 : MNT-11765 : Public API Authentication: Returns error 500 instead of 401 when authenticated with invalid / non existing user
            - Avoid InvalidStoreRefException in getUserOrNull and getPersonOrNull methods
      90610: MNT-11765 : Public API Authentication: Returns error 500 instead of 401 when authenticated with invalid / non existing user
         - Fix for compilation errors
      90676: MNT-11765 : Public API Authentication: Returns error 500 instead of 401 when authenticated with invalid / non existing user
         - Test is changed to return the system to initial state


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94713 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 11:00:56 +00:00
Kevin Roast
613db46e5f ACE-3216 - server.maxusers count does not work correctly - off by one
- Fix fun off-by-one error meaning that 1 users = 0 users hoho!
ACE-3296 - SysAdmin bean should validate values for server.maxusers - or it is possible to accidently lock out the admin user!
   - Fix to ensure that although -1 means "infinite users allowed", a value of -2 or less does not mean "no users allowed" double-hoho!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-10-24 11:43:59 +00:00
Alan Davis
2b15a5b5ad Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84138: Merged FEATURE2 (5.0.0.FEATURE2) to HEAD-BUG-FIX (5.0/Cloud)
      83970: ACE-2268 : make ldaps (LDAP over SSL) configurable using ldap subsystem properties and not only JVM (system) properties (JAVA_OPTS)
      Implemented the LDAPS truststore configuration via subsystem's properties.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:26:44 +00:00
Mark Rogers
7fff2b6627 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
77145: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73891: ACE-1821 - Stop Using MD4 for password encryption on Cloud


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-23 15:55:56 +00:00