Commit Graph

17436 Commits

Author SHA1 Message Date
Roeland Jago Douma c7d5b8fc49
Merge pull request #18079 from nextcloud/fixes/phpcs
Some php-cs fixes
2019-11-25 14:07:00 +01:00
Arthur Schiwon cdf8c16942
reformat Setup.php
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:25 +01:00
Arthur Schiwon f0ff8b0307
reformat code for @skjnldsv <3
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:25 +01:00
Arthur Schiwon 7ff15c9756
fix documentation, get and createGroup may return null
* also have stricter checks in place

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:25 +01:00
Arthur Schiwon 7b1eedb11e
take group creation result into consideration
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:20 +01:00
Roeland Jago Douma daa636260f
Merge pull request #18073 from nextcloud/harden/cache/watcher
Harden watcher
2019-11-25 10:06:04 +01:00
Nextcloud bot 4f2837017c
[tx-robot] updated from transifex 2019-11-23 02:16:07 +00:00
Roeland Jago Douma 68748d4f85
Some php-cs fixes
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 20:52:10 +01:00
Roeland Jago Douma 9a64759af5
Harden watcher
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 13:38:16 +01:00
Nextcloud bot 0d7f55aae9
[tx-robot] updated from transifex 2019-11-22 02:16:16 +00:00
Roeland Jago Douma 5c4b2a2436
Merge pull request #18029 from nextcloud/feature/public-post-login-event
Make the post login event public
2019-11-21 12:39:42 +01:00
Nextcloud bot 37ef64d24e
[tx-robot] updated from transifex 2019-11-21 02:16:02 +00:00
Roeland Jago Douma 2eb24fcf42
Merge pull request #18009 from nextcloud/bugfix/noid/install-with-mysql-8.0.4+
Fix installing with MySQL 8.0.4+
2019-11-20 21:51:16 +01:00
Joas Schilling 77d814d35f
Fix installing with MySQL 8.0.4+
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-20 19:43:31 +01:00
Roeland Jago Douma da25ed997e
Do not check for updates if we have no internet
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-20 19:30:59 +01:00
Christoph Wurst 535000aac6
Make the post login event public
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-11-20 18:43:09 +01:00
Roeland Jago Douma d625d8bd1e
Merge pull request #17824 from nextcloud/fix/dav/catch_forbidden
Catch forbidden http status code
2019-11-20 12:32:00 +01:00
Joas Schilling 6ad54f3f27
Merge pull request #17850 from nextcloud/bugfix/noid/mark-spreed-as-active-on-call-urls
Mark "Talk" active on /call/token URLs
2019-11-20 10:33:45 +01:00
Nextcloud bot afa0f2c0d8
[tx-robot] updated from transifex 2019-11-20 02:16:19 +00:00
Daniel Kesselberg 9055f46351
Make phan happy ;)
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-11-19 16:16:26 +01:00
Nextcloud bot 9707fcf4fe
[tx-robot] updated from transifex 2019-11-19 02:17:47 +00:00
Roeland Jago Douma ccc0a5e0d5
Merge pull request #16828 from nextcloud/feature/noid/accept-incoming-shares
🔗☑️ Accept all incoming shares
2019-11-18 20:11:20 +01:00
Roeland Jago Douma e16321368f
Fixes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-18 16:11:03 +01:00
Roeland Jago Douma 5320f08cd2
Merge pull request #17765 from nextcloud/filecache-extension
Upload time and Creation time
2019-11-18 15:29:49 +01:00
Roeland Jago Douma 8800a7e890
Fix cache moves
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-18 12:48:00 +01:00
blizzz bb77c1447b
Merge pull request #17965 from nextcloud/fix/noid/strict-controller-userid
Fixes a 500 without userid
2019-11-18 12:10:17 +01:00
Roeland Jago Douma a184e350d7
Merge remote-tracking branch 'origin/master' into filecache-extension 2019-11-18 11:06:17 +01:00
Nextcloud bot 7bb3c0201c
[tx-robot] updated from transifex 2019-11-18 02:15:57 +00:00
Roeland Jago Douma c08e803db3
Catch forbidden http status code
If you try to do something on a DAV mount (external or federated share)
that is not allowed. We should not mark the storage as not available but
just fail somewhat gracefully.

