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

4098 commits

Author SHA1 Message Date
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
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
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
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
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
2cd3fd3dc2
Move server info to theming section 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-14 00:08:26 +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
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
Thomas Citharel
c9b588774b
Allow bracket IPv6 address format inside IPAdress Normalizer 
When run with php's build-in server (for instance on localhost:8080), IP provided through $this->server['REMOTE_ADDR'] is [::1], which is not an acceptable format for \inet_pton. This removes the brackets if there's any.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-01-03 10:03:46 +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
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
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
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
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
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
Joas Schilling
ee545d6840
Fix typo in "incoming" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-05 11:27:38 +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
Robin Appelman
67a46b5aa9
update encryption wrapper tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-29 16:34:49 +01:00
Daniel Kesselberg
4a2c56b714
Add testcases for pipe mode 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-29 16:02:37 +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
Joas Schilling
b8fcf6e9b3
Allow empty strings in getAbsoluteURL 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-20 13:36:16 +01:00
Joas Schilling
2b18b9ae96
Update the URLGenerator test to current state of art 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-20 13:36:15 +01:00
Robin Appelman
aa6f7947ba
add test for non existing file by id 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-11-19 17:37:59 +01:00
Morris Jobke
fd8eeccb15
Merge pull request #11942 from nextcloud/techdebt/noid/use-count-function 
Use the defined func()->count() instead of manual counting
 2018-11-12 17:43:56 +01:00
Morris Jobke
859dd1e742
Merge pull request #12371 from nextcloud/bugfix/12369/catch-unique-constraint-violation-exception-in-insertIfNotExist 
Catch UniqueConstraintViolationException inside insertIfNotExist
 2018-11-12 13:41:00 +01:00
Morris Jobke
8e60006744
Exception is not thrown anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-12 12:22:04 +01:00
Julius Härtl
26b160cc43
Make sure to always load the latest icons-vars.css file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-11-12 11:00:56 +01:00
Joas Schilling
bb352fb667
Use the defined func()->count() instead of manual counting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 15:44:45 +01:00
Roeland Jago Douma
25fe324f41
Merge pull request #12313 from nextcloud/generated-avatar-major-cleanup 
Clear avatar cache with frontend repair
 2018-11-08 10:28:09 +01:00
John Molakvoæ (skjnldsv)
a9eef37456
Clear avatar cache with frontend repair 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-08 08:31:21 +01:00
Morris Jobke
ab3543380c
Merge pull request #11836 from nextcloud/bugfix/2443/comment-mentions-with-spaces 
Comment mentions with spaces
 2018-11-07 16:27:36 +01:00
Joas Schilling
10ba0bed8a
Match mentions when the username is wrapped in quotes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-07 12:33:44 +01:00
Daniel Kesselberg
04a316aa67
Add test that unique constraint is working 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-11-06 21:29:20 +01:00
Morris Jobke
cba3883410
Merge pull request #12185 from nextcloud/cleanup/dicontainer 
Cleanup the DIContainer
 2018-11-05 12:16:36 +01:00
Roeland Jago Douma
9d89f8bbac
Merge pull request #12071 from nextcloud/addressbook-uid-check-migration 
Addressbook uid check migration
 2018-11-02 19:37:48 +01:00
Roeland Jago Douma
0e5147f001
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 19:20:37 +01:00
Roeland Jago Douma
4ba709bb71
Merge pull request #11404 from flokli/sendmail-path 
Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail
 2018-11-02 16:17:02 +01:00
Roeland Jago Douma
30a1237f81
Merge pull request #11875 from nextcloud/add-support-for-sending-the-password-for-a-link-share-by-nextcloud-talk 
Add support for sending the password for a link share by Nextcloud Talk
 2018-11-02 14:54:46 +01:00
Roeland Jago Douma
054056a8df
Fallback to default path is sendmail can't be found 
If the sendmail binary can't be found at all we fallback to the default
path.
It most likely is not there but then at least a proper error message
pops up.

Updated the tests to also properly pass.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-11-02 14:03:11 +01:00
Morris Jobke
248d95339d
Cleanup some unused sharing methods from the old sharing code 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-02 10:49:42 +01:00
Daniel Calviño Sánchez
fe8a67f517 Store "sendPasswordByTalk" property of link shares in the database 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:57:48 +01:00
Daniel Calviño Sánchez
00e4c8aee4 Fix update share tests 
The update share tests only checked that the share returned by
"update()" had the expected values. However, as "update()" returns the
same share that was given as a parameter the tests were not really
verifying that the values were updated in the database.

In a similar way, the test that checked that a password was removed did
not set a password first, so even if the database returned null it could
be simply returning the default value for the share; a password must be
set first to ensure that it is removed.

Besides that, a typo was fixed too that made the checks on the original
share instead of on the one returned by "update()"; right now it is the
same share, so the change makes no difference, but it is how the check
should be done anyway.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-11-02 01:09:01 +01:00
John Molakvoæ (skjnldsv)
98f30c2dab
Merge branch 'addressbook-uid-check-migration' of https://github.com/nextcloud/server into addressbook-uid-check-migration 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 17:33:58 +01:00
John Molakvoæ (skjnldsv)
abed75e5cb
Fix phpunit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 17:32:21 +01:00
Morris Jobke
f5a1f4bc1b
Revert "Wait for cron to finish before running upgrade command" 
This reverts commit 18e9631810.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-11-01 15:23:40 +01:00
John Molakvoæ (skjnldsv)
06b3ade9ee
Tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-01 15:00:49 +01:00
Robin Appelman
9b3cc72f7c
fix writeStream for jail wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-31 21:10:57 +01:00
Robin Appelman
93de63777e
extend storage api to allow directly writing a stream to storage 
this removes the need for temporary storages with some external storage backends.
The new method is added to a separate interface to maintain compatibility with
storage backends implementing the storage interface directly (without inheriting common)

