upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-21 01:52:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 73
60150 commits 770 branches 1188 tags 6.5 GiB
Commit graph

11508 commits

Author SHA1 Message Date
blizzz
55a61baaa1
Merge pull request #31400 from nextcloud/backport/31390/stable22 
[stable22] Censor more configs
 2022-03-02 17:39:44 +01:00
Joas Schilling
1831c5cb6b Also use hashed/indexed column on delete 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-03-02 11:26:26 +00:00
Joas Schilling
8c875e7694 Censor more configs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-03-02 10:29:51 +00:00
Joas Schilling
26990666cb
Merge pull request #31298 from nextcloud/backport/31217/stable22 
[stable22] Also cache non-existing to reuse it
 2022-02-22 11:48:55 +01:00
Joas Schilling
ee0ed229e3 Also cache non-existing to reuse it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-02-21 11:10:50 +00:00
Claus-Justus Heine
c31adf12b9 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:46:35 +00:00
Vincent Petry
806d702458
Merge pull request #30958 from nextcloud/backport/30949/stable22 
[stable22] Allow to disable AuthToken v1
 2022-02-18 14:34:09 +01:00
Vincent Petry
5ecf7be040
Merge pull request #31060 from nextcloud/backport/30973/stable22 
[stable22] Allow specify a config prefix for another database connection
 2022-02-18 12:08:58 +01:00
Joas Schilling
3f42547b01 Allow to get custom loggers for syslog, errorlog and systemdlog too 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-02-16 13:52:20 +00:00
Joas Schilling
5e8dd12926 Allow specify a config prefix for another database connection 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-02-07 14:35:54 +00:00
Jonas Meurer
418473be4b
Fix preview generation for office documents 
`new \imagick()` returns an object, but we need the image blob (binary
string) from this object.

This is a partial backport of #26531, which brings a lot of refactoring
but also contains the fix.

Fixes: #29956

Signed-off-by: Jonas Meurer <jonas@freesources.org>
 2022-02-02 12:02:04 +01:00
Joas Schilling
83c1d1ef3a
Allow to disable AuthToken v1 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-02-01 14:31:51 +01:00
John Molakvoæ
c0b29720e1
Merge pull request #30826 from nextcloud/backport/stable22/psalm-fix 2022-01-27 20:05:54 +01:00
Carl Schwan
57514e44a9
Psalm fixing 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-27 17:20:48 +01:00
John Molakvoæ
fa2ac9362e
Merge pull request #30741 from nextcloud/backport22 2022-01-27 09:26:53 +01:00
Carl Schwan
0262cc33d7
Fix psalm 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-24 13:34:48 +01:00
Côme Chilliet
3f3908b72a Always call flush() as getAllKeys() is broken 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-01-20 15:43:34 +00:00
John Molakvoæ
92fcdc3509
Merge pull request #30727 from nextcloud/backport/30614/stable22 2022-01-20 15:45:22 +01:00
John Molakvoæ
fd1bcd434c
Merge pull request #30760 from nextcloud/backport/30731/stable22 2022-01-20 10:35:07 +01:00
John Molakvoæ
4cf937ad81
Merge pull request #29799 from nextcloud/stable22-disk 2022-01-20 10:33:45 +01:00
Joas Schilling
8db890a621 Log bruteforce throttle and blocking 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-19 11:51:56 +00:00
acsfer
3b831e4842
[stable22] Increase email main buttons width for non-english languages 
Manual backport of https://github.com/nextcloud/server/pull/30653
 2022-01-18 16:03:09 +01:00
Julius Härtl
5bda5e5d95
Add hashed attribute column for indexed job existence check 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2022-01-18 15:13:11 +01:00
Marek-Wojtowicz
457bb9b8ef Update Session.php 
The http headers according to rfc 2616 is iso-8859-1. This patch fixes the behavior when non-ascii characters are present in the header.

Signed-off-by: Marek Wójtowicz <Marek.Wojtowicz@agh.edu.pl>
 2022-01-17 23:23:08 +00:00
acsfer
ad5ea4eb06 [stable22] Check for disk_free_space 
Backport of https://github.com/nextcloud/server/pull/29758
 2022-01-17 19:56:35 +00:00
