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

9234 commits

Author SHA1 Message Date
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
Michael Weimann
6c52821389
Make the where is your data section optional 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-29 19:42:12 +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
Daniel Kesselberg
c09ddf6c78
Check app path for enableAppForGroups 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-01-26 22:31:45 +01:00
Robert Dailey
a170bf80ec
Improve data directory write checking for NFS mounts 
If `is_writable()` fails, fall back to logic that attempts to create a file
and then checks if it exists. If this check fails, an error occurs as it
did before.

Discussion on this solution was found here:
https://help.nextcloud.com/t/write-errors-for-nfs-mount/23328

Fixes #7124

Signed-off-by: Robert Dailey <rcdailey@gmail.com>
 2019-01-24 20:39:52 -06:00
Joas Schilling
abd305eff5
Remove legacy activity stuff 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-24 16:52:38 +01:00
Roeland Jago Douma
6b48e13371
Merge pull request #13772 from nextcloud/bugfix/noid/show-default-locale 
Show proper default locale
 2019-01-24 08:31:46 +01:00
Morris Jobke
c57f886b43
Show proper default locale 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-01-23 23:21:05 +01:00
Roeland Jago Douma
425edf88d7
Merge pull request #13770 from nextcloud/enhancement/post-login-hook-is-token 
Add isTokenLogin argument to post login hook/event
 2019-01-23 22:12:51 +01:00
Christoph Wurst
ad5a658e0c
Add isTokenLogin argument to post login hook/event 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-23 19:47:47 +01:00
Morris Jobke
d549954024
Merge pull request #13766 from nextcloud/fix/13757/urlencode_requesttoken 
Urlencode the requesttoken
 2019-01-23 18:29:18 +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
Jan-Christoph Borchardt
9147a12ee1
Reduce text size of text file preview, fix #13720 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-23 15:37:08 +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
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
92edd40e51
Make RouteConfig strict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-22 14:18:58 +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
John Molakvoæ
b1d4c3f50b
Merge pull request #13642 from nextcloud/contacts-menu-url-fix 
Allow access to addressbook unique uri
 2019-01-22 13:00:07 +01:00
John Molakvoæ (skjnldsv)
22112bf71d
Allow access to addressbook unique uri 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Co-Authored-By: Joas Schilling <coding@schilljs.com>
 2019-01-22 10:03:56 +01:00
Michael Weimann
b8d25a1247
Remove debug setting 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-20 11:23:47 +01:00
b108@volgograd
bf167ad3ac Remove duplicate functionality 
This functionality implemented in the next line:

$requestUri = preg_replace('%/{2,}%', '/', $requestUri);
 2019-01-20 13:29:58 +04:00
Joas Schilling
adbeb42c2c
Fix colorizeSvg with transformations that contain a comma (,) 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-17 14:24:07 +01:00
Roeland Jago Douma
c77d7d6e79
Move merged-share-backend to webpack 
For #13608

Since we have webpack anyway it make sense to let webpack do the
bundling instead of ourselfs. This leads to minified code (so less
transfer). And the webserver can just handle the request.

As a bonus we get a map file so debugging is easier than with our
JSCombiner stuff.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-16 10:03:21 +01:00
Christoph Wurst
d5927e4d01
Fix integer background job id type error 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-15 14:36:03 +01:00
Morris Jobke
c3b22f05bb
Merge pull request #13468 from rummatee/issue13276 
don't close input stream when writing in encrypted file
 2019-01-14 16:21:08 +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
Michael Weimann
7562eddb69
Fix location source 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:12:23 +01:00
Michael Weimann
2cd3fd3dc2
Move server info to theming section 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:08:26 +01:00
Michael Weimann
813ff430f1
Implement storing and loading the server info 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:08:24 +01:00
Michael Weimann
6993faaf67
Add the "server info" settings 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:07:36 +01:00
Michael Weimann
107fab9dfa
Add the "where is your data?" frontend 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:07:34 +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
Joas Schilling
d8e041a5a2
Don't log parameters on user creation in case of error/exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-10 10:46:58 +01:00
Florian Schunk
c2f8df0573 don't close input stream when writing in encrypted file 
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
 2019-01-10 00:25:07 +01:00
