summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16792 from MichaIng/patch-1Roeland Jago Douma2019-12-191-13/+23
|\ | | | | Harden data and config protection .htaccess
| * Merge branch 'master' into patch-1MichaIng2019-12-04611-4226/+6630
| |\
| * | Add missing newlines to .htaccessMichaIng2019-10-311-2/+2
| | | | | | | | | Signed-off-by: MichaIng <micha@dietpi.com>
| * | Add "Order" to assure that no parental "Allow" can grant accessMichaIng2019-09-261-0/+2
| | | | | | | | | Signed-off-by: MichaIng <micha@dietpi.com>
| * | Minor syntaxMichaIng2019-08-191-21/+21
| | | | | | | | | | | | | | | | | | | | | + 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>
| * | Update lib/private/Setup.php MichaIng2019-08-191-1/+1
| | | | | | | | | | | | | | | + Remove unnecessary spaces from code Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Harden data protection .htaccessMichaIng2019-08-191-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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>
* | | Merge pull request #18470 from nextcloud/techdebt/app-code-checker-php7-onlyRoeland Jago Douma2019-12-191-1/+1
|\ \ \ | | | | | | | | Only parse php7 code in app code checker
| * | | Only parse php7 code in app code checkerChristoph Wurst2019-12-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-1920-0/+40
|/ / /
* | | Merge pull request #18456 from nextcloud/fix/office/previewsRoeland Jago Douma2019-12-181-1/+1
|\ \ \ | | | | | | | | Fix Office preview generation
| * | | Fix Office preview generationRoeland Jago Douma2019-12-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-182-2/+2
|/ / /
* | | Merge pull request #18428 from nextcloud/bugfix/noid/empty-templateRoeland Jago Douma2019-12-171-3/+25
|\ \ \ | | | | | | | | Return empty template for default creators
| * | | Return empty template for default creatorsJulius Härtl2019-12-161-3/+25
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-172-0/+2
|/ / /
* | | Merge pull request #17018 from ↵Joas Schilling2019-12-164-6/+35
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/noid/allow-to-force-enable-via-cli Allow to force enable apps via CLI
| * | | Allow to force enable apps via CLIJoas Schilling2019-12-134-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #18384 from ↵Roeland Jago Douma2019-12-165-13/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix/18255/global_config_to_always_accept config.php setting to always accept internal shares
| * | | | config.php setting to always accept internal sharesRoeland Jago Douma2019-12-165-13/+76
| |/ / / | | | | | | | | | | | | | | | | | | | | Part of #18255 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2019-12-152-0/+2
| | | |
* | | | Merge pull request #17494 from nextcloud/fix/16340/ignore-invalid-jsonblizzz2019-12-132-7/+17
|\ \ \ \ | | | | | | | | | | Return a default user record if json is broken
| * | | | Log critical fallback to user default if we can't parse the JSONChristoph Wurst2019-12-132-8/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | Return a default user record if json is brokenDaniel Kesselberg2019-12-131-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | It's possible that json_decode returns null. Mostly the json is broken. AddMissingDefaultValues expects an array. Pass null will fail. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* / / / Add typed events for the filesystem/scannerChristoph Wurst2019-12-1310-21/+483
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #18236 from ↵Roeland Jago Douma2019-12-123-62/+103
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/always-detect-mimetype-by-content-in-workflows Allow to detect mimetype by content
| * | | Fix detection of non extention typesRoeland Jago Douma2019-12-121-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Try more methodsJoas Schilling2019-12-101-3/+12
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Allow to specify apps that somethign is a dirJoas Schilling2019-12-101-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Some more fixes in detecting the mimetype from the contentJoas Schilling2019-12-101-15/+17
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Cleanup the codeJoas Schilling2019-12-101-43/+45
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Allow to check for the mimetype by content onlyJoas Schilling2019-12-102-8/+30
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Add a dedicated page for the recommended apps installationChristoph Wurst2019-12-122-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #17935 from nextcloud/feature/noid/public-auth-for-circlesRoeland Jago Douma2019-12-111-2/+3
|\ \ \ \ | | | | | | | | | | adding share type circles
| * | | | using IShare::Maxence Lange2019-12-051-3/+3
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
| * | | | adding share type circlesMaxence Lange2019-12-051-1/+2
| | | | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
* | | | | Merge pull request #18350 from nextcloud/enhancement/typed-group-events-IIRoeland Jago Douma2019-12-1111-2/+552
|\ \ \ \ \ | | | | | | | | | | | | Add typed events for all group hooks and legacy events
| * | | | | Add typed events for all group hooks and legacy eventsChristoph Wurst2019-12-1111-2/+552
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #18348 from nextcloud/enhancement/typed-user-events-IIChristoph Wurst2019-12-1116-8/+903
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add typed events for all user hooks and legacy events
| * | | | | | Add typed events for all user hooks and legacy eventsChristoph Wurst2019-12-1116-8/+903
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #18341 from ↵Christoph Wurst2019-12-111-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kbucheli/handle_ipv6_address_with_explicit_interface handle IPv6 addresses with an explict incoming interface at the end
| * | | | | | handle IPv6 addresses with an explict incoming interface at the end (e.g ↵Konrad Bucheli2019-12-101-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe80::ae2d:d1e7:fe1e:9a8d%enp2s0) Signed-off-by: Konrad Bucheli <konrad.bucheli@gmx.ch> Signed-off-by: Konrad Bucheli <kb@open.ch>
* | | | | | Merge pull request #18349 from ↵Christoph Wurst2019-12-115-1/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/techdebt/deprecate-hooks-emitter-symfony-dispatcher Deprecate hooks, emitter and Symfony dispatcher mechanisms
| * | | | | | Deprecate hooks, emitter and Symfony dispatcher mechanismsChristoph Wurst2019-12-115-1/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #18224 from nextcloud/bugfix/noid/direct-editing-pathRoeland Jago Douma2019-12-115-12/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use file path for direct editing
| * | | | | Use file path for direct editingJulius Härtl2019-12-055-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #18312 from nextcloud/fix/18249/do_not_disable_auth_appsRoeland Jago Douma2019-12-101-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not disable authentication apps
| * | | | | | Do not disable authentication appsRoeland Jago Douma2019-12-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For #18249 If an app encounters an error during loading of app.php the app is normally disabled. However. We should make sure that this doesn't happen for authentication apps (looking at your user_saml). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #18253 from nextcloud/bugfix/noid/broken-oracle-installRoeland Jago Douma2019-12-101-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Pick a shorter name for the transfer ownership table
| * | | | | | Pick a shorter name for the transfer ownership tableJoas Schilling2019-12-101-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>