-
-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
Bundle standalone 'manufdb' file to comply with Wireshark changes. #4351
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #4351 +/- ##
==========================================
- Coverage 82.13% 82.10% -0.03%
==========================================
Files 350 352 +2
Lines 83136 83224 +88
==========================================
+ Hits 68280 68334 +54
- Misses 14856 14890 +34
|
8f08337
to
fbef1db
Compare
3320e39
to
99f51b3
Compare
if cachepath.exists(): | ||
try: | ||
with cachepath.open("rb") as fd: | ||
data = pickle.load(fd) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it’s quite dangerous to pickle.load from an arbitrary file. Would it be a possibility to use serialisation to json instead ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@polybassa @guedou This file is local. If you can edit it you can also add malicious code to .config/scapy/prestart.py
.
Considering this I don't see how it's an issue
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I totally agree on that point. I just wanted to mention it.
471de77
to
78bc2dc
Compare
Hm, should we Edit: we're already using gzip as a hard dependency, so I ended up using it. |
It took me a while but I figured out why Packit failed in https://download.copr.fedorainfracloud.org/results/packit/evverx-scapy-2/fedora-rawhide-x86_64/07331856-scapy/builder-live.log.gz. There is no |
Thanks for looking into it. I didn't fully read the XDG spec so I kinda assumed one shouldn't create the https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
|
/packit build |
Loading the dictionnary takes 0.5s by itsef, so we have to cache it in order to keep reasonable boot times.
/packit build |
now that secdev#4351 is merged and secdev#4280 is closed. and also run the netaccess tests. It's a follow-up to 86c7a05.
now that secdev#4351 is merged and secdev#4280 is closed. and also run the netaccess tests. It's a follow-up to 86c7a05.
This PR:
manufdb
. This fixesconf.manufdb.*
doesn't seem to work because Wireshark and some distros no longer ship the OUI database #4280data
. This was required in order not to introduce a slow down with this change..config/scapy
and.cache/scapy
now comply with theXDG_XXX_HOME
variables.Fun fact: a first version of this PR converted Manuf to a python dictionary. Apparently loading a file containing a very, very big Python dictionnary takes infinetly longer than loading text/binary and parsing it.