bbs/clrghouz
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Attempt to catch invalid FTN addresses while parsing packets

Browse Source
This commit is contained in:
Deon George 2021-12-01 23:41:20 +11:00
parent 3a1c6d55c6
commit bf57f151d5
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Classes/FTN/Message.php
View File

@ -730,7 +730,11 @@ class Message extends FTNBase
} else { } else {
// Double check, our src and origin match // Double check, our src and origin match
$this->src = Address::parseFTN($matches[1]); try {
$this->src = Address::parseFTN($matches[1]);
} catch (\Exception $e) {
Log::error(sprintf('%s:! Origin line address [%s] is invalid [%s]',self::LOGKEY,$this->origin,$e->getMessage()));
}
} }
// We'll double check our FTN // We'll double check our FTN
@ -819,8 +823,12 @@ class Message extends FTNBase
// http://ftsc.org/docs/fsc-0068.001 // http://ftsc.org/docs/fsc-0068.001
// MSGID should be the basis of the source, we'll overrite our src from origin if we have it // MSGID should be the basis of the source, we'll overrite our src from origin if we have it
$m = []; $m = [];
if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?@?([A-Za-z-_~]+)?\ +#',$this->msgid,$m)) { if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?(\.[0-9]+)?@?([A-Za-z-_~]+)?\ +#',$this->msgid,$m)) {
$this->src = Address::parseFTN($m[1].((isset($m[2]) && $m[2] != '') ? '.'.$m[2] : '').(isset($m[3]) ? '@'.$m[3] : '')); try {
$this->src = Address::parseFTN($m[1].((isset($m[2]) && $m[2] != '') ? '.'.$m[2] : '').(isset($m[4]) ? '@'.$m[4] : ''));
} catch (\Exception $e) {
Log::error(sprintf('%s:! MSGID [%s] address is invalid [%s]',self::LOGKEY,$this->msgid,$e->getMessage()));
}
// Without a MSGID, get our domain from the origin // Without a MSGID, get our domain from the origin
} elseif ($this->origin && preg_match('#\(([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?@?([A-Za-z-_~]+)?\)$#',$this->origin,$m)) { } elseif ($this->origin && preg_match('#\(([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?@?([A-Za-z-_~]+)?\)$#',$this->origin,$m)) {
@ -830,7 +838,6 @@ class Message extends FTNBase
} elseif ($this->zone) { } elseif ($this->zone) {
$this->src = Address::parseFTN(sprintf('%d:%d/%d.%d@%s',$this->zone->zone_id,$this->fn,$this->ff,$this->fp,$this->zone->domain->name)); $this->src = Address::parseFTN(sprintf('%d:%d/%d.%d@%s',$this->zone->zone_id,$this->fn,$this->ff,$this->fp,$this->zone->domain->name));
} }
// Parse SEEN-BY // Parse SEEN-BY
if ($this->seenby->count()) if ($this->seenby->count())
$this->seenaddress = $this->parseAddresses('seenby',$this->seenby,$this->rogue_seen); $this->seenaddress = $this->parseAddresses('seenby',$this->seenby,$this->rogue_seen);