wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
47974 commits 157 branches 562 tags 714 MiB
Commit graph

5076 commits

Author SHA1 Message Date
Christoph Wurst
0e6cb988a1
Add a key parameter to the new initial state API 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-30 16:08:08 +01:00
Roeland Jago Douma
139055c1dd
Merge pull request #13880 from nextcloud/enh/expose_subadmin_to_ocp 
Expose subadmin to OCP
 2019-01-29 22:13:41 +01:00
Roeland Jago Douma
15abcff2a1
Expose subadmin to OCP 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-29 20:47:35 +01:00
Roeland Jago Douma
deb7d2364f
Merge pull request #13869 from nextcloud/enh/clean_pending_2fa_session_on_password_change 
Clean pending 2FA authentication on password reset
 2019-01-29 19:50:15 +01:00
Roeland Jago Douma
ac8a6e2244
Clean pending 2FA authentication on password reset 
When a password is reste we should make sure that all users are properly
logged in. Pending states should be cleared. For example a session where
the 2FA code is not entered yet should be cleared.

The token is now removed so the session will be killed the next time
this is checked (within 5 minutes).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-29 13:08:56 +01:00
Roeland Jago Douma
0fd208a83b
Merge pull request #13866 from nextcloud/s3-multipart-uploader 
always use multipart uploader for s3 uploads
 2019-01-29 11:14:05 +01:00
Robin Appelman
1d322d3b37
always use multipart uploader for s3 uploads 
the multipart uploader handles non seekable streams while `upload` does not

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-28 14:51:19 +01:00
Joas Schilling
abd305eff5
Remove legacy activity stuff 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-24 16:52:38 +01:00
Morris Jobke
ae25fd2389
Merge pull request #13217 from nextcloud/add-acceptance-tests-for-moving-and-copying-files 
Add acceptance tests for moving and copying files
 2019-01-23 18:48:21 +01:00
Roeland Jago Douma
e3de4edc51
Urlencode the requesttoken 
Followup of #13757

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-23 16:16:31 +01:00
Roeland Jago Douma
ebd9f30d85
Request plain logout url 
By requesting the plain logout url we allow it to be properly cached by
the caching router. We just add the requesttoken manually.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-23 14:06:03 +01:00
Roeland Jago Douma
f2b118a256
Merge pull request #13747 from nextcloud/fix/honor_session_lifetime_if_remember_cookie_is_disabled 
Honor remember_login_cookie_lifetime
 2019-01-23 10:12:01 +01:00
Roeland Jago Douma
e6333c8fe3
Honor remember_login_cookie_lifetime 
If the remember_login_cookie_lifetime is set to 0 this means we do not
want to use remember me at all. In that case we should also not creatae
a remember me cookie and should create a proper temp token.

Further this specifies that is not 0 the remember me time should always
be larger than the session timeout. Because else the behavior is not
really defined.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-23 08:46:24 +01:00
Morris Jobke
90e985fe4f
Merge pull request #13739 from nextcloud/cache-cleanup-change 
cleanup shared lock if changing to exclusive lock failed
 2019-01-22 16:11:46 +01:00
Robin Appelman
f69c2d1e84
cleanup shared lock if changing to exclusive lock failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-22 15:32:48 +01:00
Joas Schilling
f8b74cf0a5
Allow resources via OCS as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-22 14:18:58 +01:00
Daniel Calviño Sánchez
374b02c7bc Add acceptance tests for copying files to the same folder 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-22 12:51:53 +01:00
Daniel Calviño Sánchez
42457c8b23 Add acceptance tests for moving and copying selections to another folder 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-22 12:36:13 +01:00
Daniel Calviño Sánchez
4fcabf167e Add acceptance tests for moving and copying files to another folder 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-01-22 12:27:06 +01:00
Roeland Jago Douma
66367797df
Fix template paramter 
Else we get shown an error page instead of the correct 403.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-18 15:30:38 +01:00
Roeland Jago Douma
f42115d6bb
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-15 15:53:44 +01:00
Morris Jobke
5a27e54f4b
Merge pull request #13032 from nextcloud/objectstore-write-exists 
upload new files in objectstore to a .part path first
 2019-01-14 11:26:29 +01:00
Robin Appelman
615fb8cd77
Cache tokens when using swift's v2 authentication 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-13 19:59:48 +01:00
Christoph Wurst
01a6181d9f
Don't load old vendor files during jsunit tests 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:02:00 +01:00
Roeland Jago Douma
ad676c0102
Set default frame-ancestors to 'self' 
For #13042

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-08 15:36:40 +01:00
Roeland Jago Douma
64244e1a4f
CSP: Allow fonts to be provided in data 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-07 15:07:06 +01:00
Roeland Jago Douma
8b0f5e02c7
Merge pull request #12621 from nextcloud/td/12224/cleanup_middleware_registering 
Cleanup middleware registering
 2019-01-07 10:48:41 +01:00