Currently the interface is implemented for objectstorage based storages and local storage
and used by webdav uploads

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-10-31 21:10:44 +01:00
Roeland Jago Douma
ce10f8b8c4
Only generate previews in powers of 4 and set min 
Before we'd round up all preview request to their nearest power of two.
This resulted still in a lot of possible images. Generating a lot of
server load and taking up a lot of space.

This moves it to previews to be powers of 4: 64, 256, 1024 and 4096
Also the first two powers are always skipped (4, 16) as it doesn't make
sense to generate previews for that.

We cache preview pretty agressively and I feel this is a better
tradeoff.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-31 19:34:42 +01:00
Roeland Jago Douma
674930da7f
Move ExpiredTokenException to the correct namespace 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-30 19:30:45 +01:00
Roeland Jago Douma
41ff001b77
Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation 
Sharing user consolidation
 2018-10-30 19:27:05 +01:00
John Molakvoæ (skjnldsv)
e2ec641c7b
Tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-30 13:05:10 +01:00
Julius Härtl
5a73a9b9de
Fix injection to get the user id 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 11:41:56 +01:00
Morris Jobke
dccfe4bf84
Merge pull request #12036 from olivermg/master 
Add capability of specifying "trusted_proxies" entries in CIDR notation (IPv4)
 2018-10-30 10:49:08 +01:00
Julius Härtl
a0d759b324
Add uuid/name entry to Remote/MailPlugin tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:36 +01:00
Julius Härtl
61af607525
Make enhancing entries with type property optional 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:35 +01:00
Julius Härtl
ce79e587e4
Filter out local users from address book remote searches 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-30 10:19:33 +01:00
Oliver Wegner
401ca28f07 Adding handling of CIDR notation to trusted_proxies for IPv4 
Signed-off-by: Oliver Wegner <void1976@gmail.com>
 2018-10-30 09:15:42 +01:00
Julius Härtl
34a71f57fc
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-29 13:06:55 +01:00
Julius Härtl
d21ded67a7
Keep list of icons in a separate file for use in the accessibility app 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-25 12:16:10 +02:00
Bjoern Schiessle
d76a87f3b0
skip already decrypted files on decrypt all command 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-24 16:53:39 +02:00
Morris Jobke
39338aaa67
Merge pull request #11914 from nextcloud/csp/report-uri 
Add report-uri to CSP
 2018-10-23 16:42:24 +02:00
John Molakvoæ (skjnldsv)
782927a05f
fixup! Fix comment and cap-height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 14:30:23 +02:00
John Molakvoæ (skjnldsv)
1fb885638e
Fix comment and cap-height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-10-23 14:22:55 +02:00
Jan-Christoph Borchardt
354b72b9d3
Use correct typeface for avatar generator 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-10-23 13:13:35 +02:00
Roeland Jago Douma
579822b6a5
Add report-uri to CSP 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-21 13:38:32 +02:00
Christoph Wurst
a1ea504edf
Merge pull request #11711 from nextcloud/feature/backgroundjobs_ocp 
Add proper backgroundjobs to OCP
 2018-10-19 07:40:35 +02:00
Arthur Schiwon
8e4ae23c48
Do not try to contact lookup server without internet connection or URL 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-10-18 17:49:28 +02:00
Morris Jobke
ad66b0f9ab
Merge pull request #11830 from nextcloud/bugfix/9326/make_sure_usermanager_getByEmail_only_returns_IUser 
filter null values for UserManager::getByEmail
 2018-10-16 09:14:25 +02:00
Julius Härtl
b9a87a69cf
Use IAccountManager constants 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-15 13:30:31 +02:00
Julius Härtl
9381e681a9
Add tests for new account api classes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-15 13:30:31 +02:00
Georg Ehrke
2db26d87c4
filter null values for UserManager::getByEmail 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-10-15 13:27:58 +02:00
Björn Schießle
1ce8672276
Merge pull request #11714 from nextcloud/lookupserver-and-global-scale 
always query the lookup server in a global scale setup
 2018-10-15 12:14:04 +02:00
Christoph Wurst
83e994c11f
Make it possible to enforce mandatory 2FA for groups 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-15 08:22:52 +02:00
Roeland Jago Douma
5b61ef9213
Disallow unsafe-eval by default 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-14 20:45:34 +02:00
Bjoern Schiessle
1b0b159685
add more tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-12 16:11:48 +02:00
Bjoern Schiessle
fd5fc24da2
some small fixes and improvements 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-10 16:07:01 +02:00
Roeland Jago Douma
d5bf2c4523
Move normalizePath to regexes instead of looping 
This is IMO a bit more readable and it seems to make the code faster.
Tested it on the company instance where there are over 3k calls to this
function. It shaves off around 10ms.

The advantage here is that the pattern gets optimized by php itsel and
cached.
Also looking for all patterns at the same time and especially no longer
looping for /./ patterns should save time.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-10 13:23:59 +02:00
Bjoern Schiessle
9e76d4049a
adjust tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-10-09 18:31:33 +02:00
Roeland Jago Douma
c97b4274cc
Add function to generate urls for OCS routes 
fixes #11617

The OCS routes are only absolute for now as they are often exposed to
the outside anyway and are on a different endpoint than index.php in
anyway.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-09 15:41:50 +02:00
Roeland Jago Douma
8493f49211
fixup! fixup! Add backgroundjobs to OCP 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-09 15:25:56 +02:00
Christoph Wurst
3f2cd13beb
Remove HHVM check 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-09 10:12:15 +02:00