Now by catching this and just properly returning the operation will just
fail (and notify the user) which is already a lot better then marking
the storage as unavailable and doing boom.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-17 09:11:15 +01:00
Arthur Schiwon 0a1937208f
Fixes a 500 without userid
plus cleanup of unused use statements

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-16 01:10:19 +01:00
Daniel Kesselberg a27c10daa6
Make isXXX available for bool properties only
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-11-16 00:39:48 +01:00
Christian Oliff 417fd12d3a
HTTPS link to https://en.wikipedia.org/wiki/Server-sent_events
prevents a redirect
2019-11-15 16:19:28 +09:00
Daniel Kesselberg 9cb7252880
Connection::TRANSACTION_READ_COMMITTED is deprecated
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-11-14 20:17:27 +01:00
Arthur Schiwon af6c788efc
pass through ServerNotAvailableException on app init
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-14 17:20:14 +01:00
Nextcloud bot c952bec11d
[tx-robot] updated from transifex 2019-11-14 02:16:16 +00:00
Arthur Schiwon 2efe8aad38
relax dependency on GenericEvent, instead stay compatible with old events
* also fixes tagging events

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-13 14:23:39 +01:00
Robin Appelman f2724992fc
cast ctime and utime
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:56 +01:00
Robin Appelman 4c97181128
filter out empty filecache extension values
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:52 +01:00
Roeland Jago Douma b36f08be43
Update autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-13 12:39:49 +01:00
Robin Appelman 066faaec05
fix folder delete
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:46 +01:00
Robin Appelman 43fa746ad9
dont create empty filecache extended rows
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:43 +01:00
Robin Appelman 136c4ef925
dont expose metadata etag for now
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:36 +01:00
Robin Appelman 1b6e647b63
expose filecache extension data in FileInfo
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 12:39:32 +01:00
Robin Appelman 842da3f183
store filecache extension fields
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 11:30:44 +01:00
Robin Appelman d3b6dbc0bc
move more cache logic to querybuilder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 11:30:41 +01:00
Robin Appelman ac209cea52
add count() as shortcut for count('*') in FunctionBuilder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 11:30:32 +01:00
Robin Appelman 0e9feeb090
return from QueryBuilder instead of IQueryBuilder
this make the type hints work properly with querybuilder subclasses

Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-13 11:30:27 +01:00
Joas Schilling 15f00f0126
Mark "Talk" active on /call/token URLs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 21:39:20 +01:00
Joas Schilling e79ab7d0c5
The share manager knows which provider can accept shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:37:47 +01:00
Joas Schilling 60da25681e
Only restrict loading of group and user shares for now
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:37:00 +01:00
Joas Schilling 520042bbd0
Allow to accept group shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:36:58 +01:00
Joas Schilling e96c9e0e4a
Add the notifier and the API endpoint for user shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:33:50 +01:00
Joas Schilling dcdbea54e6
Respect the accepted flag for group and user shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-12 17:13:38 +01:00
Nextcloud bot 9a460f9e39
[tx-robot] updated from transifex 2019-11-12 02:16:12 +00:00
Roeland Jago Douma 323c76cd48
Merge pull request #17859 from nextcloud/bugfix/app-init
Fix app class setup warnings
2019-11-11 12:35:55 +01:00
Julius Härtl 3c09299346
Do not throw an exception for base App class
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-11-08 11:41:42 +01:00
Nextcloud bot e9fb725b9e
[tx-robot] updated from transifex 2019-11-08 02:16:14 +00:00
Roeland Jago Douma c0398e9a38
Merge pull request #17830 from nextcloud/global-quota-return-quota
actually return the quote when getting global storage info
2019-11-07 23:53:04 +01:00
blizzz 9fe4b953e9
Merge pull request #17822 from nextcloud/fix/noid/tip-download-to-node-api
switch to Files Node API for zip generation
2019-11-07 11:03:18 +01:00
Arthur Schiwon f9bfd48e12
switch to Files Node API for zip generation
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-07 09:45:23 +01:00
Roeland Jago Douma 03d9e05bb5
Merge pull request #17696 from nextcloud/enh/17659/hide-objectstore-credentials
Remove objectstore credentials
2019-11-07 09:14:42 +01:00
Nextcloud bot f886d2f599
[tx-robot] updated from transifex 2019-11-07 02:15:55 +00:00
Robin Appelman 5df98d7265
actually return the quote when getting global storage info
prevents 'undefined' index errors when 'include external storage in quota' is enabled

Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-06 10:18:47 +01:00
John Molakvoæ (skjnldsv) eebcf89091
Cleanup sharing leftovers
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-11-05 19:03:44 +01:00
Nextcloud bot 5b5b451719
[tx-robot] updated from transifex 2019-11-05 02:15:46 +00:00
Christoph Wurst a767a2f0a3
Merge pull request #17735 from tcoupin/fix-reshare-circle
Fix reshare with circle
2019-11-04 23:40:03 +01:00
Robin Appelman 5ca27085fc
mark getAppContainer as a valid way to construct app containers
this is triggerd (and not cought by the query arm) if an item from an app is queried before the app queries it's own Application instance

Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-04 19:40:08 +01:00
John Molakvoæ 13960b69da
Merge pull request #17509 from nextcloud/fix/application-singleton
Fix Application instances created multiple times
2019-11-04 18:18:32 +01:00
blizzz 64bfd4bbeb
Merge pull request #17506 from nextcloud/bugfix/12790/workflow-frontend
Workflow frontend polishing
2019-11-04 15:01:55 +01:00
Nextcloud bot e517ca0530
[tx-robot] updated from transifex 2019-11-04 02:15:26 +00:00
Nextcloud bot 827a3c545a
[tx-robot] updated from transifex 2019-11-03 02:16:06 +00:00
Daniel Kesselberg f81c6adad6
Add information about credentials
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-10-31 20:42:41 +01:00
MichaIng 5afd7abf44
Add missing newlines to .htaccess
Signed-off-by: MichaIng <micha@dietpi.com>
2019-10-31 20:15:49 +01:00
Roeland Jago Douma fd475d4212
Merge pull request #17739 from nextcloud/enh/share/filter
Get all shares iterable
2019-10-31 19:28:29 +01:00
Daniel Schneider 3c323d2cbb
#17661 2019-10-30 20:00:21 +01:00
Daniel Calviño Sánchez ea55f8eedd fixup! Get all shares as iterable
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2019-10-30 14:26:37 +01:00
Roeland Jago Douma 938428c275
Merge pull request #17674 from nextcloud/enh/do_not_show_footer_sub
Do not show 'Get your own free account' on services under subscription
2019-10-30 10:54:42 +01:00
Roeland Jago Douma 8085ca4cc4
Get all shares as iterable
Sometimes we need all shares or rather a specific subset of shares but
creating dedicated functions is a pain. This just returns an iterable
object for all shares so we can loop over them without allocating all
the memory on the system.

