upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35
62062 commits 1038 branches 1221 tags 7.6 GiB
Commit graph

724 commits

Author SHA1 Message Date
Julius Härtl
6ded6afa97
Use proper storage method for writing skeleton files 
otherwise the filecache will have a wrong size for skeleton files

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2022-11-09 13:11:46 +01:00
Arthur Schiwon
1ec1321c26 fix loading legacy app.php with multi app dir 
- requireAppFile() only appends /appinfo/app.php
- without the absolute path, require_once looks into include_path
- the first match in inlcude_path however migth be different from appPath
- fixed by providing the tested(!), full path to the app


Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-07-19 06:22:19 +00:00
Carl Schwan
3750160d9f Allow to disable password policy enforcement for selected groups 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Co-authored-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-07-05 17:05:09 +02:00
blizzz
39391701fc
Merge pull request #32680 from nextcloud/backport/32510/stable23 
[stable23] Properly calculate primary element based on background luminance
 2022-06-11 00:17:41 +02:00
John Molakvoæ
06ae90a639 Properly calculate primary element based on background luminance 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-06-01 05:42:34 +00:00
Arthur Schiwon
600d359f79 allow use of rememberme cookies for IApacheAuth backends 
- e.g. enables it for SAML backend

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-05-31 21:59:28 +00:00
Git'Fellow
bd739bc219 Move Gd failed operations to debug level 
Instead of error
 2022-05-27 09:38:17 +00:00
Robin Appelman
3da45428b6
dont re-query fileinfo when getting dav quota 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-04-13 16:22:21 +02:00
Joas Schilling
8f77199366 Log exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-04-07 16:17:40 +00:00
Joas Schilling
2c238e4bf6 Fix \OC_App::getCurrentApp() when being called from CLI or phpunit 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-04-07 16:17:39 +00:00
Vincent Petry
64f376e4b9
Merge pull request #31098 from nextcloud/backport/30942/stable23 
[stable23] only setup part of the filesystem for appdata requests
 2022-03-01 16:00:45 +01:00
Claus-Justus Heine
539c993c33 Use the unjailed-path in OC_Helper::getStorageInfo() for files located in SharedStorage. 
The current implementation already switches the storage-backend to
$storage->getSourceStorage(). However, it then calls
$rootInfo->getInternalPath() which returns the internal path relative to
the storage where the share is mounted. This is wrong, we need also to
unjail the path. Compare, e.g., with
OCA\Files_Sharing\SharedStorage::file_get/put_contents() for the
"logic".

Signed-off-by: Claus-Justus Heine <himself@claus-justus-heine.de>
 2022-02-18 15:45:48 +00:00
Robin Appelman
7f5a3695b7 handle setupFS with null user 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-02-16 10:46:48 +00:00
Robin Appelman
f9b74b3ced dont mark fs as setup when no user is active 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-02-16 10:46:48 +00:00
Robin Appelman
fa43e4ecf2 pass user object during fs init 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-02-16 10:46:48 +00:00
Robin Appelman
19d214294c only setup part of the filesystem for appdata requests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-02-16 10:46:48 +00:00
Carl Schwan
d69531ac8e
Fix psalm not running 
The issue was that we were using psalm/phar instead of vimeo/psalm. This
caused issue with the custom psalm plugin in buildd/psalm.

This is using the opportunity to also update the psalm version from 3.8
to 3.17 and the php-cs-fixer too.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-27 17:20:00 +01:00
Joachim Bauch
cebac86ecd Prevent loading images that would require too much memory. 
For most image formats, the header specifies the width/height.
PHP allocates an image object from that size, even if the actual
image data is much smaller. This image object size is not limited
by the limit configured in PHP.

The memory limit can be configured through "config.php" setting
"preview_max_memory" and defaults to 128 MBytes which should be
enough for most images without filling up all memory.

Signed-off-by: Joachim Bauch <bauch@struktur.de>
 2022-01-11 14:49:08 +00:00
MichaIng
022d0058ca [stable23] Remove iconv from dependencies and tests 
which is not used anymore since: https://github.com/nextcloud/server/pull/29470

Signed-off-by: MichaIng <micha@dietpi.com>
 2022-01-04 03:06:55 +01:00
Côme Chilliet
f889b251b1 Avoid assignment in if clause 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-06 14:22:05 +00:00
Côme Chilliet
3fe20bfbbb Fix typing problems in OC_Image 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-06 14:22:05 +00:00
Côme Chilliet
11b51ddbbe Avoid calling image* methods on boolean 
This avoids fatal errors on PHP>=8, and warnings on older versions.
Log should also be clearer.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-06 14:22:05 +00:00
szaimen
ce69760500 fix imagecreatetruecolor() error 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-11-23 14:26:26 +00:00
Naoto Kobayashi
acece8f4ba OC_Util::isNonUTF8Locale: fix lint error 
Signed-off-by: Naoto Kobayashi <naoto.kobayashi4c@gmail.com>
 2021-11-16 17:52:18 +00:00
