summaryrefslogtreecommitdiffstats
path: root/apps/dav/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2020-07-30 21:10:54 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2020-07-30 21:10:54 +0200
commitb79e34c57ba74246a03a66045a6b792e35da1d32 (patch)
tree8b00bf3c8ae42109cadb7a82d1ed936243791916 /apps/dav/lib
parent2698e9e0113840ab7fb9e98d43a5cb40c58518ff (diff)
downloadnextcloud-server-b79e34c57ba74246a03a66045a6b792e35da1d32.tar.gz
nextcloud-server-b79e34c57ba74246a03a66045a6b792e35da1d32.zip
fix check for Cloud ID, missing return statements, wrong param use
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/dav/lib')
-rw-r--r--apps/dav/lib/CardDAV/CardDavBackend.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
index 9d602025c7a..8c898271902 100644
--- a/apps/dav/lib/CardDAV/CardDavBackend.php
+++ b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -974,8 +974,9 @@ class CardDavBackend implements BackendInterface, SyncSupport {
continue;
}
- if ($property === 'CLOUD' && preg_match('/[^a-zA-Z0-9 _.@\-\']/', $pattern) === 1) {
- // There can be no chars in cloud ids which are not valid for user ids
+ if ($property === 'CLOUD' && preg_match('/[^a-zA-Z0-9 :_.@\/\-\']/', $pattern) === 1) {
+ // There can be no chars in cloud ids which are not valid for user ids plus :/
+ // worst case: CA61590A-BBBC-423E-84AF-E6DF01455A53@https://my.nxt/srv/
continue;
}
}