upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-15 09:59:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52
39842 commits 960 branches 1208 tags 8.1 GiB
Commit graph

3496 commits

Author SHA1 Message Date
Roeland Jago Douma
ef1c81188b Merge pull request #6319 from nextcloud/improve_2fa-12 
[stable12] Improve 2FA
 2017-09-06 20:07:46 +02:00
Roeland Jago Douma
dbcd549e35
Fix login with basic auth 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-06 17:07:11 +02:00
Morris Jobke
c0692abee7
Fix tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-05 16:04:29 +02:00
Joas Schilling
6428359820
Fix unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-05 16:04:17 +02:00
Roeland Jago Douma
faffebc718
Improve 2FA 
* Store the auth state in the session so we don't have to query it every
time.
* Added some tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-31 10:54:10 +02:00
Bjoern Schiessle
3e6833f5a6
add prefix to user and system keys to avoid name collisions 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-30 20:36:10 +02:00
Bjoern Schiessle
5f49398e13
extend the identity proof manager to allow system wide key pairs 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-30 20:36:10 +02:00
Lukas Reschke
5755897712
Inject \OCP\IURLGenerator to make tests work 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-30 14:42:50 +02:00
Lukas Reschke
245080e647
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL 
Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string.
This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result
in `<a href="foo">`.

This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with
054e161eb5 inside the navigation manager where one cannot simply inject attributes.

Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112,
people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects
you to the IdP and properly logs you out there as well.

Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to
use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout
URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but
I'm not aware of any and there's simply no way to fix this properly otherwise.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-30 14:42:46 +02:00
Morris Jobke
3f8e3fbb6b Merge pull request #5946 from nextcloud/12-5897 
[stable12] Send an email once a file/folder is shared with a user
 2017-08-08 16:36:46 +02:00
Joas Schilling
d6e902fd03
Fix last failures with oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-03 16:40:46 +02:00
Joas Schilling
ae55fefcf6
Fix querybuilder and functionbuilder tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-03 16:40:35 +02:00
Joas Schilling
d6b888461d
Can not insert auto increment on oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-03 16:40:00 +02:00
Joas Schilling
18ba973c13
Fix missing escape on column and table name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-03 16:39:51 +02:00
Morris Jobke
1ef19bb0ec Send an email once a file/folder is shared with a user 
* only if user has set an email address
* only for user shares (no group shares for now)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-01 15:17:32 +02:00
Lukas Reschke
7568b04705 Add new bundle 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-26 11:47:15 +02:00
Robin Appelman
13831085c3 add tests for renaming paths with multibyte utf8 characters 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-22 11:10:37 +02:00
Morris Jobke
c6e3368af7 Merge pull request #5786 from nextcloud/path-repair-steps-storage-12 
[12] Also repair storage id's when repairing invalid entries
 2017-07-21 14:03:38 +02:00
Robin Appelman
9c2dce34e9
Also repair storage id's when repairing invalid entries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-19 12:34:00 +02:00
Pauli Järvinen
22b29943ed Fix emitting of legacy hook post_unshare 
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
 2017-07-19 11:42:23 +02:00
Morris Jobke
9a07f78480 Merge pull request #5710 from nextcloud/nested-permissions-mask-12 
[12] Fix scan permissions with nested permissions masks
 2017-07-13 23:42:15 +02:00
Morris Jobke
90972044b1 Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12 
[12] fix moving folders out of a cache jail
 2017-07-13 16:35:57 +02:00
Morris Jobke
61bac5637f Merge pull request #5697 from nextcloud/stable12-4984 
Write cert bundle to tmp file first
 2017-07-13 15:08:37 +02:00
Robin Appelman
5804dfc078
Fix scan permissions with nested permissions masks 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 14:37:09 +02:00
Robin Appelman
069df4c8cb
chunk getting invalid paths and reuse queries 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:24 +02:00
Robin Appelman
64d0a0ffc9
adjust to moved repair step 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:23 +02:00
Robin Appelman
92b14fa8c0
Add repair step for invalid paths 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:23 +02:00
Robin Appelman
996269cfdd
fix moving folders out of a cache jail 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-07-13 13:08:23 +02:00
Roeland Jago Douma
fe7c907e8c
Write cert bundle to tmp file first 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-07-12 20:21:27 +02:00
Morris Jobke
36e3f3cc2a Merge pull request #5617 from nextcloud/backport-5615-fix-navigation-entries-for-group-restricted-apps 
[stable12] Don't load navigation entries of restricted apps
 2017-07-07 10:46:11 +02:00
Joas Schilling
33252cda9e
Adjust tests to the old settings menu 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-06 09:30:42 +02:00
Joas Schilling
20091a21c9
Don't load navigation entries of restricted apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 15:07:56 +02:00
Julius Härtl
9fbae1a174
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-02 14:03:36 +02:00
Julius Härtl
d9f83bac0f
Add tests and inject IRequest 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-02 14:03:35 +02:00
Joas Schilling
49c71bdbcb
Fix unknown share token 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 18:53:52 +02:00
Björn Schießle
52f6c22954 Merge pull request #5224 from nextcloud/useful-gs-settings-stable12 
[stable12] add new config switched for the global scale architecture
 2017-06-02 20:18:45 +02:00
Bjoern Schiessle
6e7ff24474
add new config switched for the global scale architecture 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-02 11:00:08 +02:00
Arthur Schiwon
c1f4191a77
emit changeUser only if there really was a change (quota, displayname) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-01 13:08:23 +02:00
Lukas Reschke
551a189ae8 Fix tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-20 17:15:19 -05:00
Lukas Reschke
7976927628 Merge pull request #4894 from nextcloud/generic-security-activities 
Change 2FA activities to more generic security activities
 2017-05-19 00:50:44 +02:00
Lukas Reschke
8c624bdef9 Merge pull request #4792 from nextcloud/fix-storage-wrappers-on-scanner 
Make sure we use the passed-in storage when there is one
 2017-05-19 00:49:58 +02:00
Roeland Jago Douma
e43649e67e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-18 22:10:57 +02:00
Lukas Reschke
7927aed991
Adjust token name 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:11 +02:00
Lukas Reschke
59e968977c
Add test for DefaultTokenMapper 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:09 +02:00
Lukas Reschke
77827ebf11
Rename table back to lowercase 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:09 +02:00
Bjoern Schiessle
1eb7f4956b
delete auth token when client gets deleted 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-18 20:49:07 +02:00
Robin Appelman
1f1e1b0d00
use unmasked permissions during scanning 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-18 16:38:54 +02:00
Morris Jobke
3bf9503070 Merge pull request #4816 from nextcloud/Ardinis-quota-files_external 
Correctly calculate used space for quota with external storage
 2017-05-12 11:33:54 -05:00
Morris Jobke
51c55a867d fix quota tests for external storage 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-12 11:32:16 -05:00
Lukas Reschke
48a9a4bd81 Merge pull request #4825 from nextcloud/add-timeout-appstore 
Add timeout for requests to appstore
 2017-05-12 12:37:18 +02:00