sts-sponsors team mailing list archive

[Anton Troyanov <mp+440340@xxxxxxxxxxxxxxxxxx>]

Anton Troyanov has proposed merging ~troyanov/maas:remove-dhcp-monitor-script into maas:master.

Commit message:
chore: remove dhcp-monitor script

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/440340

This script doesn't seem to be used anywhere.
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~troyanov/maas:remove-dhcp-monitor-script into maas:master.

diff --git a/debian/maas-common.install b/debian/maas-common.install
index dd8be51..7caf604 100644
--- a/debian/maas-common.install
+++ b/debian/maas-common.install
@@ -6,7 +6,6 @@ package-files/usr/lib/maas/maas-write-file usr/lib/maas
 # Install network monitoring scripts
 package-files/usr/lib/maas/network-monitor usr/lib/maas
 package-files/usr/lib/maas/beacon-monitor usr/lib/maas
-package-files/usr/lib/maas/dhcp-monitor usr/lib/maas
 
 # Install unverified-ssh
 # This is used for KVM host communication:
diff --git a/package-files/usr/lib/maas/dhcp-monitor b/package-files/usr/lib/maas/dhcp-monitor
deleted file mode 100755
index 008841f..0000000
--- a/package-files/usr/lib/maas/dhcp-monitor
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -euf
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# Utility script to wrap `tcpdump`, so that this script can be called with
-# `sudo` without allowing MAAS access to read arbitrary network traffic.
-# This script is designed to be as minimal as possible, to prevent arbitrary
-# code execution.
-
-if [ $# -ne 1 ]; then
-    echo "Write DHCP traffic to stdout using tcpdump's binary PCAP format." >&2
-    echo "" >&2
-    echo "Usage:" >&2
-    echo "    $0 <interface>" >&2
-    exit 32
-fi
-
-exec /usr/bin/tcpdump -Z root --interface "$1" --no-promiscuous-mode \
-    --packet-buffered --immediate-mode --snapshot-length=1500 -n -w - \
-    "udp and (port 67 or port 68) or (vlan and udp and (port 67 or port 68))"