SMTP Protocol Support #1201

egecetin · 2023-09-17T21:10:51Z

No description provided.

codecov · 2023-09-17T21:14:26Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (f49f009) 82.48% compared to head (b3dc78a) 82.64%.
Report is 5 commits behind head on dev.

Additional details and impacted files

@@            Coverage Diff             @@
##              dev    #1201      +/-   ##
==========================================
+ Coverage   82.48%   82.64%   +0.15%     
==========================================
  Files         161      163       +2     
  Lines       20770    20962     +192     
  Branches     7847     7962     +115     
==========================================
+ Hits        17133    17324     +191     
- Misses       2961     2964       +3     
+ Partials      676      674       -2

Flag	Coverage Δ
alpine317	`72.40% <95.71%> (+0.19%)`	⬆️
centos7	`74.14% <96.99%> (+0.24%)`	⬆️
fedora37	`72.41% <95.71%> (+0.19%)`	⬆️
macos-11	`61.34% <81.81%> (+0.18%)`	⬆️
macos-12	`61.40% <82.46%> (+0.19%)`	⬆️
macos-ventura	`61.46% <84.10%> (+0.21%)`	⬆️
mingw32	`70.25% <96.40%> (+0.18%)`	⬆️
mingw64	`70.27% <96.40%> (+0.18%)`	⬆️
npcap	`83.35% <100.00%> (+0.11%)`	⬆️
ubuntu1804	`74.80% <96.18%> (+0.20%)`	⬆️
ubuntu2004	`73.22% <95.45%> (+0.23%)`	⬆️
ubuntu2204	`72.24% <95.55%> (+0.19%)`	⬆️
ubuntu2204-icpx	`59.02% <45.73%> (-0.08%)`	⬇️
unittest	`82.64% <100.00%> (+0.15%)`	⬆️
windows-2019	`83.39% <100.00%> (+0.14%)`	⬆️
windows-2022	`83.40% <100.00%> (+0.14%)`	⬆️
winpcap	`83.38% <100.00%> (+0.16%)`	⬆️
xdp	`59.02% <95.55%> (+0.33%)`	⬆️
zstd	`73.78% <96.10%> (+0.17%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

This reverts commit 2915fa8.

Packet++/header/SmtpLayer.h

…smtp

egecetin · 2023-11-06T19:28:19Z

@seladb I'll double check parsing with different SMTP packets but it's ready for review.

seladb · 2023-11-07T03:05:49Z

@seladb I'll double check parsing with different SMTP packets but it's ready for review.

Thank you @egecetin ! It might take me a few days to review but I'll get to it ASAP

Packet++/CMakeLists.txt

Packet++/src/TcpLayer.cpp

Packet++/header/SmtpLayer.h

Packet++/src/SmtpLayer.cpp

Packet++/header/SmtpLayer.h

Packet++/src/SmtpLayer.cpp

Packet++/src/SingleCommandTextProtocol.cpp

seladb · 2023-12-05T07:59:04Z

es not fit into single p

@egecetin I think I understand now. But if the TCP port is SMTP (25 or 587) and the packet ends with \r\n - isn't it a good enough indication that this is an SMTP packet? Are there additional checks we can do? 🤔

egecetin · 2023-12-05T08:16:42Z

Probably nothing we can do instead of checking of the session (at least i dont know)

Packet++/src/SmtpLayer.cpp

Tests/Packet++Test/Tests/SmtpTests.cpp

egecetin · 2024-01-03T16:56:53Z

@seladb I saw your comments but still don't have time to fix them. I try to fix your comments and update the PR as soon as possible for protocol type changes. Sorry for the delay

seladb · 2024-01-04T01:46:54Z

@seladb I saw your comments but still don't have time to fix them. I try to fix your comments and update the PR as soon as possible for protocol type changes. Sorry for the delay

Sure @egecetin no worries. We can keep the PR open until you're available to address the comments

egecetin · 2024-01-18T17:05:47Z

@seladb It's ready for review. You can check the PR when you have time

seladb · 2024-01-19T08:34:51Z

@seladb It's ready for review. You can check the PR when you have time

@egecetin you can update the branch, the FreeBSD issue should be fixed. I'll try to review the PR in the coming days

seladb

Please take a look at one comment below. I'm ok to merge this PR without it

seladb · 2024-01-22T09:08:45Z

Tests/Packet++Test/Tests/SmtpTests.cpp

+		"xc90.websitewelcome.com ESMTP Exim 4.69 #1 Mon, 05 Oct 2009 01:05:54 -0500 220-We do not authorize "
+		"the use of this system to transport unsolicited, 220 and/or bulk e-mail.");


In case of multiline, do we want to remove the status code from all the lines?

Meaning, remove 220- from the second and third lines?

I remember I also thought about it but to be honest I can't remember why I don't add any support for it. Let me check the code and protocol again before merging.

@seladb Updated the code for support it in both SMTP and FTP (They use same structure for it) but codecov-action currently broken because of node version (Check codecov/codecov-action#1230 and codecov/codecov-action#1228) so workflow is failing for now. Can you check the code again?

seladb · 2024-01-30T08:08:36Z

Packet++/src/SingleCommandTextProtocol.cpp

+			vDelim.push_back(getCommandInternal() + "-");
+			vDelim.push_back(getCommandInternal() + " ");


nit: we could run getCommandInternal() only once and create + init the vector in one line:

auto option = getCommandInternal(); auto vDelim = std::vector<std::string> { option + " ", option + "-"}

egecetin added 3 commits September 12, 2023 13:36

init

43908c1

wip

ea47872

add functions

1dcb111

egecetin added 14 commits September 18, 2023 15:39

structure test file

4145366

Add test files (WIP)

982a656

Update code and command list

1e608fd

parsing tests

83e3702

Merge remote-tracking branch 'upstream/dev' into smtp

46d9b2c

creation tests

f081e25

fix typos

a1dcf1d

Fix doxy

226dddc

Add editing tests

5987a29

Remove <domain> to fix doxy

2915fa8

Update README

1cf2e68

Remove extra space

455fa70

Revert "Remove <domain> to fix doxy"

3323d5e

This reverts commit 2915fa8.

escape html tags

7f43e6c

egecetin commented Oct 10, 2023

View reviewed changes

Packet++/header/SmtpLayer.h Outdated Show resolved Hide resolved

egecetin and others added 5 commits October 10, 2023 21:49

Merge branch 'dev' into smtp

c7e27df

Merge branch 'dev' into smtp

7a853d2

Merge branch 'smtp' of https://github.com/egecetin/PcapPlusPlus into …

da6dd81

…smtp

fix for starttls and multiline editing

b3a029a

Merge remote-tracking branch 'upstream/dev' into smtp

47937a0

egecetin marked this pull request as ready for review November 6, 2023 19:28

egecetin requested a review from seladb as a code owner November 6, 2023 19:28

egecetin requested a review from clementperon November 6, 2023 19:28

seladb reviewed Nov 28, 2023

View reviewed changes

egecetin added 2 commits December 7, 2023 09:59

Merge remote-tracking branch 'upstream/dev' into smtp

e1ed4b4

Merge remote-tracking branch 'upstream/dev' into smtp

3688efe

egecetin marked this pull request as ready for review December 9, 2023 12:50

egecetin requested a review from seladb December 9, 2023 13:17

Merge branch 'dev' into smtp

c5f66e0

seladb reviewed Dec 15, 2023

View reviewed changes

egecetin added 6 commits January 15, 2024 19:56

minor fixes

4719e94

read comments carefully

c529150

add user/pass packets

9a76d3e

Merge remote-tracking branch 'upstream/master' into smtp

75ac849

update type for new ProtocolType

f6d66ee

remove whitespace

91bb212

egecetin requested a review from seladb January 18, 2024 17:05

Merge branch 'dev' into smtp

9240362

seladb approved these changes Jan 22, 2024

View reviewed changes

egecetin and others added 5 commits January 27, 2024 20:04

Remove protocol delimiter from multiline packets

f2634f4

char to string?

5e2675d

centos7 still fails?

2758392

regex reqs gcc 4.9 centos 7 not supports

ea1b5ca

Merge branch 'dev' into smtp

ecf9599

seladb approved these changes Jan 30, 2024

View reviewed changes

fix comment

b3dc78a

egecetin merged commit c43617a into seladb:dev Jan 31, 2024
39 checks passed

egecetin deleted the smtp branch January 31, 2024 18:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SMTP Protocol Support #1201

SMTP Protocol Support #1201

egecetin commented Sep 17, 2023

codecov bot commented Sep 17, 2023 •

edited

Loading

egecetin commented Nov 6, 2023

seladb commented Nov 7, 2023

seladb commented Dec 5, 2023

egecetin commented Dec 5, 2023

egecetin commented Jan 3, 2024 •

edited

Loading

seladb commented Jan 4, 2024

egecetin commented Jan 18, 2024

seladb commented Jan 19, 2024 •

edited

Loading

seladb left a comment

seladb Jan 22, 2024

egecetin Jan 22, 2024

egecetin Jan 28, 2024 •

edited

Loading

seladb Jan 30, 2024

		"xc90.websitewelcome.com ESMTP Exim 4.69 #1 Mon, 05 Oct 2009 01:05:54 -0500 220-We do not authorize "
		"the use of this system to transport unsolicited, 220 and/or bulk e-mail.");

		vDelim.push_back(getCommandInternal() + "-");
		vDelim.push_back(getCommandInternal() + " ");

SMTP Protocol Support #1201

SMTP Protocol Support #1201

Conversation

egecetin commented Sep 17, 2023

codecov bot commented Sep 17, 2023 • edited Loading

Codecov Report

egecetin commented Nov 6, 2023

seladb commented Nov 7, 2023

seladb commented Dec 5, 2023

egecetin commented Dec 5, 2023

egecetin commented Jan 3, 2024 • edited Loading

seladb commented Jan 4, 2024

egecetin commented Jan 18, 2024

seladb commented Jan 19, 2024 • edited Loading

seladb left a comment

Choose a reason for hiding this comment

seladb Jan 22, 2024

Choose a reason for hiding this comment

egecetin Jan 22, 2024

Choose a reason for hiding this comment

egecetin Jan 28, 2024 • edited Loading

Choose a reason for hiding this comment

seladb Jan 30, 2024

Choose a reason for hiding this comment

codecov bot commented Sep 17, 2023 •

edited

Loading

egecetin commented Jan 3, 2024 •

edited

Loading

seladb commented Jan 19, 2024 •

edited

Loading

egecetin Jan 28, 2024 •

edited

Loading