Commit Graph

16155 Commits

Author SHA1 Message Date
Morris Jobke 35e3d40e80
Merge pull request #12188 from nextcloud/revert/9900/revert-wait-for-cron
Revert "Wait for cron to finish before running upgrade command"
2018-11-01 21:52:20 +01:00
Morris Jobke 35a7ea869e
Merge pull request #12152 from brad2014/bugfix/12151/fix-emailtemplate-list-formatting
Fix issue #12151: fix list formatting by correcting malformed html
2018-11-01 16:30:22 +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
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 c6a48110bf
allways fall back to fopen for encryption wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-31 21:10:51 +01:00
Roeland Jago Douma 3477517cb7
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-31 21:10:48 +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 3ee7597be0
Merge pull request #12166 from nextcloud/feature/limit_preview_sizes
Only generate previews in powers of 4 and set min
2018-10-31 20:25:53 +01:00
Maxence Lange 0c8c6ad5c7
missing type
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-10-31 19:43:18 +01:00
Maxence Lange feeb62a496
wrong method called
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-10-31 19:43:18 +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
brad2014 3442ffeb54 Fix bug #12151: fix list formatting by correcting malformed html
Signed-off-by: Brad Rubenstein <brad@wbr.tech>
2018-10-30 15:28:55 -07:00
Roeland Jago Douma a3e9e0f8c6
Merge pull request #12047 from nextcloud/interfaces-files-fulltextsearch
Public interfaces Files_FullTextSearch
2018-10-30 21:16:13 +01:00
Roeland Jago Douma a51c8377d4
Merge pull request #12140 from nextcloud/fix/expired_token_throttler
Expired tokens should not trigger bruteforce protection
2018-10-30 20:17:03 +01:00
Maxence Lange 98c1d9e7ab +files_fulltextsearch in autoloader
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-10-30 20:07:29 +01:00
Maxence Lange 6265278728 Merge remote-tracking branch 'origin/interfaces-files-fulltextsearch' into interfaces-files-fulltextsearch
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-10-30 19:59:35 +01:00
Roeland Jago Douma ddd39f9dc3
Merge pull request #12056 from nextcloud/interfaces-fulltextsearch-2
Public interfaces FullTextSearch
2018-10-30 19:53:01 +01:00
Roeland Jago Douma 2223d19997
Error out early on an expired token
Fixes #12131

If we hit an expired token there is no need to continue checking. Since
we know it is a token.

We also should not register this with the bruteforce throttler as it is
actually a valid token. Just expired. Instead the authentication should
fail. And buisness continues as usual.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 19:30:45 +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
Maxence Lange 750196aa7f public interfaces FullTextSearch
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-@return mixed

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Merge remote-tracking branch 'origin/interfaces-fulltextsearch-2' into interfaces-fulltextsearch-2

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-10-30 18:24:15 +01:00
Roeland Jago Douma abbb946bbb Propegate hide download state in share provider
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 15:18:55 +01:00
Roeland Jago Douma bc960bae02 Extend IShare to show hide download state
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 15:18:55 +01:00
Roeland Jago Douma 81f37401f9 Add db column to store hide download state
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 15:18:55 +01:00
Roeland Jago Douma c1698948b8
Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauth
Reset bruteforce on token refresh OAuth
2018-10-30 14:26:50 +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
Roeland Jago Douma 75456b057d
Reset bruteforce on token refresh OAuth
When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.

This resets the brute force attempts for that UID on a valid refresh of
the token.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 11:21:27 +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 cb463d73d5
Add name field to mail and remote results
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:36 +01:00
Julius Härtl 7a65779316
Add local share if remote cloud id matches a local user ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:35 +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 870e01518d
Add type to Remote and Mail plugins
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:34 +01:00
Julius Härtl a1c6e44700
Add collaborators uuid to properly render the avatar and for later grouping
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:33 +01:00
Julius Härtl d7caf841df
Filter out generic remote result for local users
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:33 +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
Morris Jobke c9e6a99637
Merge pull request #12085 from nextcloud/add-gss-to-excluded-backends
add global site selector as user back-end which doesn't support password confirmation
2018-10-30 10:16:07 +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
Morris Jobke 13fe7b6fc1
Merge pull request #11627 from nextcloud/feature/noid/cli-remove-app
Add occ app:remove CLI command
2018-10-30 00:35:45 +01:00
Morris Jobke 0999f07964
Merge pull request #12052 from nextcloud/bugfix/11594/fix-setup-check-trusted-proxies
Fix setup check trusted proxies
2018-10-29 23:38:37 +01:00
Morris Jobke 963d968f06
Merge pull request #12113 from nextcloud/fileinfo-getextension
Add getExtension() to FileInfo
2018-10-29 17:23:27 +01:00
Robin Appelman e5c3e4b76f
Add getExtension() to FileInfo
this is a fairly common operation so it makes sense to prevent having
to repeatedly implement it.

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-29 15:24:02 +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 aec0a6c096
Fix icon cacher url matching
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-29 12:09:30 +01:00
Nextcloud bot 18fef12721
[tx-robot] updated from transifex 2018-10-29 01:13:07 +00:00
Bjoern Schiessle 85d9f06cb8
add global site selector as user back-end which doesn't support password confirmation
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-27 15:43:51 +02:00
Nextcloud bot 0092e3adec
[tx-robot] updated from transifex 2018-10-27 00:12:35 +00:00
Nextcloud bot aff53d6e34
[tx-robot] updated from transifex 2018-10-26 00:12:48 +00:00
Daniel Kesselberg 986f4df2a5
Add REMOTE_ADDR to getHeader
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-10-25 22:26:49 +02:00
Maxence Lange ed11811dbe implementing files_fulltextsearch within core
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-10-25 18:17:52 +02:00