nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-01-27 00:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use "." to concatenate strings, not "+" (fixes #288)

Browse Source 
Unsupported operand types: string + string at /usr/share/davical/inc/caldav-ACL.php:146
This commit is contained in:
Florian Schlichting 2023-03-23 22:14:41 +01:00
parent 72b13cfc65
commit effc004741
3 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/caldav-ACL.php
View File

@ -143,7 +143,7 @@ function process_ace( $grantor, $by_principal, $by_collection, $ace ) {
$grantee = new DAVResource( DeconstructURL($principal_content->GetContent()) );
$grantee_id = $grantee->getProperty('principal_id');
if ( !$grantee->Exists() || !$grantee->IsPrincipal() )
$request->PreconditionFailed(403,'recognized-principal', 'Principal "' + $principal_content->GetContent() + '" not found.');
$request->PreconditionFailed(403,'recognized-principal', 'Principal "' . $principal_content->GetContent() . '" not found.');
$sqlparms = array( ':to_principal' => $grantee_id);
$where = 'WHERE to_principal=:to_principal AND ';
if ( isset($by_principal) ) {

11
testing/tests/regression-suite/0946-ACL-err.result Normal file
View File

@ -0,0 +1,11 @@
HTTP/1.1 403 Forbidden
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
Content-Length: 137
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<error xmlns="DAV:">
<recognized-principal/>Principal "/caldav.php/user40/" not found.
</error>

41
testing/tests/regression-suite/0946-ACL-err.test Normal file
View File

@ -0,0 +1,41 @@
#
# ACL setting default privileges on a collection to nothing, and
# specific privileges to include read-acl.
#
TYPE=ACL
URL=http://regression.host/caldav.php/user1/home/
HEADER=User-Agent: RFC3744 Spec Tests
HEADER=Content-Type: text/xml; charset="UTF-8"
HEAD
BEGINDATA
<?xml version="1.0" encoding="utf-8" ?>
<acl xmlns="DAV:" xmlns:CalDAV="urn:ietf:params:xml:ns:caldav">
<ace>
<principal>
<href>/caldav.php/user40/</href>
</principal>
<grant>
<privilege><read/></privilege>
<privilege><read-acl/></privilege>
<privilege><read-current-user-privilege-set/></privilege>
<privilege><CalDAV:read-free-busy/></privilege>
</grant>
</ace>
<ace>
<principal><authenticated/></principal>
<grant>
<privilege/>
</grant>
</ace>
</acl>
ENDDATA
QUERY
SELECT by_principal, by_collection, privileges, p_to.displayname, to_principal
FROM grants JOIN dav_principal p_to ON (to_principal=principal_id)
LEFT JOIN collection ON (by_collection=collection.collection_id)
WHERE collection.dav_name = '/user1/home/'
ENDQUERY