It should not be used by any user called code. But in an occ command or
background job it is fine IMO.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-30 09:45:27 +01:00
Roeland Jago Douma 380563fd53
Merge pull request #17562 from nextcloud/techdebt/17509/log-error-when-setting-up-application-incorrectly
Log an error in development cases when the application class was set …
2019-10-29 21:09:26 +01:00
Roeland Jago Douma 043b56cb7d
Having the contructor in the interface makes no sense...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-29 19:29:38 +01:00
Arthur Schiwon 9c766cf03f
do not break on Checkers that do not need specific context info
request time, for example

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-10-29 18:03:57 +01:00
Thibault Coupin 7cca169d98 Fix reshare with circle
Signed-off-by: Thibault Coupin <thibault.coupin@gmail.com>
2019-10-29 14:56:52 +01:00
John Molakvoæ (skjnldsv) ea6f423e2c Extend data returned when searching remote shares
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-10-29 12:55:59 +01:00
Roeland Jago Douma bc9b223e65
Fix DAV mimetype search
Fixes #15048
Catches the case where a full mimetype is sumbitted in the where like
clause. Before we didn't catch this and it was just forwarded as is
causing invalid queries.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-28 21:56:29 +01:00
Roeland Jago Douma f763219f19
Merge pull request #17712 from nextcloud/enh/limit_hardening/database/user
Make sure limit is never negative
2019-10-28 13:59:09 +01:00
Roeland Jago Douma 70500e25ad
Merge pull request #17173 from nextcloud/feature/event-broadcasting
Make it possible to broadcast events to (web) clients
2019-10-28 13:58:35 +01:00
Christoph Wurst d180a98714
Make it possible to broadcast events to (web) clients
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-10-28 13:58:13 +01:00
Roeland Jago Douma dd185e383d
Make sure limit is never negative
There were some cases where a negative limit could be passed in. Which
would happily make the query explode.

This is just a quick hack to make sure it never is negative.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-28 13:07:43 +01:00
Daniel Kesselberg 83af640780
Remove objectstore credentials
Also remove the username for Swift v2 and add todo for unclear keys.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-10-27 00:51:39 +02:00
Daniel Kesselberg 8e44e0134a
Remove objectstore credentials
S3: key and secret
Swift v3: user.name and user.password

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-10-27 00:41:01 +02:00
Roeland Jago Douma 931c68c0bf
Do not show 'Get your own free account' on services under subscription
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-25 16:46:32 +02:00
Roeland Jago Douma e71f222082
Cleanup theming mess
* Do not do translations in the constructor. This gets called to early
so there is no user yet. Which means we can't obtain the locale. Which
means we store the wrong translation instance.

