More complete rework of packet parsing and packet generation with f279d85
- and testing passes
This commit is contained in:
@@ -7,8 +7,8 @@ use Illuminate\Support\Facades\Storage;
|
||||
use Tests\TestCase;
|
||||
|
||||
use App\Classes\File;
|
||||
use App\Classes\FTN\{Message,Packet};
|
||||
use App\Models\{Address,Domain,System,Zone};
|
||||
use App\Classes\FTN\Packet;
|
||||
use App\Models\{Address,Domain,Echomail,System,Zone};
|
||||
|
||||
class PacketTest extends TestCase
|
||||
{
|
||||
@@ -116,15 +116,16 @@ class PacketTest extends TestCase
|
||||
$this->assertEquals(1,count($pkt));
|
||||
$this->assertEquals('3634/27 12 154/10 221/6 218/840 770/1 633/280',$pkt->messages[0]->path[0]);
|
||||
$this->assertEquals('1/120 18/0 116/116 120/616 123/0 10 25 126 160 180 200 525 755 3001',$pkt->messages[0]->seenby[0]);
|
||||
$this->assertEquals('*The Gate BBS*Shelby, NC USA*thegateb.synchro.net* (1:3634/27)',$pkt->messages[0]->origin);
|
||||
$this->assertEquals('1:3634/27.0@fidonet',$pkt->messages[0]->fftn);
|
||||
$this->assertEquals('1:633/2744.0@fidonet',$pkt->messages[0]->tftn);
|
||||
$this->assertEquals('Gate Keeper',$pkt->messages[0]->user_from);
|
||||
$this->assertEquals('Meitsi',$pkt->messages[0]->user_to);
|
||||
$this->assertEquals(' * Origin: *The Gate BBS*Shelby, NC USA*thegateb.synchro.net* (1:3634/27)',$pkt->messages[0]->origin);
|
||||
$this->assertEquals('1:3634/27.0@fidonet',$pkt->messages[0]->fftn->ftn);
|
||||
$this->assertEquals('3:633/2744.0@fidonet',$pkt->tftn->ftn);
|
||||
$this->assertEquals('Gate Keeper',$pkt->messages[0]->from);
|
||||
$this->assertEquals('Meitsi',$pkt->messages[0]->to);
|
||||
$this->assertEquals('Status of HAM radio in FidoNet',$pkt->messages[0]->subject);
|
||||
$this->assertEquals('275.fidonet_ham@1:3634/27 29ddab74',$pkt->messages[0]->msgid);
|
||||
$this->assertEquals('1:229/428 012c0322',$pkt->messages[0]->replyid);
|
||||
$this->assertEquals('bc291b3ea15750c2d0c39c9221093901',md5($pkt->messages[0]->message));
|
||||
$this->assertEquals('93a956cbde8b1215f4cf67e514116487',md5($pkt->messages[0]->content));
|
||||
$this->assertEquals('93a956cbde8b1215f4cf67e514116487',$pkt->messages[0]->msg_crc);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -142,15 +143,16 @@ class PacketTest extends TestCase
|
||||
$this->assertEquals(43,count($pkt));
|
||||
$this->assertEquals('229/664 426 633/280',$pkt->messages[0]->path[0]);
|
||||
$this->assertEquals('15/0 106/201 128/260 129/305 153/7715 218/700 221/6 226/30 227/114',$pkt->messages[0]->seenby[0]);
|
||||
$this->assertEquals('Northern Realms (1:229/664)',$pkt->messages[0]->origin);
|
||||
$this->assertEquals('1:229/664.0@fidonet',$pkt->messages[0]->fftn);
|
||||
$this->assertEquals('1:633/2744.0@fidonet',$pkt->messages[0]->tftn);
|
||||
$this->assertEquals('Northern Realms',$pkt->messages[0]->user_from);
|
||||
$this->assertEquals('All',$pkt->messages[0]->user_to);
|
||||
$this->assertEquals(' * Origin: Northern Realms (1:229/664)',$pkt->messages[0]->origin);
|
||||
$this->assertEquals('1:229/664.0@fidonet',$pkt->messages[0]->fftn->ftn);
|
||||
$this->assertEquals('3:633/2744.0@fidonet',$pkt->tftn->ftn);
|
||||
$this->assertEquals('Northern Realms',$pkt->messages[0]->from);
|
||||
$this->assertEquals('All',$pkt->messages[0]->to);
|
||||
$this->assertEquals('NYPost Daily Horoscope',$pkt->messages[0]->subject);
|
||||
$this->assertEquals('1:229/664 56db6f89',$pkt->messages[0]->msgid);
|
||||
$this->assertEquals('',$pkt->messages[0]->replyid);
|
||||
$this->assertEquals('b8c33987647e88f86456f0e571e98398',md5($pkt->messages[0]->message));
|
||||
$this->assertEquals('ad761cfc02d87383056cc29e026b3d57',md5($pkt->messages[0]->content));
|
||||
$this->assertEquals('ad761cfc02d87383056cc29e026b3d57',$pkt->messages[0]->msg_crc);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -166,18 +168,19 @@ class PacketTest extends TestCase
|
||||
$this->assertInstanceOf(Packet\FSC48::class,$pkt);
|
||||
$this->assertEquals('ABCDEFG#',$pkt->password);
|
||||
$this->assertEquals(4,count($pkt));
|
||||
$this->assertInstanceOf(Message::class,$pkt->messages[0]);
|
||||
$this->assertInstanceOf(Echomail::class,$pkt->messages[0]);
|
||||
$this->assertEquals('3/165 100 184',$pkt->messages[0]->path[0]);
|
||||
$this->assertEquals('1/100 179 2/100 116 3/100 105 107 108 109 110 111 113 119 120 126 127',$pkt->messages[0]->seenby[0]);
|
||||
$this->assertEquals('www.theunderground.us Telnet 10023 SSH 7771 (21:3/165)',$pkt->messages[0]->origin);
|
||||
$this->assertEquals('21:3/165.0@fsxnet',$pkt->messages[0]->fftn);
|
||||
$this->assertEquals('21:3/2744.0@fsxnet',$pkt->messages[0]->tftn);
|
||||
$this->assertEquals('ibbslastcall',$pkt->messages[0]->user_from);
|
||||
$this->assertEquals('All',$pkt->messages[0]->user_to);
|
||||
$this->assertEquals(' * Origin: www.theunderground.us Telnet 10023 SSH 7771 (21:3/165)',$pkt->messages[0]->origin);
|
||||
$this->assertEquals('21:3/165.0@fsxnet',$pkt->messages[0]->fftn->ftn);
|
||||
$this->assertEquals('21:3/2744.0@fsxnet',$pkt->tftn->ftn);
|
||||
$this->assertEquals('ibbslastcall',$pkt->messages[0]->from);
|
||||
$this->assertEquals('All',$pkt->messages[0]->to);
|
||||
$this->assertEquals('ibbslastcall-data',$pkt->messages[0]->subject);
|
||||
$this->assertEquals('21:3/165 6b42fe09',$pkt->messages[0]->msgid);
|
||||
$this->assertEquals('',$pkt->messages[0]->replyid);
|
||||
$this->assertEquals('aa6bc82b63355ab68889f61822305072',md5($pkt->messages[0]->message));
|
||||
$this->assertEquals('413eb972809e1ce8ac5f5cf7b545fc10',md5($pkt->messages[0]->content));
|
||||
$this->assertEquals('413eb972809e1ce8ac5f5cf7b545fc10',$pkt->messages[0]->msg_crc);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -185,6 +188,7 @@ class PacketTest extends TestCase
|
||||
{
|
||||
$this->init_private();
|
||||
|
||||
// @note this pkt is from/to a sender not defined
|
||||
$f = $this->mail_file('mail/test_nomsgid_origin.pkt');
|
||||
foreach ($f as $packet) {
|
||||
$pkt = Packet::process($packet,$f->itemName(),$f->itemSize());
|
||||
@@ -193,21 +197,21 @@ class PacketTest extends TestCase
|
||||
$this->assertEquals(1,$pkt->count());
|
||||
|
||||
foreach ($pkt as $msg) {
|
||||
$this->assertNotTrue($msg->isNetmail());
|
||||
$this->assertEquals('PVT_TEST',$msg->echoarea);
|
||||
$this->assertInstanceOf(Echomail::class,$msg);
|
||||
$this->assertEquals('PVT_TEST',$msg->set->get('set_echoarea'));
|
||||
}
|
||||
|
||||
$this->assertInstanceOf(Message::class,$pkt->messages[0]);
|
||||
$this->assertEquals('1/1 999/1',$pkt->messages[0]->path[0]);
|
||||
$this->assertEquals('Daytona BBS (Netherlands) (10:3/151)',$pkt->messages[0]->origin);
|
||||
$this->assertEquals('10:3/151.0@private',$pkt->messages[0]->fftn);
|
||||
$this->assertEquals('10:999/999.0@private',$pkt->messages[0]->tftn);
|
||||
$this->assertEquals('Hub Robot',$pkt->messages[0]->user_from);
|
||||
$this->assertEquals('Henk Hilgersum',$pkt->messages[0]->user_to);
|
||||
$this->assertEquals(' * Origin: Daytona BBS (Netherlands) (10:3/151)',$pkt->messages[0]->origin);
|
||||
$this->assertEquals('10:3/151.0@private',$pkt->messages[0]->set->get('set_fftn'));
|
||||
$this->assertEquals('10:999/999.0@private',$pkt->tftn_t);
|
||||
$this->assertEquals('Hub Robot',$pkt->messages[0]->from);
|
||||
$this->assertEquals('Henk Hilgersum',$pkt->messages[0]->to);
|
||||
$this->assertEquals('LEMEIN',$pkt->messages[0]->subject);
|
||||
$this->assertEquals('',$pkt->messages[0]->msgid);
|
||||
$this->assertEquals('',$pkt->messages[0]->replyid);
|
||||
$this->assertEquals('6bbe3d0475cf60804ca4e942212d3456',md5($pkt->messages[0]->message));
|
||||
$this->assertEquals('a5933ea2bbcddf955d6940e1dad5cc1b',md5($pkt->messages[0]->content));
|
||||
$this->assertEquals('a5933ea2bbcddf955d6940e1dad5cc1b',$pkt->messages[0]->msg_crc);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -227,7 +231,7 @@ class PacketTest extends TestCase
|
||||
|
||||
foreach ($pkt as $msg) {
|
||||
dump($msg);
|
||||
$this->assertNotTrue($msg->isNetmail());
|
||||
$this->assertInstanceOf(Echomail::class,$msg);
|
||||
$this->assertNotFalse($msg->path->search('1/1 999/1'));
|
||||
$this->assertNotFalse($msg->seenby->search('1/1 4 3/0 999/1 999'));
|
||||
}
|
||||
@@ -248,22 +252,22 @@ class PacketTest extends TestCase
|
||||
$this->assertEquals(1,$pkt->count());
|
||||
|
||||
foreach ($pkt as $msg) {
|
||||
$this->assertNotTrue($msg->isNetmail());
|
||||
$this->assertEquals('PVT_TEST',$msg->echoarea);
|
||||
$this->assertInstanceOf(Echomail::class,$msg);
|
||||
$this->assertEquals('PVT_TEST',$msg->set->get('set_echoarea'));
|
||||
$this->assertNotFalse($msg->seenby->search('1/1 999/1 999'));
|
||||
}
|
||||
|
||||
$this->assertInstanceOf(Message::class,$pkt->messages[0]);
|
||||
$this->assertEquals('999/1',$pkt->messages[0]->path[0]);
|
||||
$this->assertEquals('Alterant MailHUB at your service (10:999/1)',$pkt->messages[0]->origin);
|
||||
$this->assertEquals('10:999/1.0@private',$pkt->messages[0]->fftn);
|
||||
$this->assertEquals('10:999/999.0@private',$pkt->messages[0]->tftn);
|
||||
$this->assertEquals('Hub Robot',$pkt->messages[0]->user_from);
|
||||
$this->assertEquals('deon',$pkt->messages[0]->user_to);
|
||||
$this->assertEquals(' * Origin: Alterant MailHUB at your service (10:999/1)',$pkt->messages[0]->origin);
|
||||
$this->assertEquals('10:999/1.0@private',$pkt->messages[0]->set->get('set_fftn'));
|
||||
$this->assertEquals('10:999/999.0@private',$pkt->tftn_t);
|
||||
$this->assertEquals('Hub Robot',$pkt->messages[0]->from);
|
||||
$this->assertEquals('deon',$pkt->messages[0]->to);
|
||||
$this->assertEquals('Hub Robot Report',$pkt->messages[0]->subject);
|
||||
$this->assertEquals('10:999/1 612aecda',$pkt->messages[0]->msgid);
|
||||
$this->assertEquals('',$pkt->messages[0]->replyid);
|
||||
$this->assertEquals('61078e680cda04c8b5eba0f712582e70',md5($pkt->messages[0]->message));
|
||||
$this->assertEquals('354e42649bc4e6aea5f0833ce5ad43c5',md5($pkt->messages[0]->content));
|
||||
$this->assertEquals('354e42649bc4e6aea5f0833ce5ad43c5',$pkt->messages[0]->msg_crc);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,14 +286,13 @@ class PacketTest extends TestCase
|
||||
foreach ($pkt as $msg) {
|
||||
$messages = TRUE;
|
||||
|
||||
$this->assertNotTrue($msg->isNetmail());
|
||||
$this->assertInstanceOf(Echomail::class,$pkt->messages[0]);
|
||||
$this->assertSame('21:1/151 6189F64C',$msg->msgid);
|
||||
$this->assertSame('db727bd3778ddd457784ada4bf016010',md5($msg->message));
|
||||
$this->assertSame('5b627ab5936b0550a97b738f4deff419',md5($msg->message_src));
|
||||
$this->assertSame('1fe499b444ba7e391fbb4f1bc8a18ac1',md5($msg->content));
|
||||
$this->assertSame('1fe499b444ba7e391fbb4f1bc8a18ac1',$msg->msg_crc);
|
||||
$this->assertContains('3/2744 4/100 106 5/100',$msg->seenby);
|
||||
$this->assertContains('1/151 100 3/100',$msg->path);
|
||||
$this->assertCount(11,$msg->seenby);
|
||||
$this->assertCount(0,$msg->unknown);
|
||||
}
|
||||
|
||||
$this->assertTrue($messages);
|
||||
@@ -311,14 +314,13 @@ class PacketTest extends TestCase
|
||||
foreach ($pkt as $msg) {
|
||||
$messages = TRUE;
|
||||
|
||||
$this->assertNotTrue($msg->isNetmail());
|
||||
$this->assertInstanceOf(Echomail::class,$msg);
|
||||
$this->assertSame('21:1/126 eec6e958',$msg->msgid);
|
||||
$this->assertSame('5a525cc1c393292dc65160a852d4d615',md5($msg->message));
|
||||
$this->assertSame('a3193edcc68521d4ed07da6db2aeb0b6',md5($msg->message_src));
|
||||
$this->assertSame('a354ed6afcb436081e123e12dc0c8764',md5($msg->content));
|
||||
$this->assertSame('a354ed6afcb436081e123e12dc0c8764',$msg->msg_crc);
|
||||
$this->assertContains('1/995 2/100 116 1202 3/100 105 107 108 109 110 111 112 113 117 119',$msg->seenby);
|
||||
$this->assertContains('1/126 100 3/100',$msg->path);
|
||||
$this->assertCount(10,$msg->seenby);
|
||||
$this->assertCount(0,$msg->unknown);
|
||||
}
|
||||
|
||||
$this->assertTrue($messages);
|
||||
@@ -340,14 +342,13 @@ class PacketTest extends TestCase
|
||||
foreach ($pkt as $msg) {
|
||||
$messages = TRUE;
|
||||
|
||||
$this->assertNotTrue($msg->isNetmail());
|
||||
$this->assertInstanceOf(Echomail::class,$msg);
|
||||
$this->assertSame('10:999/1 612aecda',$msg->msgid);
|
||||
$this->assertSame('61078e680cda04c8b5eba0f712582e70',md5($msg->message));
|
||||
$this->assertSame('b9d65d4f7319ded282f3f1986276ae79',md5($msg->message_src));
|
||||
$this->assertSame('354e42649bc4e6aea5f0833ce5ad43c5',md5($msg->content));
|
||||
$this->assertSame('354e42649bc4e6aea5f0833ce5ad43c5',$msg->msg_crc);
|
||||
$this->assertContains('1/1 999/1 999',$msg->seenby);
|
||||
$this->assertContains('999/1',$msg->path);
|
||||
$this->assertCount(1,$msg->seenby);
|
||||
$this->assertCount(0,$msg->unknown);
|
||||
}
|
||||
|
||||
$this->assertTrue($messages);
|
||||
@@ -371,27 +372,25 @@ class PacketTest extends TestCase
|
||||
$c++;
|
||||
$messages = TRUE;
|
||||
|
||||
$this->assertNotTrue($msg->isNetmail());
|
||||
$this->assertInstanceOf(Echomail::class,$msg);
|
||||
|
||||
switch ($c) {
|
||||
case 1:
|
||||
$this->assertSame('3:712/886 220da89f',$msg->msgid);
|
||||
$this->assertSame('9f5544bea46ef57a45f561b9e07dd71e',md5($msg->message));
|
||||
$this->assertSame('9bf4b8c348ac235cc218577abf7140af',md5($msg->message_src));
|
||||
$this->assertSame('49caf318b7bebedc652f31622d014430',md5($msg->content));
|
||||
$this->assertSame('49caf318b7bebedc652f31622d014430',$msg->msg_crc);
|
||||
$this->assertContains('633/0 267 280 281 408 410 412 509 509 640/1384 712/114 550 620 848',$msg->seenby);
|
||||
$this->assertContains('712/886 848 633/280',$msg->path);
|
||||
$this->assertCount(2,$msg->seenby);
|
||||
$this->assertCount(0,$msg->unknown);
|
||||
break;
|
||||
|
||||
case 4:
|
||||
$this->assertSame('',$msg->msgid);
|
||||
$this->assertSame('b975057002def556c5a9497aacd000fb',md5($msg->message));
|
||||
$this->assertSame('c90dd234d2aa029af22c453a25b79a4e',md5($msg->message_src));
|
||||
$this->assertNull($msg->msgid);
|
||||
$this->assertSame('514205c1670312887a68272b21df593c',md5($msg->content));
|
||||
$this->assertSame('514205c1670312887a68272b21df593c',$msg->msg_crc);
|
||||
$this->assertContains('633/267 280 281 384 408 410 412 418 420 509 509 712/848 770/1 100 330',$msg->seenby);
|
||||
$this->assertContains('772/210 770/1 633/280',$msg->path);
|
||||
$this->assertCount(2,$msg->seenby);
|
||||
$this->assertCount(0,$msg->unknown);
|
||||
|
||||
default:
|
||||
continue 2;
|
||||
|
Reference in New Issue
Block a user