Skip to content
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

Jump to bottom

Support freebsd (OPNsense etc) for the included plugin isc_dhcpd #710

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Support freebsd (OPNsense etc) for the included plugin isc_dhcpd #710

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87fe53a
Update isc_dhcpd.py
dnlldl Mar 31, 2024
5a54c64
Fix formatting issue and dhcpd.conf issue
dnlldl Apr 1, 2024
3efa0dc
fix formatting
dnlldl Jun 13, 2024
6a8b5a0
fix formatting
dnlldl Jun 13, 2024
8cde308
fix formatting
dnlldl Jun 13, 2024
af817a5
trying to fix formatting
dnlldl Jun 13, 2024
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
12 changes: 11 additions & 1 deletion agents/plugins/isc_dhcpd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
import time

conf_file = None
for path in ["/etc/dhcpd.conf", "/etc/dhcp/dhcpd.conf", "/usr/local/etc/dhcpd.conf"]:
for path in [
"/etc/dhcpd.conf",
"/etc/dhcp/dhcpd.conf",
"/var/dhcpd/etc/dhcpd.conf",
"/usr/local/etc/dhcpd.conf",
]:
if os.path.exists(path):
conf_file = path
break
Expand All @@ -25,6 +30,7 @@
"/var/lib/dhcp/db/dhcpd.leases",
"/var/lib/dhcp/dhcpd.leases",
"/var/lib/dhcpd/dhcpd.leases", # CentOS
"/var/dhcpd/var/db/dhcpd.leases", # OPNsense
]:
if os.path.exists(path):
leases_file = path
Expand All @@ -44,6 +50,10 @@ def get_pid():
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926896
cmd = "ps aux | grep -w [d]hcpd | awk {'printf (\"%s \", $2)'}"

if "freebsd" in platform.platform().lower():
# workaround for freebsd
cmd = "ps aux | grep -w \"[d]hcpd\" | awk '{print $2}'"

# This produces a false warning in Bandit, claiming there was no failing test for this nosec.
# The warning is a bug in Bandit: https://github.com/PyCQA/bandit/issues/942
p = os.popen(cmd) # nosec B605 # BNS:f6c1b9
Expand Down
Loading