Roeland Jago Douma
fe3d8ffc90
Merge pull request #13172 from nextcloud/fix-can-change-password-check 
fix can change password check in case of encryption is enabled
 2019-01-04 09:53:10 +01:00
Roeland Jago Douma
2d22633568
Merge pull request #13313 from nextcloud/feature/remove-outdated-caches 
Remove check for outdated caches
 2019-01-04 09:18:31 +01:00
blizzz
68952306aa
Merge pull request #10555 from nextcloud/bugfix/10518/only-check-added-items 
Only enforce schema limits for supported apps
 2019-01-03 14:18:13 +01:00
Roeland Jago Douma
54ff913de6
Cleanup middleware registering 
Fixes #12224

Since we only use the middleware at 1 location it makes no sense to
register them in each and every container.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-03 11:50:01 +01:00
Daniel Kesselberg
248e824f48
Remove check for outdated caches 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-01-02 10:46:14 +01:00
Daniel Calviño Sánchez
4566670fa3 Add acceptance tests for opening search results for comments 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-12-21 20:14:38 +01:00
Daniel Calviño Sánchez
1a887aaad0 Add acceptance tests for searching comments 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-12-21 20:14:16 +01:00
Roeland Jago Douma
03fe2b3b81
Use a case insensitive search for email 
Fixes #7084
Now entering wrongly cased email (roeland@ instead of Roeland@) for
password reset etc. Will also work.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 14:19:35 +01:00
Bjoern Schiessle
4b3308bf3f
fix can change password check in case of encryption is enabled 
Admin should _not_ be able to change password when:
- if an encryption module is loaded and it uses per-user keys
- if encryption is enabled but no encryption modules are loaded

Admin should be able to change the password when:
- no encryption module is loaded and encryption is disabled
- encryption module is loaded but it doesn't require per user keys

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-12-20 12:28:40 +01:00
Roeland Jago Douma
a0ce0824bd
Merge pull request #13116 from nextcloud/fix/only_trust_xforwardedhost_for_trusted_proxies 
Only trust the X-FORWARDED-HOST header for trusted proxies
 2018-12-19 09:47:44 +01:00
John Molakvoæ
6f994be665
Merge pull request #12766 from stalker314314/streaming-options 
Expose Swift Mailer streaming options in config, fixes #12702
 2018-12-18 07:53:45 +01:00
Branko Kokanovic
7cef9b0248 Addressing comments, array() to [] 
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
 2018-12-17 23:34:55 +01:00
Roeland Jago Douma
514426e27d
Only trust the X-FORWARDED-HOST header for trusted proxies 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-17 15:54:45 +01:00
Joas Schilling
6788e6e75c
Merge pull request #12883 from nextcloud/appdata-performance 
try to grab the appdata folder directly without going trough the whole tree
 2018-12-17 15:11:28 +01:00
Joas Schilling
85a0e10b4f
Update the tests to the comparison logic 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-17 13:52:09 +01:00
Robin Appelman
d6bf5d4384
upload new files in objectstore to a .part path first 
This prevent the object store and cache from getting out of sync
when an objectstore silently fails or the php process get's killed
during the upload without giving us the chance to cleanup

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-12 15:24:40 +01:00
Robin Appelman
6c9f2644cf
Add objectExists to objectstore interface 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-12 14:17:19 +01:00
Roeland Jago Douma
372f3d2a60
Remove deprecated functions from SecureRandom 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-07 19:33:32 +01:00
Roeland Jago Douma
cfcce69272
Merge pull request #12897 from nextcloud/fix-unread-comment-icon-not-shown-for-the-sharee 
Fix unread comment icon not shown for the sharee
 2018-12-07 15:07:23 +01:00
Roeland Jago Douma
2bbfeea659
Merge pull request #12891 from nextcloud/theming-caching 
more caching for theming
 2018-12-07 10:09:31 +01:00
Robin Appelman
2051943487
more caching for theming 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-07 01:27:49 +01:00
Daniel Calviño Sánchez
6cee8ba827 Add acceptance tests for comments on shared files and folders 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-12-06 18:31:42 +01:00
Robin Appelman
036475fc91
use a fresh appdata factory in background job test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-06 16:53:13 +01:00