diff --git a/src/opnsense/scripts/suricata/lib/params.py b/src/opnsense/scripts/suricata/lib/params.py deleted file mode 100644 index 0d48bab44..000000000 --- a/src/opnsense/scripts/suricata/lib/params.py +++ /dev/null @@ -1,46 +0,0 @@ -""" - Copyright (c) 2015 Ad Schellevis - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -""" - -import sys - - -def update_params(parameters): - """ update predefined parameters with given list from shell (as switches) - for example /a valA /b valB - converts to - {'a':'valA','b':'valB'} - (assuming parameters contains both a and b) - :param parameters: parameter dictionary - :return: - """ - cmd = None - for arg in sys.argv[1:]: - if cmd is None: - cmd = arg[1:] - else: - if cmd in parameters and arg.strip() != '': - parameters[cmd] = arg.strip() - cmd = None diff --git a/src/opnsense/scripts/suricata/queryAlertLog.py b/src/opnsense/scripts/suricata/queryAlertLog.py index 0a8962e79..6d57aff31 100755 --- a/src/opnsense/scripts/suricata/queryAlertLog.py +++ b/src/opnsense/scripts/suricata/queryAlertLog.py @@ -30,13 +30,15 @@ query suricata alert log """ +import sys import os.path import re import sre_constants import shlex import ujson -from lib.log import reverse_log_reader -from lib.params import update_params +sys.path.insert(0, "/usr/local/opnsense/site-python") +from log_helper import reverse_log_reader +from params import update_params from lib import suricata_alert_log if __name__ == '__main__': diff --git a/src/opnsense/scripts/suricata/lib/log.py b/src/opnsense/site-python/log_helper.py similarity index 100% rename from src/opnsense/scripts/suricata/lib/log.py rename to src/opnsense/site-python/log_helper.py