Compare commits

..

2 Commits

Author SHA1 Message Date
Marcin Michalski ade6887fd9 Fix local part length check (#233) 2020-02-13 23:36:52 +01:00
Denis Ryabov 5065fafc8c Fix "Trying to access array offset on value of type null" (#228)
Added a check that `$previous` is not null (i.e. previous token exists)
2020-02-12 23:28:28 +01:00
3 changed files with 11 additions and 5 deletions
+6 -4
View File
@@ -19,6 +19,7 @@ class LocalPart extends Parser
$parseDQuote = true; $parseDQuote = true;
$closingQuote = false; $closingQuote = false;
$openedParenthesis = 0; $openedParenthesis = 0;
$totalLength = 0;
while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) { while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) {
if ($this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type']) { if ($this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type']) {
@@ -34,12 +35,13 @@ class LocalPart extends Parser
$this->parseComments(); $this->parseComments();
$openedParenthesis += $this->getOpenedParenthesis(); $openedParenthesis += $this->getOpenedParenthesis();
} }
if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) { if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
if ($openedParenthesis === 0) { if ($openedParenthesis === 0) {
throw new UnopenedComment(); throw new UnopenedComment();
} else {
$openedParenthesis--;
} }
$openedParenthesis--;
} }
$this->checkConsecutiveDots(); $this->checkConsecutiveDots();
@@ -57,11 +59,11 @@ class LocalPart extends Parser
$this->parseFWS(); $this->parseFWS();
} }
$totalLength += strlen($this->lexer->token['value']);
$this->lexer->moveNext(); $this->lexer->moveNext();
} }
$prev = $this->lexer->getPrevious(); if ($totalLength > LocalTooLong::LOCAL_PART_LENGTH) {
if (strlen($prev['value']) > LocalTooLong::LOCAL_PART_LENGTH) {
$this->warnings[LocalTooLong::CODE] = new LocalTooLong(); $this->warnings[LocalTooLong::CODE] = new LocalTooLong();
} }
} }
+1 -1
View File
@@ -170,7 +170,7 @@ abstract class Parser
{ {
$previous = $this->lexer->getPrevious(); $previous = $this->lexer->getPrevious();
if ($previous['type'] === EmailLexer::S_BACKSLASH if ($previous && $previous['type'] === EmailLexer::S_BACKSLASH
&& &&
$this->lexer->token['type'] !== EmailLexer::GENERIC $this->lexer->token['type'] !== EmailLexer::GENERIC
) { ) {
@@ -265,6 +265,10 @@ class RFCValidationTest extends TestCase
[LocalTooLong::CODE,], [LocalTooLong::CODE,],
'too_long_localpart_too_long_localpart_too_long_localpart_too_long_localpart@invalid.example.com' 'too_long_localpart_too_long_localpart_too_long_localpart_too_long_localpart@invalid.example.com'
], ],
[
[LocalTooLong::CODE],
'too_long_localpart_too_long_localpart_123_too_long_localpart_too_long_localpart@example.com'
],
[ [
[LabelTooLong::CODE,], [LabelTooLong::CODE,],
'example@toolonglocalparttoolonglocalparttoolonglocalparttoolonglocalpart.co.uk' 'example@toolonglocalparttoolonglocalparttoolonglocalparttoolonglocalpart.co.uk'