Christoph Wurst
83068c39e5
Update select2, include css 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:02:01 +01:00
Christoph Wurst
1e80259051
Remove core.js 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:02:00 +01:00
Christoph Wurst
208788173d
Npmize (vendor) scripts 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:01:59 +01:00
Roeland Jago Douma
08970aaee2
HttpClient getHeader can return empty string 
Fixes #11999

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-08 14:14:59 +01:00
Roeland Jago Douma
8e914c01c5
Use the real logger in the settings 
Fixes #13285
The wrapper logger should not be used here. But we need the real logger.
Since this in internal we can just pass that on directly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-07 12:32:07 +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
6980ecf7ab
Throttle with correct metadata 
Fixes #13202

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-04 21:45:44 +01:00
blizzz
aad32771f8
Merge pull request #13161 from nextcloud/perf/fix_comments_in_folder_function 
Rewrite getNumberOfUnreadCommentsForFolder query
 2019-01-03 17:08:52 +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
Morris Jobke
273849a7e7
Merge pull request #13074 from nextcloud/improve-decrypt-all 
improve decrypt all process: list files which could not be decrypted
 2019-01-02 16:35:48 +01:00
Julius Härtl
0f911e2d13
Add default values when parsing account data 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-12-23 16:33:02 +01:00
Roeland Jago Douma
d0956c9a42
Followup 12833, gracefully handle the getting of / 
Else this breaks the app page

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-21 11:08:19 +01:00
Roeland Jago Douma
f394bf356e
Rewrite getNumberOfUnreadCommentsForFolder query 
Before the joining and filtering removed unkown files. Resulting in
manual queries for all the files with no (unread) comments (the 99%).

Long story short. This will return a list of all the files in the parent
folder with their unread comment count (can be 0). But this makes sure
that the result is properly cached. In the dav handling.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 20:43:10 +01:00
Roeland Jago Douma
216ad29f05
SCSS cache buster is a combination of apps/theming/scc_vars 
Else on scss files we'd get <file>?v=<hash>?v=<hash2>
This is of course not valid. Now it becomes <file>?v=<hash>-<hash2>

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 20:33:21 +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
Maxence Lange
5557485aba using the createIndex from FullTextSearchManager 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-12-20 08:34:17 +00: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
Branko Kokanovic
8101059062 Addressing comments, count to empty 
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
 2018-12-17 20:02:00 +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
c09fa1ee65
Only check the Oracle schema conditions if the app supports it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-17 13:52:08 +01:00
Joas Schilling
f265657bc6
Only check changed items 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-17 13:52:08 +01:00
Bjoern Schiessle
a2eaf48f6f
list files which could not be decrypted 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-12-14 12:00:49 +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
5a9fc01ea6
Merge pull request #12896 from nextcloud/bugfix/12894-use-version-doclink 
Use version from config to generate doclink
 2018-12-10 15:03:42 +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
Daniel Kesselberg
5ee6e5b8c6
Use OC_Util::getVersion instead of getSystemValue 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-12-07 11:42:12 +01:00
Daniel Kesselberg
6016d45ca9
Use version to generate docversion 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-12-07 11:42:12 +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 Kesselberg
ec8aefc762
Read openssl error and log 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-12-06 21:27:57 +01:00
Robin Appelman
740ea0d30e
try to grab the appdata folder directly without going trough the whole tree 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-12-06 15:10:08 +01:00
Morris Jobke
60681decdd
Merge pull request #12865 from nextcloud/fix/do_not_propogate_in_appdata 
No need to propogate changes in appdata
 2018-12-06 08:50:22 +01:00
Morris Jobke
ecc8068e66
Merge pull request #12857 from nextcloud/fix/emit_write_update_once_on_touch 
Emit write update only once on touch
 2018-12-05 22:54:47 +01:00
Morris Jobke
e808661ca2
Merge pull request #12854 from nextcloud/vcard-repair-uid-fix 
Log and continue on Dav reader failure (repair uid)
 2018-12-05 22:54:10 +01:00