Naoto Kobayashi
5fc031c91f OC_Util::isSetLocaleWorking: fix typo 
Signed-off-by: Naoto Kobayashi <naoto.kobayashi4c@gmail.com>
 2021-11-16 17:52:18 +00:00
Naoto Kobayashi
d27be604d4 OC_Util: Add fallbacks to check if current locale is UTF8 
Using escapeshellcmd to get current locale causes error
if the function is disabled.

Add fallbacks to prevent the error.

Signed-off-by: Naoto Kobayashi <naoto.kobayashi4c@gmail.com>
 2021-11-16 17:52:18 +00:00
Naoto Kobayashi
3b83976c98 Check whether setlocale works only after setlocale 
Signed-off-by: Naoto Kobayashi <naoto.kobayashi4c@gmail.com>
 2021-11-16 17:52:18 +00:00
Naoto Kobayashi
7e80182e75 Fix missing setlocale with php 8 
When php version = 8, basename('§') does not bug even if LC_ALL is non-UTF-8 locale.
This cause OC_Util::isSetLocaleWorking() to skip setlocale("C.UTF-8").

Fix it by using escapeshellcmd instead of basename.

Signed-off-by: Naoto Kobayashi <naoto.kobayashi4c@gmail.com>
 2021-11-16 17:52:17 +00:00
Côme Chilliet
3631789651
Fix resource usages in OC_Image 
This makes sure using resource or GdImage (PHP>=8) behaves the same.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-10-28 17:48:43 +02:00
Joas Schilling
06611e4780
Revert "Fix "never catch" catches in OC_App" 2021-10-25 08:41:56 +02:00
zorn-v
9cb0b8c713 Fix "never catch" catches in OC_App 
Need to check another legacy. Need to explicitly add to use or do not forget add slash `\`
 2021-10-22 09:29:03 +00:00
Julius Härtl
581862b51b
Merge pull request #29187 from nextcloud/fix/noid/passwordless-app-password-generation 2021-10-13 16:11:22 +02:00
Julien Veyssier
0d2c2ab629
allow null password in UserLoggedInEvent 
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
 2021-10-13 12:37:34 +02:00
Julien Veyssier
de5fea4a00
fix login_credentials->password in session when loging in with apache 
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
 2021-10-13 12:24:32 +02:00
Joas Schilling
4cae2cc06c
Merge pull request #29004 from nextcloud/bugfix/noid/fix-translated-app-details 
Fix translated app details
 2021-10-13 11:37:22 +02:00
Bjoern Schiessle
664bd5802f add 'supported'-label to all supported apps, also if they are not downloaded yet 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2021-10-06 22:17:50 +02:00
Julius Härtl
d68f028251
Merge pull request #27733 from PhrozenByte/enhancement/noid/IURLGenerator-linkToDefaultPageUrl 2021-10-05 13:06:59 +02:00
Lukas Reschke
857c769d75
Merge pull request #28939 from nextcloud/bugfix/noid/dont-setup-disabled-users 
Don't further setup disabled users when logging in with apache
 2021-10-04 12:59:35 +02:00
Joas Schilling
37f40cdd46
Fix translated app details 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-09-30 09:08:17 +02:00
Carl Schwan
6958d8005a
Add admin privilege delegation for admin settings 
This makes it possible for selected groups to access some settings
pages.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-09-29 21:43:31 +02:00
Joas Schilling
57a816a1a6
Don't further setup disabled users when logging in with apache 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-09-23 11:19:02 +02:00
Christoph Wurst
006aac9a0c
Merge pull request #28473 from nextcloud/fix-file-get-contents 
Fix path of `file_get_contents`
 2021-08-25 09:28:52 +02:00
Daniel Kesselberg
60a7f5c53e
Remove unused method 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-08-18 22:10:40 +02:00
acsfer
280dd851b3
Avoid usage of Nextcloud API, use PHP function 2021-08-18 15:21:05 +02:00
Simon Spannagel
58f55975e0 Fix #20913: Check image resource before attempting to preserve alpha 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2021-08-18 07:36:11 +02:00
acsfer
a3c69b8310
Fix path of file_get_contents 
Try to fix #28370  and #27441 

Avoid pre-pends the `$path` to the user's own storage.
 2021-08-17 13:03:45 +02:00
Daniel Rudolf
aa455e71d9
Merge branch 'master' into enhancement/noid/IURLGenerator-linkToDefaultPageUrl 2021-08-04 18:52:55 +02:00
Julius Härtl
3860dad9ea
Merge pull request #26481 from ghost/fdroid 2021-07-13 08:49:59 +02:00
HouraisanNEET
0ba0189260 Add F-Droid 
Signed-off-by: HouraisanNEET <HouraisanNEET@users.noreply.github.com>
 2021-07-04 21:44:55 +08:00
Daniel Rudolf
e16bf707aa
Fix UtilTest::testDefaultApps() 
Oh wow... This definitly was no best practice... 😒

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2021-07-01 16:00:29 +02:00