Commit Graph

29 Commits

Author SHA1 Message Date
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
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
c47e0055b4 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119049 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117331 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117239 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114508 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113726 gjames: Fixing AuthenticationTest, switch char[] to String for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:58:17 +00:00
Jean-Pierre Huynh
e7ad963bbc Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119047 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      117329 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         117237 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
            114506 adavis: Merged BCRYPT to 5.0.2-CLOUD
               113723 gjames: Fixing up failing AuthenticationTest for MNT-14892


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119885 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 09:57:56 +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
db0b691127 ACE-3542 "server.maxusers count does not work correctly - TicketCountAll can be greater MaxUsers"
Fix test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 17:24:02 +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
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
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
Alan Davis
d623b63418 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94234: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94203: Reverse Merge 5.0.N (5.0.1)
        <<Caused build failures after 94116>>
        93680: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
        Fixed AuthenticationTest and RenditionServiceIntegrationTest not to hang on MS SQl Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95060 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:36:07 +00:00
Alan Davis
3929596255 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
94232: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94116: MNT-13089 Reinstate the tests that had been disabled on SQLServer, before we understood the problem was with transaction isolation
      Reverted following commits:
         93292: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelCreate in case of SQL Server
         93342: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete in case of MS SQl Server.
         93522: Disabled org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionRestore and org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionPurge in case of MS SQL Server.
         93680: Disabled org.alfresco.repo.rendition.RenditionServiceIntegrationTest.testCompositeReformatAndResizeRendition in case of SQL Server
         93772: Disabled for MS SQL Server AuthenticationTest.testLoginNotExistingTenant, RenditionServiceIntegrationTest.testALF3733, RenditionServiceIntegrationTest.testJavascriptAPI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:35:56 +00:00
Alan Davis
f1cfb74849 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93839: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93772: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server
      Fixed RenditionServicePermissionsTest.userWithoutDeleteAccessToNodeShouldNotCauseFailedThumbnailProblemsOnUpdate.
      Disabled for MS SQL Server AuthenticationTest.testLoginNotExistingTenant, RenditionServiceIntegrationTest.testALF3733, RenditionServiceIntegrationTest.testJavascriptAPI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 15:23:40 +00:00
Alan Davis
001e1846db Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
93833: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      93717: Merged DEV (5.0.1) to 5.0.N (5.0.1)                                                                                                                                                                                                          
         93680: MNT-13089: RepoAdminServiceImplTest hangs on SQL Server                                                                                                                                                                            
         Fixed AuthenticationTest and RenditionServiceIntegrationTest not to hang on MS SQl Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-01-31 12:31:57 +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
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
Will Abson
4bbfd2b76c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71601: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70356: MNT-11233: DEV to V4.2-BUG-FIX (4.2.3)
         67973: MNT-11233: Alfresco CMIS API /alfresco/api/-default-/cmis/versions/1.1/atom cannot be used with external authentication
            - Move RemoteUserMapper from Web-Client to Repository project. Use RemoteUserMapper in PublicApiAuthenticator to retrieve remote user from request.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:31:06 +00:00
Alan Davis
983b3640da Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64105: Reverse Merge HEAD-BUG-FIX (4.3.0.BF)
      << Reverted to see if commit was reason for build failures >>
      63912: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
         63885: MNT-10338 : 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@64358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:46:41 +00:00
Alan Davis
0124e5cdf8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63912: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
      63885: MNT-10338 : 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@64334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:07:47 +00:00
Derek Hulley
7e2d1a95c6 Reverted 63895 (MNT-10338), which went onto the wrong branch
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-11 12:38:58 +00:00
Alex Mukha
69f2922c30 Merged DEV to HEAD (4.3.0)
63885: MNT-10338 : 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@63895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-11 11:37:48 +00:00
Alan Davis
d6d16285d9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59040: Added AuthenticationBootstrapTest to the own JVM Category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:47:23 +00:00
Alan Davis
068939e250 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58376: Added additional tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:20:56 +00:00
Alan Davis
eadda12eb8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58310: Merge Dev to HEAD-BUG-FIX
     MNT-8647 : inconsistent ftp authentication chain behaviour


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:09:36 +00:00
Derek Hulley
df7349b6e3 Merged DEV to HEAD:
52797: Fixed ALF-19301 (CLOUD-1685): Unsafe usage of transactions around authenticationCache
   54967: Fix test after changes for ALF-19301: Unsafe usage of transactions around authenticationCache
   Merge: Note that the test changes were applied by using 'patch' because of the file relocation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-08 22:21:11 +00:00
Andrew Hind
0d4d8c41d1 Fix for ALF-13535 Using CMIS, on-disk tickets cache can grow unbounded
- Single ticket per user (you can have a ticket per login via configuration)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-28 13:12:29 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00