MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

Remove protocol_family and its uses from the v21 network 

socket SCO extension.  It's a 2.0 property that got copied into
the 2.1 code by mistake.
pull/1/head
Michael Chisholm 2020-07-08 14:26:02 -04:00
parent 2f08ad03b0
commit d888eb60e2
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stix2/test/v21/test_observed_data.py
View File

@ -1139,7 +1139,6 @@ def test_network_traffic_socket_example():
h = stix2.v21.SocketExt( h = stix2.v21.SocketExt(
is_listening=True, is_listening=True,
address_family="AF_INET", address_family="AF_INET",
protocol_family="PF_INET",
socket_type="SOCK_STREAM", socket_type="SOCK_STREAM",
) )
nt = stix2.v21.NetworkTraffic( nt = stix2.v21.NetworkTraffic(
@ -1149,7 +1148,6 @@ def test_network_traffic_socket_example():
) )
assert nt.extensions['socket-ext'].is_listening assert nt.extensions['socket-ext'].is_listening
assert nt.extensions['socket-ext'].address_family == "AF_INET" assert nt.extensions['socket-ext'].address_family == "AF_INET"
assert nt.extensions['socket-ext'].protocol_family == "PF_INET"
assert nt.extensions['socket-ext'].socket_type == "SOCK_STREAM" assert nt.extensions['socket-ext'].socket_type == "SOCK_STREAM"
@ -1157,7 +1155,6 @@ def test_correct_socket_options():
se1 = stix2.v21.SocketExt( se1 = stix2.v21.SocketExt(
is_listening=True, is_listening=True,
address_family="AF_INET", address_family="AF_INET",
protocol_family="PF_INET",
socket_type="SOCK_STREAM", socket_type="SOCK_STREAM",
options={"ICMP6_RCVTIMEO": 100}, options={"ICMP6_RCVTIMEO": 100},
) )
@ -1172,7 +1169,6 @@ def test_incorrect_socket_options():
stix2.v21.SocketExt( stix2.v21.SocketExt(
is_listening=True, is_listening=True,
address_family="AF_INET", address_family="AF_INET",
protocol_family="PF_INET",
socket_type="SOCK_STREAM", socket_type="SOCK_STREAM",
options={"RCVTIMEO": 100}, options={"RCVTIMEO": 100},
) )
@ -1182,7 +1178,6 @@ def test_incorrect_socket_options():
stix2.v21.SocketExt( stix2.v21.SocketExt(
is_listening=True, is_listening=True,
address_family="AF_INET", address_family="AF_INET",
protocol_family="PF_INET",
socket_type="SOCK_STREAM", socket_type="SOCK_STREAM",
options={"SO_RCVTIMEO": '100'}, options={"SO_RCVTIMEO": '100'},
) )

10
stix2/v21/observables.py
View File

@ -503,16 +503,6 @@ class SocketExt(_Extension):
), ),
('is_blocking', BooleanProperty()), ('is_blocking', BooleanProperty()),
('is_listening', BooleanProperty()), ('is_listening', BooleanProperty()),
(
'protocol_family', EnumProperty(allowed=[
"PF_INET",
"PF_IPX",
"PF_APPLETALK",
"PF_INET6",
"PF_AX25",
"PF_NETROM",
]),
),
('options', DictionaryProperty(spec_version='2.1')), ('options', DictionaryProperty(spec_version='2.1')),
( (
'socket_type', EnumProperty(allowed=[ 'socket_type', EnumProperty(allowed=[