Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-07 00:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvements for #157

Browse source
This commit is contained in:
the-djmaze 2022-04-14 23:56:39 +02:00
parent 9ebffecd47
commit 6c0f921318
2 changed files with 57 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

63
snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/ACL.php
View file

@ -19,9 +19,58 @@ use MailSo\Imap\Responses\ACL as ACLResponse;
*/ */
trait ACL trait ACL
{ {
/**
* https://datatracker.ietf.org/doc/html/rfc4314#section-4
*/
public function ACLAllow(string $sFolderName, string $command) : bool
{
if ($this->IsSupported('ACL') || $this->IsSupported('RIGHTS=texk')) {
if ('MYRIGHTS' === $command) {
return true;
}
$rights = $this->FolderMyRights($sFolderName);
if ($rights) {
switch ($command)
{
case 'LIST':
case 'LSUB':
return $rights->hasRight('LOOKUP');
case 'CREATE':
return true; // $parent->$rights->hasRight('k');
case 'DELETE':
return $rights->hasRight('x');
case 'RENAME':
return $rights->hasRight('k') && $rights->hasRight('x');
case 'SELECT':
case 'EXAMINE':
case 'STATUS':
return $rights->hasRight('r');
case 'APPEND':
case 'COPY':
return $rights->hasRight('i');
case 'EXPUNGE':
return $rights->hasRight('e');
// case 'SUBSCRIBE':
// case 'UNSUBSCRIBE':
// case 'CLOSE':
// case 'FETCH':
// case 'STORE':
case 'GETACL':
case 'SETACL':
case 'LISTRIGHTS':
case 'DELETEACL':
return $rights->hasRight('a');
}
}
}
return !\in_array($command, ['GETACL','SETACL','LISTRIGHTS','DELETEACL','MYRIGHTS']);
}
public function FolderSetACL(string $sFolderName, string $sIdentifier, string $sAccessRights) : void public function FolderSetACL(string $sFolderName, string $sIdentifier, string $sAccessRights) : void
{ {
// if ($this->IsSupported('ACL')) { // if ($this->ACLAllow($sFolderName, 'SETACL')) {
$this->SendRequestGetResponse('SETACL', array( $this->SendRequestGetResponse('SETACL', array(
$this->EscapeString($sFolderName), $this->EscapeString($sFolderName),
$this->EscapeString($sIdentifier), $this->EscapeString($sIdentifier),
@ -31,7 +80,7 @@ trait ACL
public function FolderDeleteACL(string $sFolderName, string $sIdentifier) : void public function FolderDeleteACL(string $sFolderName, string $sIdentifier) : void
{ {
// if ($this->IsSupported('ACL')) { // if ($this->ACLAllow($sFolderName, 'DELETEACL')) {
$this->SendRequestGetResponse('DELETEACL', array( $this->SendRequestGetResponse('DELETEACL', array(
$this->EscapeString($sFolderName), $this->EscapeString($sFolderName),
$this->EscapeString($sIdentifier) $this->EscapeString($sIdentifier)
@ -40,11 +89,11 @@ trait ACL
public function FolderGetACL(string $sFolderName) : array public function FolderGetACL(string $sFolderName) : array
{ {
// if ($this->IsSupported('ACL')) { // if ($this->ACLAllow($sFolderName, 'GETACL')) {
$oResponses = $this->SendRequestGetResponse('GETACL', array($this->EscapeString($sFolderName))); $oResponses = $this->SendRequestGetResponse('GETACL', array($this->EscapeString($sFolderName)));
$aResult = array(); $aResult = array();
foreach ($oResponses as $oResponse) { foreach ($oResponses as $oResponse) {
if (MailSo\Imap\Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType if (\MailSo\Imap\Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType
&& isset($oResponse->ResponseList[4]) && isset($oResponse->ResponseList[4])
&& 'ACL' === $oResponse->ResponseList[1] && 'ACL' === $oResponse->ResponseList[1]
&& $sFolderName === $oResponse->ResponseList[2] && $sFolderName === $oResponse->ResponseList[2]
@ -58,13 +107,13 @@ trait ACL
public function FolderListRights(string $sFolderName, string $sIdentifier) : ?ACLResponse public function FolderListRights(string $sFolderName, string $sIdentifier) : ?ACLResponse
{ {
// if ($this->IsSupported('ACL')) { // if ($this->ACLAllow($sFolderName, 'LISTRIGHTS')) {
$oResponses = $this->SendRequestGetResponse('LISTRIGHTS', array( $oResponses = $this->SendRequestGetResponse('LISTRIGHTS', array(
$this->EscapeString($sFolderName), $this->EscapeString($sFolderName),
$this->EscapeString($sIdentifier) $this->EscapeString($sIdentifier)
)); ));
foreach ($oResponses as $oResponse) { foreach ($oResponses as $oResponse) {
if (MailSo\Imap\Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType if (\MailSo\Imap\Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType
&& isset($oResponse->ResponseList[4]) && isset($oResponse->ResponseList[4])
&& 'LISTRIGHTS' === $oResponse->ResponseList[1] && 'LISTRIGHTS' === $oResponse->ResponseList[1]
&& $sFolderName === $oResponse->ResponseList[2] && $sFolderName === $oResponse->ResponseList[2]
@ -82,7 +131,7 @@ trait ACL
// if ($this->IsSupported('ACL')) { // if ($this->IsSupported('ACL')) {
$oResponses = $this->SendRequestGetResponse('MYRIGHTS', array($this->EscapeString($sFolderName))); $oResponses = $this->SendRequestGetResponse('MYRIGHTS', array($this->EscapeString($sFolderName)));
foreach ($oResponses as $oResponse) { foreach ($oResponses as $oResponse) {
if (MailSo\Imap\Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType if (\MailSo\Imap\Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType
&& isset($oResponse->ResponseList[3]) && isset($oResponse->ResponseList[3])
&& 'MYRIGHTS' === $oResponse->ResponseList[1] && 'MYRIGHTS' === $oResponse->ResponseList[1]
&& $sFolderName === $oResponse->ResponseList[2] && $sFolderName === $oResponse->ResponseList[2]

2
snappymail/v/0.0.0/app/libraries/MailSo/Imap/Responses/ACL.php
View file

@ -31,7 +31,7 @@ class ACL implements \JsonSerializable
return \in_array($right->value, $this->rights); return \in_array($right->value, $this->rights);
} }
*/ */
public function hasRight(string $right) public function hasRight(string $right) : bool
{ {
$const = '\\MailSo\\Imap\\Enumerations\\FolderACL::' . \strtoupper($right); $const = '\\MailSo\\Imap\\Enumerations\\FolderACL::' . \strtoupper($right);
if (\defined($const)) { if (\defined($const)) {