Skip to content

Detect TCPError/UDPerror/SCTPerror after IPv6 Extension Headers #4914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guedou wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Detect TCPError/UDPerror/SCTPerror after IPv6 Extension Headers #4914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion scapy/layers/inet6.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,11 +693,23 @@ def in6_chksum(nh, u, p):
#############################################################################
#############################################################################

nh_clserror = {socket.IPPROTO_TCP: TCPerror,
socket.IPPROTO_UDP: UDPerror}


# Inherited by all extension header classes
class _IPv6ExtHdr(_IPv6GuessPayload, Packet):
name = 'Abstract IPv6 Option Header'
aliastypes = [IPv6, IPerror6] # TODO ...
aliastypes = [IPv6]

def guess_payload_class(self, payload):
if self.nh in nh_clserror:
underlayer = self.underlayer
while underlayer:
if isinstance(underlayer, IPerror6):
return nh_clserror[self.nh]
underlayer = underlayer.underlayer
return super(_IPv6ExtHdr, self).guess_payload_class(payload)


# IPv6 options for Extension Headers #
Expand Down
4 changes: 3 additions & 1 deletion scapy/layers/sctp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
)
from scapy.data import SCTP_SERVICES
from scapy.layers.inet import IP, IPerror
from scapy.layers.inet6 import IP6Field, IPv6, IPerror6
from scapy.layers.inet6 import IP6Field, IPv6, IPerror6, nh_clserror

IPPROTO_SCTP = 132

Expand Down Expand Up @@ -303,6 +303,8 @@ def mysummary(self):
return Packet.mysummary(self)


nh_clserror[IPPROTO_SCTP] = SCTPerror

# SCTP Chunk variable params


Expand Down
9 changes: 8 additions & 1 deletion test/scapy/layers/inet6.uts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1996,7 +1996,7 @@ def test_getmacbyip6(mock_route6, mock_neighsol):

test_getmacbyip6() == "05:04:03:02:01:00"

= IPv6 - IPerror6 & UDPerror & _ICMPv6Error
= IPv6 - IPerror6 & UDPerror & _ICMPv6Error & TCPerror

query = IPv6(dst="2001:db8::1", src="2001:db8::2", hlim=1)/UDP()/DNS()
answer = IPv6(dst="2001:db8::2", src="2001:db8::1", hlim=1)/ICMPv6TimeExceeded()/IPerror6(dst="2001:db8::1", src="2001:db8::2", hlim=0)/UDPerror()/DNS()
Expand All @@ -2007,6 +2007,13 @@ from scapy.layers.inet6 import _ICMPv6Error
assert _ICMPv6Error().guess_payload_class(None) == IPerror6
assert _ICMPv6Error().hashret() == b''

# Test with extension header
# From:
# pkt = IPv6() / ICMPv6DestUnreach() / IPerror6 () / IPv6ExtHdrFragment(nh=6) / TCPerror()
raw_pkt = b'`\x00\x00\x00\x00L:@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x01\x00l5\x00\x00\x00\x00`\x00\x00\x00\x00\x1c,@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x06\x00\x00\x00\x00\x00\x00\x00\x00\x14\x00P\x00\x00\x00\x00\x00\x00\x00\x00P\x02 \x00\x8f}\x00\x00'
IPv6(raw_pkt).summary()
assert TCPerror in IPv6(raw_pkt)

= reset routes properly

conf.ifaces.reload()
Expand Down