Repository navigation
Commit 234d781
authored
In HOPOPT and IPv6-Opts, a capture cut leaving only the type octet of a
CALIPSO, SMF_DPD or MPL option logged "FieldValueError: ... invalid <X> option
length: 0", at CRITICAL and again by beholder inside IPv6: the callbacks sizing
the option refused the zero the cut left for Opt Data Len, before the short
read could record the cut.
- Schema.unpack gives the fields after the one the data ends inside the short
read, as __short_read__ in their packet, a forward match included, and clears
it as each unpack starts, so a nested schema finds only its own.
- calipso_pad_len, mpl_opt_pad_len, smf_i_dpd_id_len and smf_dpd_data_selector
leave an Opt Data Len the data ends before to the short read. #2694's rule
then keeps CALIPSO and SMF_DPD, and refuses MPL quietly, as its parser
refuses the zero, as Router Alert's does.
- An Opt Data Len on the wire too short raises ProtocolError, not
FieldValueError, so a header refused for it is refused quietly. The four
helpers' documented Raises class moves: the breaking change.
- Schema._note_short_read takes packet as an optional argument, so a caller
with none keeps the record on the schema alone.
- The utilities-or-corekit page says how a callback tells a cut.
- Tests sweep every option of both headers at every cut, alone and in IPv6;
the pins of the FieldValueError move to ProtocolError.
The new tests fail on ab7be2f. protocols, corekit and project pass module
by module.
1 parent 6ae240d commit 234d781
9 files changed
Lines changed: 570 additions & 62 deletions
File tree
- docs/source/contributing/conventions
- pcapkit/protocols/schema
- internet
- tests/protocols
- internet
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
87 | 95 | | |
88 | 96 | | |
89 | 97 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
41 | 58 | | |
42 | 59 | | |
43 | 60 | | |
| |||
87 | 104 | | |
88 | 105 | | |
89 | 106 | | |
90 | | - | |
| 107 | + | |
| 108 | + | |
91 | 109 | | |
92 | 110 | | |
93 | | - | |
| 111 | + | |
94 | 112 | | |
95 | 113 | | |
96 | 114 | | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
97 | 122 | | |
98 | 123 | | |
99 | 124 | | |
100 | | - | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
101 | 128 | | |
102 | 129 | | |
103 | 130 | | |
| |||
120 | 147 | | |
121 | 148 | | |
122 | 149 | | |
123 | | - | |
124 | | - | |
| 150 | + | |
| 151 | + | |
125 | 152 | | |
126 | 153 | | |
127 | 154 | | |
| |||
133 | 160 | | |
134 | 161 | | |
135 | 162 | | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
136 | 174 | | |
137 | 175 | | |
138 | | - | |
139 | | - | |
140 | | - | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
141 | 183 | | |
142 | 184 | | |
143 | 185 | | |
| |||
268 | 310 | | |
269 | 311 | | |
270 | 312 | | |
271 | | - | |
| 313 | + | |
| 314 | + | |
272 | 315 | | |
273 | 316 | | |
274 | | - | |
| 317 | + | |
275 | 318 | | |
276 | 319 | | |
277 | 320 | | |
278 | 321 | | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
279 | 329 | | |
280 | 330 | | |
281 | 331 | | |
282 | | - | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
283 | 335 | | |
284 | 336 | | |
285 | 337 | | |
| |||
291 | 343 | | |
292 | 344 | | |
293 | 345 | | |
294 | | - | |
| 346 | + | |
| 347 | + | |
295 | 348 | | |
296 | 349 | | |
297 | | - | |
| 350 | + | |
298 | 351 | | |
299 | 352 | | |
300 | 353 | | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
301 | 361 | | |
302 | 362 | | |
303 | 363 | | |
304 | 364 | | |
305 | | - | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
306 | 368 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
738 | 738 | | |
739 | 739 | | |
740 | 740 | | |
| 741 | + | |
| 742 | + | |
| 743 | + | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
741 | 756 | | |
742 | 757 | | |
743 | 758 | | |
744 | 759 | | |
745 | 760 | | |
746 | 761 | | |
747 | 762 | | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
748 | 767 | | |
749 | 768 | | |
750 | 769 | | |
| |||
779 | 798 | | |
780 | 799 | | |
781 | 800 | | |
782 | | - | |
| 801 | + | |
783 | 802 | | |
784 | 803 | | |
785 | 804 | | |
| |||
801 | 820 | | |
802 | 821 | | |
803 | 822 | | |
804 | | - | |
| 823 | + | |
805 | 824 | | |
806 | 825 | | |
807 | 826 | | |
| |||
843 | 862 | | |
844 | 863 | | |
845 | 864 | | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
846 | 871 | | |
847 | 872 | | |
848 | 873 | | |
| |||
856 | 881 | | |
857 | 882 | | |
858 | 883 | | |
859 | | - | |
| 884 | + | |
860 | 885 | | |
861 | 886 | | |
862 | | - | |
| 887 | + | |
863 | 888 | | |
864 | 889 | | |
865 | 890 | | |
| |||
1187 | 1212 | | |
1188 | 1213 | | |
1189 | 1214 | | |
1190 | | - | |
| 1215 | + | |
| 1216 | + | |
1191 | 1217 | | |
1192 | 1218 | | |
1193 | 1219 | | |
1194 | 1220 | | |
1195 | 1221 | | |
1196 | 1222 | | |
| 1223 | + | |
| 1224 | + | |
| 1225 | + | |
| 1226 | + | |
1197 | 1227 | | |
1198 | 1228 | | |
1199 | 1229 | | |
1200 | 1230 | | |
| 1231 | + | |
| 1232 | + | |
1201 | 1233 | | |
1202 | 1234 | | |
1203 | 1235 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1422 | 1422 | | |
1423 | 1423 | | |
1424 | 1424 | | |
1425 | | - | |
| 1425 | + | |
1426 | 1426 | | |
1427 | 1427 | | |
1428 | 1428 | | |
| |||
1439 | 1439 | | |
1440 | 1440 | | |
1441 | 1441 | | |
1442 | | - | |
1443 | | - | |
| 1442 | + | |
| 1443 | + | |
| 1444 | + | |
1444 | 1445 | | |
1445 | | - | |
| 1446 | + | |
1446 | 1447 | | |
1447 | 1448 | | |
1448 | 1449 | | |
| |||
2110 | 2111 | | |
2111 | 2112 | | |
2112 | 2113 | | |
2113 | | - | |
| 2114 | + | |
| 2115 | + | |
2114 | 2116 | | |
2115 | 2117 | | |
2116 | | - | |
| 2118 | + | |
2117 | 2119 | | |
2118 | 2120 | | |
2119 | 2121 | | |
2120 | | - | |
| 2122 | + | |
2121 | 2123 | | |
2122 | 2124 | | |
2123 | 2125 | | |
| |||
2143 | 2145 | | |
2144 | 2146 | | |
2145 | 2147 | | |
2146 | | - | |
| 2148 | + | |
| 2149 | + | |
2147 | 2150 | | |
2148 | 2151 | | |
2149 | | - | |
| 2152 | + | |
2150 | 2153 | | |
2151 | 2154 | | |
2152 | 2155 | | |
2153 | 2156 | | |
2154 | 2157 | | |
2155 | 2158 | | |
2156 | | - | |
| 2159 | + | |
2157 | 2160 | | |
2158 | 2161 | | |
2159 | 2162 | | |
| |||
2178 | 2181 | | |
2179 | 2182 | | |
2180 | 2183 | | |
2181 | | - | |
| 2184 | + | |
| 2185 | + | |
2182 | 2186 | | |
2183 | 2187 | | |
2184 | | - | |
| 2188 | + | |
2185 | 2189 | | |
2186 | 2190 | | |
2187 | 2191 | | |
2188 | 2192 | | |
2189 | 2193 | | |
2190 | 2194 | | |
2191 | | - | |
| 2195 | + | |
2192 | 2196 | | |
2193 | 2197 | | |
2194 | 2198 | | |
| |||
0 commit comments