upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 23:03:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 78
59083 commits 884 branches 1195 tags 8.3 GiB
Commit graph

11333 commits

Author SHA1 Message Date
kesselb
9f04a7c71e
Merge pull request #27801 from nextcloud/enh/noid/hardening-dns-pin-middleware 
Ignore subdomain for soa queries
 2021-07-06 18:55:25 +02:00
MichaIng
0304eea58d
Fix in locking cache check 
The intention obviously was to check whether $lockingCacheClass is defined, and existing class, and available. It was however checked whether the $distributedCacheClass is an existing class, which would have caused an exception already in the previous distributed cache check.

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-07-05 23:11:13 +02:00
Christoph Wurst
26efbe982e
Merge pull request #27794 from nextcloud/fix/clarify-lazy-event-listener-container 
Clarify that lazy event listeners are built from the server container
 2021-07-05 21:13:53 +02:00
Daniel Kesselberg
b6530e5e82
Ignore subdomain for soa queries 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-07-05 20:29:06 +02:00
Pytal
04441d5012
Merge pull request #27767 from nextcloud/enh/20515/maintenance-mode-info 
Improve maintenance mode info
 2021-07-05 10:44:10 -07:00
Lukas Reschke
8037a4be57
Merge pull request #27799 from nextcloud/bug/26425/check-return-encrypt 
Throw exception if encrypting the data failed.
 2021-07-05 18:53:32 +02:00
John Molakvoæ
b396aee333
Merge pull request #27758 from nullspoon/fix-dns-pinning 2021-07-05 17:37:51 +02:00
Christoph Wurst
a6a31bb419
Clarify that lazy event listeners are built from the server container 
Ref https://github.com/nextcloud/server/issues/27793

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-07-05 12:11:54 +02:00
Daniel Kesselberg
0a15043f69
Throw exception if encrypting the data failed. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-07-05 10:23:16 +02:00
Daniel Kesselberg
c91bb98e5c
Check that pdo is installed 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-07-05 09:49:05 +02:00
Aaron Ball
484913dc31
Fix DnsPinMiddleware resolve pinning bug 
Libcurl expects the value of the CURLOPT_RESOLVE configurations to be an
array of strings, those strings containing a comma delimited list of
resolved IPs for each host:port combination.

The original code here does create that array with the host:port:ip
combination, but multiple ips for a single host:port result in
additional array entries, rather than adding them to the end of the
string with a comma. Per the libcurl docs, the `CURLOPT_RESOLVE` array
entries should match the syntax `host:port:address[,address]`.

This creates a function-scoped associative array which uses `host:port`
as the key (which are supposed to be unique and this ensures that), and
the value is an array containing IP strings (ipv4 or ipv6). Once the
associative array is populated, it is then set to the CURLOPT_RESOLVE
array, imploding the ip arrays using a comma delimiter so the array
syntax matches the expected by libcurl.

Note that this reorders the "foreach ip" and "foreach port" loops.
Rather than looping over ips then ports, we now loop over ports then
ips, since ports are part of the unique host:port map, and multiple ips
can exist therein.

Signed-off-by: Aaron Ball <nullspoon@oper.io>
 2021-07-02 16:08:44 -06:00
Robin Appelman
9884344230
dont include folder being search in in the results 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-07-02 16:32:25 +02:00
szaimen
37ff07b9e1 Improve maintenance mode info 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-07-02 13:54:33 +02:00
blizzz
7589d5a176
Merge pull request #27533 from Rid/master 
Fix scanner mistaking socket files for directories
 2021-07-01 17:36:06 +02:00
blizzz
62675eb5c2
Merge pull request #27586 from nextcloud/bugfi/noid/objectstore-checksum 
Reset checksum when writing files to object store
 2021-07-01 17:30:54 +02:00
Gary Kim
b78f3a57d1
Migrate HintException to OCP 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2021-06-30 15:28:02 -04:00
Arthur Schiwon
12e4484dba
ensure that factoryClass exisits before instantiation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 15:09:27 +02:00
Arthur Schiwon
ad0a11b2bf
cleanup 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 01:03:44 +02:00
Arthur Schiwon
506227b509
adjust internal data handling logic to fix store and load 
- format as stored previously in oc_accounts table is kept

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:48:01 +02:00
Arthur Schiwon
c7bf4295cc
adjust email verification checker 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:47:36 +02:00
Arthur Schiwon
d64411e9df
fix code style 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:45:49 +02:00
Arthur Schiwon
3d6ffd3da2
adjust verification state updater method 
- also fixes scope of internal methods

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:42:42 +02:00
Arthur Schiwon
af3fdbea7b
make AccountManager actually write multi value properties 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:41:12 +02:00
Arthur Schiwon
638c04d6e0
accounts event handler to use eventdispatcher, DI and Accounts API 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:41:11 +02:00
Arthur Schiwon
d109d4f581
prov api to be able to edit multivalue properties 
- adding as usual
- deleting and scope setting via additional endpoint

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:41:11 +02:00
Arthur Schiwon
13818005a3
prov api reports additional emails on getUser 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:41:10 +02:00
Vincent Petry
8535340d9a
Revert "First attempt to check against core routes before loading all app routes" 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 17:54:30 +02:00
Julius Härtl
99013d4bc7
Merge pull request #27668 from nextcloud/fix/harden-context-registration-app-missing 
Harden bootstrap context registrations when apps are missing
 2021-06-25 18:42:46 +02:00