Roeland Jago Douma
72f3882d4b
No need to propogate changes in appdata 
Right now we propogate a lof of changes in appdata. So for example we
propogate each and every preview that is added to the system. This has
no real added value as far as I can tell.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-05 22:06:19 +01:00
Roeland Jago Douma
2c6d36105c
Emit write update only once on touch 
When a touch is done (i.e. when creating a new file in the node API)
The hooks contain 'write' and 'touch' (and the operation is touch as
well). This would cause a double write update. Which doesn't make sense.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-05 21:29:48 +01:00
John Molakvoæ (skjnldsv)
2be63bcb6a
Log and continue on Dav reader failure 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-12-05 21:13:57 +01:00
Roeland Jago Douma
f7a1ed8656
Only execute query in propagateChange once 
The second execute statement should be inside the if block. Else it gets
executed twice which makes no sense.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-05 20:32:02 +01:00
Morris Jobke
922fd4dd78
Merge pull request #12831 from nextcloud/fix/do_not_update_all_child_shares 
Do not update child all child shares on group share update
 2018-12-04 22:50:34 +01:00
Morris Jobke
d8314b102e
Merge pull request #12624 from nextcloud/bugfix/noid/validate-all-rich-objects 
Validate all rich objects
 2018-12-04 22:48:54 +01:00
Roeland Jago Douma
977e3959eb
Do not update child all child shares on group share update 
Else we overwrite the whole share for link shares. Basically breaking
them.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-04 20:55:14 +01:00
Morris Jobke
ea6ea7f4c3
PHP module is named mbstring 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-12-04 17:22:11 +01:00
Branko Kokanovic
72d97b44a7 Expose Swift Mailer streaming options in config, fixes #12702 
Signed-off-by: Branko Kokanovic <branko@kokanovic.org>
 2018-11-30 22:36:03 +01:00
Morris Jobke
331f3b2652
Merge pull request #12691 from nextcloud/storage-no-encryption-interface 
Add interface to allow storages from opting out of encryption
 2018-11-29 22:02:23 +01:00
Morris Jobke
8abde7702a
Merge pull request #12690 from peterkraume/bug-12689 
Set Referrer-Policy also in addSecurityHeaders()
 2018-11-29 17:46:53 +01:00
Robin Appelman
2c1f6331a4
Add interface to allow storages from opting out of encryption 
As opposed to hard-coding a list of excluded storages

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-29 16:31:34 +01:00
Daniel Kesselberg
92675a606e
Add sendmailmode to gui 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-29 16:02:36 +01:00
Carsten Wiedmann
446d96f3eb
Apply patch from @cwiedmann but drop -oi option for pipe 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-29 16:02:35 +01:00
Robin Appelman
9d9f6903c9
Fix folder path containing leading slash when getting mount root by id 
This fixes collabora on public link shared groupfolders

Fixes https://github.com/nextcloud/groupfolders/issues/225

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-28 15:18:29 +01:00
Peter Kraume
79b8703f29 Set Referrer-Policy also in addSecurityHeaders() 
Fix: #12689
Signed-off-by: Peter Kraume <peter.kraume@gmx.de>
 2018-11-27 16:39:06 +01:00
Joas Schilling
695e60228d
Validate all rich objects not only the used ones 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-23 12:39:02 +01:00
Joas Schilling
b8fcf6e9b3
Allow empty strings in getAbsoluteURL 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-20 13:36:16 +01:00
Morris Jobke
53418f2795
Merge pull request #12543 from nextcloud/fix/12498/bearer_tokens_are_apptokens 
Bearer tokens are app token
 2018-11-20 11:49:33 +01:00
Morris Jobke
cc6c30e769
Merge pull request #12494 from nextcloud/cache-notfound-id 
return the correct value when trying to get a non existing item from cache by id
 2018-11-20 09:51:18 +01:00
Morris Jobke
8e65f08617
Merge pull request #12500 from nextcloud/swift-object-not-found 
forward object not found error in swift as dav 404
 2018-11-20 09:49:57 +01:00
Roeland Jago Douma
c2beb36bfc
Bearer tokens are app token 
Fixes #12498

This means that we set that it is a proper app token once it is
validated. This will allow the 2FA middleware to just run the same
check.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-20 09:23:57 +01:00