Skip to content

fix: Update vendor lookup method and dependency for Debian packaging #5

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
aquilamacedo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Update vendor lookup method and dependency for Debian packaging #5

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
20 changes: 18 additions & 2 deletions src/arpwitch/utils/sniffer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

import logging
import OuiLookup
import os
import csv

from .utils import timestamp
from arpwitch.exceptions import ArpWitchException
Expand Down Expand Up @@ -49,6 +50,7 @@ def scrub_address(self, address_type, address):
raise ArpWitchException("unsupported address_type", address_type)

def expand_packet_session_data(self, packet, session):
oui_path = "/usr/share/ieee-data/oui.csv"

hw_address_is_new = False
ip_address_is_new = False
Expand All @@ -57,7 +59,21 @@ def expand_packet_session_data(self, packet, session):
ip_address = packet["src"]["ip"]

# lookup hw_vendor name
hw_vendor = list(OuiLookup.OuiLookup().query(hw_address)[0].values())[0]
hw_vendor = ''.join(hw_address.split(":")[:3]).upper()

if os.path.exists(oui_path):
# check if the CSV file from ieee-data exists
with open(oui_path, "r") as oui_file:
reader = csv.DictReader(oui_file)
for row in reader:
if row["Assignment"] == hw_vendor:
hw_vendor = row["Organization Name"]
break
else:
hw_vendor = None # if vendor is not found in the CSV
else:
from ouilookup import OuiLookup
hw_vendor = list(OuiLookup().query(hw_address)[0].values())[0]

# update session['ip'] data
if ip_address not in session["ip"].keys():
Expand Down