Christoph Wurst
80dd0b9418
Harden bootstrap context registrations when apps are missing 
It's not expected that an app would be unavailable when the app
container is created but when services are registered, but Sentry tells
me on Nextcloud 21 there is an edge case where this can happen.
Therefore this patch hardens the code a bit to log a meaningful error
message and skipping the next code instead of logging a php notice for
the undefined index and an exception for calling a method on null.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-06-25 11:40:35 +02:00
Christoph Wurst
35a9ad0d78
Unshift crash reports when they are loaded, to break the recusion 
If, for whatever reason, during the loading of a crash reporter a new
log entry is generated, then the lazy loading mechanism will be invoked
*again* while it's already executed. This doesn't result in an endless
recursion, but means that the crash reporters will be built and
registered many times. This then means any further log entry will be
logged x times instead of once.

Unshift makes sure to take the class off the registration list right
away, so another invokation of the same method won't try to do the same
job.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-06-24 15:31:49 +02:00
Pytal
9ed379da22
Merge pull request #27635 from nextcloud/fix/datetime-constants 
Fix usage of DateTime constants
 2021-06-23 09:56:28 -07:00
Christoph Wurst
6d5cfe0c66
Move DateTime::RFC2822 to DateTimeInterface::2822 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-06-23 15:30:43 +02:00
Christoph Wurst
770881d5d6
Move DateTime::ATOM to DateTimeInterface::ATOM 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-06-23 15:28:07 +02:00
Lukas Reschke
a70fd1bad1
Merge pull request #26344 from J0WI/fs-early-root 
Return early if path is root
 2021-06-23 15:21:56 +02:00
blizzz
ee7a484284
Merge pull request #26346 from J0WI/clean-auth-regex 
Cleaner removePassword regex
 2021-06-23 11:20:19 +02:00
szaimen
858f578f84 mail-template - don't show hyphen if slogan is empty 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-06-22 13:43:12 +02:00
Louis Chemineau
3f6d3dc307 Fix typing error in AppFetcher.php 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2021-06-21 16:31:24 +02:00
Julius Härtl
21db463bc9
Reset checksum when writing files to object store 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-06-21 12:04:49 +02:00
Julius Härtl
bdb1525c16
Merge pull request #27540 from nextcloud/getstoragerootid-failed-storage 
handle case where storage can't be created in getStorageRootId
 2021-06-18 14:17:41 +02:00
Morris Jobke
38edc6fdec
Merge pull request #27532 from nextcloud/fix/noid/properly-cleanup-webauthn-user-deletion 
Properly cleanup entries of WebAuthn on user deletion
 2021-06-18 12:52:05 +02:00
Morris Jobke
dbed0ce680
Properly cleanup entries of WebAuthn on user deletion 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-06-18 09:42:32 +02:00
Christoph Wurst
b73f40eabb
Merge pull request #24318 from nextcloud/techdebt/noid/remove-oc_user-getDisplayName 
Use proper methods for display name retrieval
 2021-06-17 18:17:28 +02:00
Robin Appelman
8520717b4f
handle case where storage can't be created in getStorageRootId 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-06-17 14:32:38 +02:00
blizzz
eec792446d
Merge pull request #26939 from nextcloud/enh/app-icon-notification-bubble 
Let apps toggle an unread counter on app icons
 2021-06-17 13:33:31 +02:00
Rid
0469acfb20 Fix scanner mistaking socket files for directories 
Signed-off-by: Rid <rid@cylo.io>
 2021-06-17 11:44:44 +01:00
Morris Jobke
095418493e
Use proper methods for display name retrieval 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-06-17 10:19:07 +02:00
Lukas Reschke
f8add9d82f
Merge pull request #22628 from Sp1l/simplify-htaccess-rewrites 
Coalesce RewriteCond lines in .htaccess
 2021-06-16 19:35:29 +02:00
John Molakvoæ
c04e0d1db9
Merge pull request #27098 from nextcloud/fix/noid/missing-key-in-addInfo 
force 'name' key in array
 2021-06-16 17:13:45 +02:00
Julius Härtl
a94236483e
Let apps toggle an unread counter on app icons 
Co-authored-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-06-16 17:12:56 +02:00
Morris Jobke
4c93249514
Merge pull request #26319 from nextcloud/files_external_app.php 
Move files_external to IBootstrap and remove some deprecated stuff in the process
 2021-06-16 17:12:14 +02:00