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

Improved Domain whitelist handling

Browse source
This commit is contained in:
the-djmaze 2024-03-26 04:08:26 +01:00
parent 7f94c26bee
commit 25214f2d87
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
View file

@ -108,16 +108,16 @@ class Domain implements \JsonSerializable
{ {
$sW = \trim($this->whiteList); $sW = \trim($this->whiteList);
if ($sW) { if ($sW) {
$sEmail = $this->IMAP->fixUsername($sEmail); $sEmail = $this->IMAP->fixUsername($sEmail, false);
$sLogin = $this->IMAP->fixUsername($sLogin); $sLogin = $this->IMAP->fixUsername($sLogin);
$sUserPart = \MailSo\Base\Utils::getEmailAddressLocalPart($sLogin ?: $sEmail); $sUserPart = \MailSo\Base\Utils::getEmailAddressLocalPart($sLogin ?: $sEmail);
$sUserDomain = \MailSo\Base\Utils::getEmailAddressDomain($sEmail);
$sItem = \strtok($sW, " ;,\n"); $sItem = \strtok($sW, " ;,\n");
while (false !== $sItem) { while (false !== $sItem) {
$sItem = $this->IMAP->fixUsername(\trim($sItem)); $sItem = $this->IMAP->fixUsername(\trim($sItem), false);
if ($sItem && ( if ($sLogin === $sItem || $sEmail === $sItem
$sLogin === $sItem || $sEmail === $sItem || $sUserPart === $sItem || "@{$sUserDomain}" === $sItem
|| $sUserPart === $sItem || \str_starts_with($sItem, "{$sUserPart}@") ) {
)) {
return true; return true;
} }
$sItem = \strtok(" ;,\n"); $sItem = \strtok(" ;,\n");

2
snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
View file

@ -287,7 +287,7 @@
<label for="tab-whitelist" role="tab" tabindex="0" data-icon="👥" data-i18n="POPUPS_DOMAIN/BUTTON_WHITE_LIST"></label> <label for="tab-whitelist" role="tab" tabindex="0" data-icon="👥" data-i18n="POPUPS_DOMAIN/BUTTON_WHITE_LIST"></label>
<div class="tab-content" role="tabpanel" aria-hidden="true"> <div class="tab-content" role="tabpanel" aria-hidden="true">
<div class="alert" data-i18n="POPUPS_DOMAIN/WHITE_LIST_ALERT"></div> <div class="alert" data-i18n="POPUPS_DOMAIN/WHITE_LIST_ALERT"></div>
<textarea class="input-xxlarge" style="width: 100%" rows="8" data-bind="value: whiteList" tabindex="-1"></textarea> <textarea class="input-xxlarge" style="width: 100%" rows="8" data-bind="value: whiteList" tabindex="-1" placeholder="@example.com&#10;user@example.org&#10;username"></textarea>
</div> </div>
</div> </div>
</div> </div>