Jonas Meurer
5d1157c37c
updateEncryptedVersion: cleanup on target if cache already got renamed 
When moving a file to trash with encryption enabled, the cache gets
moved before the actual file. According to @icewind1991 this is in order
to not break object storage.

When moving a file from an unencrypted storage (e.g. a collectives
storage) to the encrypted trashbin storage, this causes errors, see

This commit fixes it by doing `updateEncryptedVersion()` on the target
cache entry *if* the source cache entry doesn't exist anymore, but the
corresponding target cache entry does exist already.

Fixes: #26544

Signed-off-by: Jonas Meurer <jonas@freesources.org>
 2022-01-15 13:40:01 +01:00
Carl Schwan
5c155d1e53 Fix psalm issues 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-14 14:17:04 +00:00
Carl Schwan
79289c55f2 Add helper method in Wrapper 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-14 14:17:01 +00:00
John Molakvoæ
295348446b
Implement multibucket shift for ObjectStore 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-01-14 08:32:04 +01:00
Carl Schwan
e8f6e062dd
Fix idn emails not working in shares 
And add check before sending email that email address is valid

Fix #30595

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-13 17:16:21 +01:00
MichaIng
12d92650fd
Merge pull request #30622 from nextcloud/backport/30358/stable22 
[stable22] Reset job disabling timer on adding the job again
 2022-01-12 16:02:12 +01:00
Joas Schilling
51d4f30e9b
Merge pull request #30610 from nextcloud/backport/30588/stable22 
[stable22] Fix undefined/unset scope in account properties
 2022-01-12 13:50:43 +01:00
Julius Härtl
96e520584a Reset job disabling timer on adding the job again 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2022-01-12 10:52:57 +00:00
Joas Schilling
89f4880a32 Fix undefined/unset scope in account properties 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-11 18:44:45 +00:00
Joachim Bauch
d7d47169e4 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:15 +00:00
Vincent Petry
e455b71ecd Fix fail when keys/files folder already exists 
Fixes an issue with transfer ownership in move mode where the folder
"files_encryption/keys/files" already exists.

Instead of failing, its existence is checked before calling mkdir.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2022-01-11 08:19:50 +00:00
Christopher Ng
bbb78f848b Fix email verification 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-01-07 10:58:40 +00:00
Joas Schilling
42f195bde9
Merge pull request #30515 from nextcloud/backport/29958/stable22 
[stable22] Remove iconv from dependencies and tests
 2022-01-07 08:46:42 +01:00
John Molakvoæ
adf01ab089
Merge pull request #30487 from nextcloud/backport/29780/stable22 2022-01-07 08:44:08 +01:00
John Molakvoæ
5b241fb318
Merge pull request #30237 from nextcloud/backport/30200/stable22 2022-01-07 08:42:20 +01:00
John Molakvoæ
6117316ce6
Merge pull request #29962 from nextcloud/backport/29951/stable22 2022-01-07 08:42:04 +01:00
MichaIng
7375a1b747 [stable22] 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-06 23:56:28 +01:00
blizzz
d892610348
Merge pull request #29324 from nextcloud/backport/28541/stable22 
[stable22] add a prefix index to filecache.path, attempt 2
 2022-01-05 11:05:53 +01:00
Joas Schilling
5b4d362434 Run migrations fully when reenabling an app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-04 16:23:26 +00:00
Azul
1ec793ab2b fix translation source in directEditing templates 
The 'Empty file' string is translated in `lib` - not in `core`.

Signed-off-by: Azul <azul@riseup.net>
 2021-12-16 18:22:04 +00:00
Louis Chemineau
6a1a9485cf Fix backport 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2021-12-13 15:35:05 +01:00
Joas Schilling
e552806d46 Make psalm more happy 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:23:05 +00:00
Joas Schilling
76f5436f9b Fix docs to make Psalm happier 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:23:04 +00:00
Joas Schilling
0b717bd056 Convert strict_search to wildcard property and add psalm docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:23:04 +00:00
Joas Schilling
3879c2eb1e Limit more contact searches 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:23:04 +00:00