* Same for the theming app magic. Just use the parent call when needed.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-25 13:31:19 +02:00
Roeland Jago Douma 6a560fd51e
Don't pass in the locale as the language
This messes with the translation of the date names etc.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-25 13:29:51 +02:00
Nextcloud bot baee9ddc35
[tx-robot] updated from transifex 2019-10-23 02:15:24 +00:00
Julius Härtl 7636b9e164
Fix help route in navigation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-10-22 17:56:55 +02:00
Christoph Wurst ce9a434fb2
Add isXXX getter to Entity
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-10-22 14:54:21 +02:00
blizzz 923735021b
Merge pull request #17568 from nextcloud/fix/noid/move-away-from-deprecated-event
use OCP\EventDispatcher\Event over Symfony's deprecated Event
2019-10-21 13:40:36 +02:00
Roeland Jago Douma 8d094920c3
Merge pull request #17594 from nextcloud/dont-cache-notfound
Dont cache empty url for not found routes
2019-10-21 12:06:49 +02:00
Roeland Jago Douma 2276cb12c4
Merge pull request #17547 from nextcloud/enh/noid/log-exception-json-escape
Do not escape slashes for logged exceptions
2019-10-21 11:14:03 +02:00
Nextcloud bot 560d9c3006
[tx-robot] updated from transifex 2019-10-21 02:15:49 +00:00
Robin Appelman 219905b9c8
Dont cache empty url for not found routes
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-10-18 18:20:25 +02:00
Arthur Schiwon e8095cf737
use OCP\EventDispatcher\Event over Symfony's deprecated Event
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-10-17 13:31:48 +02:00
John Molakvoæ bd5189f29f
Let SCSS cleanup only run once (#17543)
Let SCSS cleanup only run once
2019-10-17 10:03:08 +02:00
Roeland Jago Douma 098ab7af4b
Do DI on registered middleware as well
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-16 22:52:48 +02:00
Joas Schilling aad535e3af
Log an error in development cases when the application class was set up incorrectly
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-10-16 12:17:09 +02:00
Julius Härtl a9c089064b
Deprecate TemplateManager
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-10-16 09:54:17 +02:00
Julius Härtl 0a4dd3605b
Do not escape slashes for logged exceptions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-10-15 16:09:23 +02:00
Julius Härtl ee743867d4
Make sure the cache is only reset once at a time
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-10-15 15:17:16 +02:00
Julius Härtl e51010b0f4
Use a distributed cache for the isCachedCache
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-10-15 11:56:02 +02:00
Daniel Kesselberg 0ecc70c497
Assume that getType is available
From PHP7 getType is always available. No need to check it nowdays.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-10-14 09:50:12 +02:00
Daniel Kesselberg ace74ef866
Fix ReflectionType::__toString() is deprecated
As of PHP 7.1.0, ReflectionType::__toString() is deprecated, and ReflectionParameter::getType() may return an instance of ReflectionNamedType. To get the name of the parameter type, ReflectionNamedType() is available in this case.

https://www.php.net/manual/en/reflectionparameter.gettype.php
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-10-14 09:50:06 +02:00
Nextcloud bot c6b9f073ed
[tx-robot] updated from transifex 2019-10-14 02:15:09 +00:00
Nextcloud bot 7f8ff16c76
[tx-robot] updated from transifex 2019-10-12 02:15:10 +00:00
Christoph Wurst f6a79338d4
Make sure we create an app's Application class just once
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-10-11 08:21:24 +02:00
Roeland Jago Douma 1e8f063aed
Merge pull request #17484 from nextcloud/bugfix/activity-last-timestamp-merged
Always use the latest timestamp for merged activities
2019-10-10 20:30:16 +02:00
Roeland Jago Douma 5917644536
Merge pull request #17276 from nextcloud/storage-id-eq
Get single storage id using `eq` instead of `in`
2019-10-09 15:17:49 +02:00
Julius Härtl a41ed39bf2
Always use the latest timestamp for merged activities
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-10-09 11:25:37 +02:00
Roeland Jago Douma 5122629bb0
Make renewSessionToken return the new token
Avoids directly getting the token again. We just inserted it so it and
have all the info. So that query is just a waste.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-09 10:10:37 +02:00
Roeland Jago Douma 3fccc7dc47
Cache the public key tokens
Sometimes (esp with token auth) we query the same token multiple times.
While this is properly indexed and fast it is still a bit of a waste.

Right now it is doing very stupid caching. Which gets invalidate on any
update.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-08 13:57:36 +02:00
Roeland Jago Douma 075a0b24d5
Merge pull request #17431 from johkoenig/bugfix/17377/trusted_domain_helper_case_insensitive
make TrustedDomainHelper case insensitive
2019-10-08 08:51:11 +02:00
Roeland Jago Douma f2d44b87bb
Merge pull request #17440 from nextcloud/enh/noid/log-json-escape
Do not escape slashes in log json
2019-10-08 08:48:52 +02:00
Daniel Kesselberg fdf4e1ebb2
Remove duplicate code
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-10-08 00:46:50 +02:00
Julius Härtl 29a6f2d830
Do not escape slashes in log json
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-10-07 13:39:40 +02:00
Johannes Koenig 2df8d646c1 make TrustedDomainHelper case insensitive
Signed-off-by: Johannes Koenig <mail@jokoenig.de>
2019-10-06 20:43:55 +02:00
Nextcloud bot e20dbc04ba
[tx-robot] updated from transifex 2019-10-06 02:15:13 +00:00
John Molakvoæ 62399c76e8
Allow group displaynames in the database backend (#17221)
Allow group displaynames in the database backend
2019-10-05 18:34:14 +02:00
Roeland Jago Douma 6db51324fa
Fix DB usersInGroups fetching
* Follow the interface defaults
* Only set limit or offset if they are properly set

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-10-02 09:43:35 +02:00
blizzz 47ab961aa7
Merge pull request #17001 from nextcloud/fix/noid/addressbookchanges-avatar
reduce adressbook change events and handling
2019-10-01 12:17:35 +02:00
Christoph Wurst de6940352a Move settings to an app
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-09-28 09:39:28 +00:00
Nextcloud bot 8ca587be3a
[tx-robot] updated from transifex 2019-09-28 02:14:51 +00:00
Joas Schilling b9f963225f
Do not allow to have an empty display name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-27 14:29:57 +02:00
Joas Schilling 00859f46f3
Fix DI issue
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-27 14:29:56 +02:00
Joas Schilling 0bb05bbaf8
Update autoloader
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-27 14:29:56 +02:00
Joas Schilling a54ff49c6b
Remove inherited docs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-27 14:29:56 +02:00
Joas Schilling 653628c8fb
Allow to set the group display name in the database backend
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-27 14:29:56 +02:00
Joas Schilling 45506adc5c
Add a displayname to the database group backend
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-27 14:29:56 +02:00
Roeland Jago Douma cc6874df19
Merge pull request #17264 from nextcloud/move-from-storage-wrappers
handle moveFromStorage within the same storage even when storage wrap…
2019-09-26 15:48:59 +02:00
Robin Appelman bde791cec9
use eq instead of in for loading single storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-09-26 15:04:04 +02:00
Robin Appelman 1a8f9b8b1d
log which storage id can't be inserted
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-09-26 15:04:00 +02:00
MichaIng c7e66ec848
Add "Order" to assure that no parental "Allow" can grant access
Signed-off-by: MichaIng <micha@dietpi.com>
2019-09-26 12:38:58 +02:00
Roeland Jago Douma 1cb1b132ca
Merge pull request #17252 from nextcloud/bugfix/noid/user-0-can-not-comment
Fix user with id 0 to be able to comment
2019-09-26 11:30:56 +02:00
Roeland Jago Douma 6ac67011f4
Merge pull request #17262 from nextcloud/objectstore-remove-cache-on-delete
dont delete cache entries if deleting an object from object store failed
2019-09-26 11:24:02 +02:00
Joas Schilling 472ce5cbce
Merge pull request #17181 from nextcloud/feature/noid/talk-attachment
Add talk-attachment as a rich object type
2019-09-26 09:27:03 +02:00
Robin Appelman 35f317df7b
handle moveFromStorage within the same storage even when storage wrappers are applied to the source storage
the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that

Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this

Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-09-25 19:17:06 +02:00
Robin Appelman 733d4b6cca
dont delete cache entries if deleting an object from object store failed
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-09-25 18:09:45 +02:00
Joas Schilling e4b36f4f47
Fix user with id 0 to be able to comment
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-25 09:07:07 +02:00
Nextcloud bot c99fcd63f8
[tx-robot] updated from transifex 2019-09-25 02:14:47 +00:00
Nextcloud bot 61d22ff6cf
[tx-robot] updated from transifex 2019-09-24 02:14:41 +00:00
Roeland Jago Douma 48a00b88e1
Merge pull request #17163 from nextcloud/bugfix/noid/print-error-on-data-dir-error
Print error on data dir error
2019-09-23 10:08:58 +02:00
Roeland Jago Douma b2aec1d816
Merge pull request #17206 from nextcloud/logger-catch-exceptions
catch exceptions that occur during logging
2019-09-19 18:33:45 +02:00
Robin Appelman 2943c18548
catch exceptions that occur during logging
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-09-19 13:39:40 +02:00
Christoph Wurst a5869be60f Fix l10n in federated file sharing
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-09-19 12:57:45 +02:00
Nextcloud bot ce10683944
[tx-robot] updated from transifex 2019-09-19 02:15:38 +00:00
Roeland Jago Douma 210a0554a2
Use the actual password to update the tokens
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-18 19:50:58 +02:00
Daniel Kesselberg ee76b0fbd2
Add uid to delete temp token query
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-09-18 16:52:42 +02:00
Roeland Jago Douma 3efd9a12d7
Merge pull request #17175 from nextcloud/feature/noid/make-getById-work-for-files-in-appdata
Fix getById for files in appdata and the root mount
2019-09-18 13:44:52 +02:00
Joas Schilling 23cf72493a
Add talk-attachment as a rich object type
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-17 15:08:54 +02:00
Nextcloud bot 8cc41974a4
[tx-robot] updated from transifex 2019-09-17 12:33:26 +00:00
Joas Schilling a4ba2113b2
Fix getById for files in appdata and the root mount
In case the path we are currently in is inside the appdata_* folder,
the original getById method does not work, because it can only look inside
the user's mount points. But the user has no mount point for the root storage.

So in that case we directly check the mount of the root if it contains
the id. If it does we check if the path is inside the path we are working
in.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-17 11:15:59 +02:00
Joas Schilling ad7d13a87c
Print the error pages as error so we load less scripts and might be able to view it
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-16 19:38:43 +02:00
Joas Schilling e53d5b2dbe
Print plain error when the error page errors too
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-16 19:38:13 +02:00
Roeland Jago Douma 978d312e69
Merge pull request #17151 from nextcloud/td/remove/createPreview
Remove deprecated function createPreview
2019-09-15 19:36:18 +02:00
Greta Doci 0a874c51af
Disable app token creation for impersonated people, ref #15539
Signed-off-by: Greta Doci <gretadoci@gmail.com>
2019-09-15 12:04:27 +02:00
Roeland Jago Douma 98f91982be
Remove deprecated function createPreview
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-15 10:52:34 +02:00
Roeland Jago Douma 2b98eea129
Harden identifyproof openssl code
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-14 13:52:10 +02:00
Christoph Wurst a1ef939c06
Use Symfony's new contract Event class instead of the deprecated one
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-09-12 14:44:55 +02:00
blizzz ac48a9ba61
Merge pull request #17106 from nextcloud/feature/dispatch-typed-event
Add Symfony inspired typed event dispatcher method
2019-09-12 09:25:26 +02:00
Roeland Jago Douma 1b8d6df6cd
Merge pull request #17084 from nextcloud/refactor/symfony-dispatcher-signature
Use the new Symfony event dispatcher signature
2019-09-11 22:08:38 +02:00
Christoph Wurst b9e14d5972
Add Symfony inspired typed event dispatcher method
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-09-11 20:02:50 +02:00
Joas Schilling 15d39c48e6
Merge pull request #17021 from nextcloud/bye-spreed-hello-talk
Bye Spreed namespace, hello Talk!
2019-09-11 14:59:37 +02:00
Roeland Jago Douma 2187f856ce
Merge pull request #16682 from nextcloud/enh/12790/workflow-backend
workflow overhaul
2019-09-11 13:14:06 +02:00
Roeland Jago Douma 41cbb05aea
Split personal security settings in code
Instead of one big monolitic sections this is the first step in breaking
down the settings. This should make is easiet to see what does what. As
well as nicely splitting up the sections.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-10 16:22:41 +02:00
Christoph Wurst 222b458280
Use the new Symfony event dispatcher signature
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-09-10 11:26:55 +02:00
Arthur Schiwon 3a4e31ef6b
fix missing @since's
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:06 +02:00
Arthur Schiwon ae1cc1d14d
entities equip the RuleMatcher on the events they are aware of
Operations will receive the matcher instance

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:06 +02:00
Arthur Schiwon 849d025d09
let a dedicate service serve a stateful process
* includes making ICheck not requiring any context setter
* and IFileCheck extending the IEntityCheck as entity data can be handed in
  via Dispatcher

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:05 +02:00
Arthur Schiwon 4cd931fcc6
require IChecks to receive entity context
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:05 +02:00
Arthur Schiwon fd2de58503
seperate setFileInfo from ICheck
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:05 +02:00
Julius Härtl 5891ec602f
Return actual event data instead of self calling
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-09-09 22:56:05 +02:00
Arthur Schiwon c2a52813e2
extends ICheck with scope and entity support, provide them as initialState
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:04 +02:00
Arthur Schiwon d2c8b939d5
WFE as proxy listen to relevent events and forwards them
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:04 +02:00
Arthur Schiwon bed518e8ab
introduce GenericEntityEvent and adapt File entity
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:04 +02:00
Arthur Schiwon 20901c59d4
emit file events via Dispatcher, too
another step to get rid of hooks and emitters

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:04 +02:00
Arthur Schiwon f0f0a7b43e
adds a trigger hint for complex operations
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:03 +02:00
Arthur Schiwon 26b19b73a4
remove IEntity's getId in favor of class name
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:02 +02:00
Arthur Schiwon 4c2fdbb908
merge IOperator with IOperation for simplicity
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:02 +02:00
Arthur Schiwon ec36c0ae80
add operator interfaces / API
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:02 +02:00
Arthur Schiwon 2288363b0f
add missing @since annotations
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:02 +02:00
Arthur Schiwon bd5c455da4
the workflow manager becomes scope aware, Part 1
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:01 +02:00
Arthur Schiwon 804d4fe69f
introducing Entity interfaces and a File one as first implementation
also adds admin settings that pass entities as initial state

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:01 +02:00
Arthur Schiwon 445d6eb839
open the WFE to deal with other subjects but files
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-09 22:56:01 +02:00
Roeland Jago Douma a85f2f4165
set default CSP on NotFoundResponse
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-09 22:37:12 +02:00
Roeland Jago Douma bf6082e119
Merge pull request #16836 from nextcloud/fix/16724/smb-availability
Fix SMB availability status + higher delay on auth issues
2019-09-09 16:50:42 +02:00
Roeland Jago Douma b3f663b8aa
Merge pull request #16859 from PhrozenByte/patch-1
Add IAppManager::getAppWebPath()
2019-09-09 12:20:27 +02:00
Roeland Jago Douma ac19017461
Merge pull request #16962 from nextcloud/keep-cypress-git
Kill repair step for cypress
2019-09-08 21:29:01 +02:00
Nextcloud bot 365f30b05b
[tx-robot] updated from transifex 2019-09-08 02:16:42 +00:00
Roeland Jago Douma 1cfb851300
Merge pull request #17006 from nextcloud/querybuilder-max-min
add MAX and MIN to functionbuilder
2019-09-07 11:09:11 +02:00
Robin Appelman 8ef5a366ec
add MAX and MIN to functionbuilder
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-09-06 12:28:17 +02:00
Nextcloud bot 1a7310f4b3
[tx-robot] updated from transifex 2019-09-06 02:15:01 +00:00
Daniel Rudolf 2d56664e35
Improve usage of IAppManager::getAppWebPath()
Deprecate \OC_App::getAppWebPath() and \OC_App::getAppPath()

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
2019-09-05 18:35:40 +02:00
Joas Schilling 858b18e34a
Bye Spreed namespace, hello Talk!
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-05 15:32:58 +02:00
Arthur Schiwon 3ce5d4e545
reduce adressbook change events and handling
... from four to one on avatar updates

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-09-04 13:46:25 +02:00
Julius Härtl 64fe9bc287
Return the proper jailed path when requesting the root path
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-09-04 13:25:17 +02:00
Roeland Jago Douma b7301f40dd
Merge pull request #16972 from nextcloud/enh/default_client_timeout
Set a default request timeout
2019-09-04 08:08:48 +02:00
Roeland Jago Douma ecd0d39c30
Merge pull request #16928 from nextcloud/fix/icontrolelrmethodreflector
Remove reflect method form public interface
2019-09-03 07:53:36 +02:00
Roeland Jago Douma 6188734579
Merge pull request #16964 from phpbg/master
Fix sanity checks #16963
2019-09-03 07:50:11 +02:00
Nextcloud bot 0d1df80fbf
[tx-robot] updated from transifex 2019-09-03 02:15:06 +00:00
Roeland Jago Douma ca2623e6ad
Set a default request timeout
This to avoid endless running processes.
A default timeout of 30 seconds should cover the 99% case. If a job need
specific longer time it should set that.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-02 15:42:48 +02:00
Joas Schilling 60fe0d7fc4
Define a guest type so Talk can use it in it's notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-02 14:56:50 +02:00
Daniel Kesselberg 62ded4ad50
Kill repair step for cypress tests
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-09-02 11:50:23 +02:00
Samuel CHEMLA 94eb77a535 Fix sanity checks #16963
Signed-off-by: Samuel CHEMLA <chemla.samuel@gmail.com>
2019-09-01 22:27:08 +02:00
Daniel Kesselberg 2d04be27df
Keep cypress if git
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-09-01 20:46:13 +02:00
Roeland Jago Douma def82c5077
Remove reflect method form public interface
The reflect method is (and should) only every be called internally.
Since if you call it again it would otherwise start mixing and matching
arguments etc.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-30 13:28:18 +02:00
Nextcloud bot 50769b5966
[tx-robot] updated from transifex 2019-08-30 02:15:12 +00:00
Roeland Jago Douma 7889961103
Merge pull request #16925 from nextcloud/bugfix/throwable-middleware
Handle throwables in the http dispatcher
2019-08-29 20:24:13 +02:00
Julius Härtl 299759b836
Handle throwables in the http dispatcher
Co-authored-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-08-29 17:19:14 +02:00
Roeland Jago Douma 35db32f504
Add deprecation warning
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-29 14:52:50 +02:00
Roeland Jago Douma 130fdf5006
Merge pull request #16913 from nextcloud/fix/declare_members
SessionMiddleware: declare session property
2019-08-29 09:54:45 +02:00
Roeland Jago Douma f0c5bacc03
Merge pull request #16912 from nextcloud/fix/duplicate_array_key
Make sure they keys are unique
2019-08-28 20:29:56 +02:00
Roeland Jago Douma 3f12ec95f0
SessionMiddleware: declare session property
* Remove request since we don't useit
* Update tests as well

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-28 13:02:29 +02:00
Roeland Jago Douma c73b4f25c3
Make sure they keys are unique
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-28 12:55:07 +02:00
Nextcloud bot cdd491c706
[tx-robot] updated from transifex 2019-08-28 02:15:26 +00:00
Joas Schilling b1a0d464ba
Merge pull request #16723 from nextcloud/fix/sharing/unshare-message
Add expiration event for shares
2019-08-26 12:58:51 +02:00
John Molakvoæ 40edabaf61
Merge pull request #16795 from nextcloud/enh/phpstan/limiter
Fix report of phpstan in Limiter
2019-08-26 11:42:03 +02:00
Daniel Rudolf 34919d3ebc
Add IAppManager::getAppWebPath()
Implements a public API for \OC_App::getAppWebPath()

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
2019-08-25 15:27:04 +02:00
blizzz f515da4f3c
Merge pull request #16845 from nextcloud/bugfix/noid/public-constants
Make the sharing constants publicly available
2019-08-23 23:15:15 +02:00
Joas Schilling 92862c51f5
Always check via http and https whether htaccess is working
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-23 14:33:58 +02:00
Joas Schilling b130a4c8fb
Make the sharing constants publicly available
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-23 13:54:19 +02:00
Arthur Schiwon 43bc31bacb
set a storage availability delay on auth issues to avoid lock out
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-08-22 12:40:15 +02:00
Nextcloud bot 182517e0b3
[tx-robot] updated from transifex 2019-08-22 02:14:34 +00:00
Roeland Jago Douma 1e74ffd46b
Merge pull request #16820 from nextcloud/bugfix/noid/access-handling-of-projects
Change access handling of projects
2019-08-21 22:02:50 +02:00
blizzz 9ac15bc4e9
Merge pull request #16813 from compagnon/fix/noid/AutoloadNotAllowedException-theming-off
autoloader.php could raise Not AllowedException
2019-08-21 16:04:32 +02:00
Joas Schilling 69f2974706
Only trigger the events with tags that where actually assigned
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-21 11:58:27 +02:00
Joas Schilling 23bd4c127d
Add a repair step to clear the projects access cache
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-21 09:16:14 +02:00
Joas Schilling b53283fcb7
Change the logic so projects are only shown when you can access all resources
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-21 09:16:14 +02:00
John Molakvoæ (skjnldsv) b557f52c22
Add expiration event for shares
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-08-21 08:30:17 +02:00
Roeland Jago Douma dd02920aed
Merge pull request #16811 from nextcloud/bugfix/16771/correctly-remove-apps-without-any-releases
Correctly remove apps without any releases
2019-08-20 22:29:20 +02:00
Roeland Jago Douma 1dda6fb05b
Merge pull request #16812 from nextcloud/bugfix/noid/previewv1-returntype
Explicit cast for ProviderV1Adapter
2019-08-20 22:28:43 +02:00
Guillaume COMPAGNON 0516675a5c autoloader.php could raise Not AllowedException
when theming is off

Signed-off-by: Guillaume Compagnon <gcompagnon@outlook.com>

	modified:   lib/private/TemplateLayout.php
2019-08-20 17:11:40 +02:00
Julius Härtl d3d37aa19d
Explicit cast for ProviderV1Adapter
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-08-20 15:47:59 +02:00
Joas Schilling 17096adff9
Correctly remove apps without any releases
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-20 14:47:46 +02:00
Joas Schilling 323642454a
Undefined variable response when server is no nextcloud anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-20 12:54:58 +02:00
Joas Schilling 650e4f9f4c
Merge pull request #16793 from nextcloud/bugfix/noid/filter-more-configs
Filter more configs
2019-08-20 09:01:20 +02:00
Nextcloud bot ddec3fc416
[tx-robot] updated from transifex 2019-08-20 02:14:48 +00:00
Roeland Jago Douma 1614dee6dc
Codechecker: removed unused use
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-19 19:41:46 +02:00
Roeland Jago Douma 7927aebdeb
Fix report of phpstan in Limiter
* unneeded arguments to constructor
* added return types
* let automatic DI do its work

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-19 19:38:43 +02:00
Joas Schilling b6c78eb9d4
Filter more configs
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-08-19 16:32:20 +02:00
MichaIng 51a35bb1cb
Minor syntax
+ Use Apache syntax with cases according to official docs: https://github.com/nextcloud/server/pull/16792/files#r315207691
+ Add missing whitespace for concatenating strings to variable: https://github.com/nextcloud/server/pull/16792/files#r315207520
+ Apache 2.5 will be released as 2.6: https://github.com/nextcloud/server/pull/16792/files#r315206147

Signed-off-by: Micha Felle <micha@dietpi.com>
2019-08-19 15:50:48 +02:00
MichaIng 01b558c8b4
Update lib/private/Setup.php
+ Remove unnecessary spaces from code

Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
2019-08-19 15:29:48 +02:00
MichaIng dcbf8fa8e3
Harden data protection .htaccess
+ Set "Satisfy All" whenever available, as well on Apache 2.4+. This is required to override possible "Satisfy Any" on parent dir, which otherwise would allow direct access to data, regardless of "Require" directive.
+ Set "Deny from all" as well whenever available, to block access regardless of which access control directive takes priority.
+ Assume Apache 2.2 only, if mod_authz_core and mod_access_compat are both not available, to avoid doubled directives. In this case set "Deny from all" directive only if the providing mod_authz_host module is available. "Satisfy" is a core directive on Apache 2.2.
+ Update Apache version strings. Regarding the used directives/modules, Apache 2.4 and 2.5 behave the same.
+ Add ordering spaces to better reflect the nested directives and to match style of other .htaccess files.

Fixes: https://github.com/nextcloud/server/issues/6449

Signed-off-by: Micha Felle <micha@dietpi.com>
2019-08-19 15:09:44 +02:00