Skip to content

a few bug fixes and tweaks for the new(er) Redis version and Suricata 8. … #243

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

Merged
rkoumis merged 3 commits into from
Jul 18, 2025
Merged

a few bug fixes and tweaks for the new(er) Redis version and Suricata 8. … #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bdd6be
a few bug fixes and tweaks for new(er) Redis version and Suricata 8. …
whartond Jul 10, 2025
aa9d4e9
bug/lint fix
whartond Jul 11, 2025
7af2416
ruff format 'fix'
whartond Jul 11, 2025
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
8 changes: 7 additions & 1 deletion app/dalton.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,12 @@ def ensure_rulesets_exist():
"teapot_redis_expire value %d greater than redis_expire value %d. This is not recommended and may result in teapot jobs being deleted from disk before they expire in Redis."
% (TEAPOT_REDIS_EXPIRE, REDIS_EXPIRE)
)
if SHARE_EXPIRE < REDIS_EXPIRE:
logger.warning(
"share_expire value %d less than redis_expire value %d. This is not recommended; using redis_expire value %d as the share_expire value instead."
% (SHARE_EXPIRE, REDIS_EXPIRE, REDIS_EXPIRE)
)
SHARE_EXPIRE = REDIS_EXPIRE

# other checks
if MAX_PCAP_FILES < 1:
Expand Down Expand Up @@ -3011,7 +3017,7 @@ def page_queue_default():
):
# job has expired
logger.debug("Dalton in page_queue_default(): removing job: %s" % jid)
redis.lrem("recent_jobs", jid)
redis.lrem("recent_jobs", 0, jid)
# just in case, expire all keys associated with jid
expire_all_keys(redis, jid)
else:
Expand Down
59 changes: 38 additions & 21 deletions dalton-agent/dalton-agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,10 @@
API_KEY = config.get("dalton", "API_KEY")
POLL_INTERVAL = int(config.get("dalton", "POLL_INTERVAL"))
KEEP_JOB_FILES = config.getboolean("dalton", "KEEP_JOB_FILES")
USE_SURICATA_SOCKET_CONTROL = config.getboolean(
USE_SURICATA_SOCKET_CONTROL_CONFIG_SETTING = config.getboolean(
"dalton", "USE_SURICATA_SOCKET_CONTROL"
)
USE_SURICATA_SOCKET_CONTROL = USE_SURICATA_SOCKET_CONTROL_CONFIG_SETTING
SURICATA_SC_PYTHON_MODULE = config.get("dalton", "SURICATA_SC_PYTHON_MODULE")
SURICATA_SOCKET_NAME = config.get("dalton", "SURICATA_SOCKET_NAME")

Expand Down Expand Up @@ -210,7 +211,7 @@ def get_engine_version(path):
else:
# use filename of binary
engine = os.path.basename(path).lower()
logger.warn(
logger.warning(
"Could not determine engine name, using '%s' from IDS_BINARY path"
% engine
)
Expand All @@ -235,7 +236,7 @@ def get_engine_version(path):
# rust support exists
version = "rust_%s" % version
except Exception as e:
logger.warn("Exception in get_engine_version(): %s" % e)
logger.warning("Exception in get_engine_version(): %s" % e)
pass
logger.debug(
"Using IDS binary '%s': engine: '%s', version '%s'" % (path, engine, version)
Expand Down Expand Up @@ -294,19 +295,19 @@ def hash_file(filenames):
try:
TCPDUMP_BINARY = config.get("dalton", "TCPDUMP_BINARY")
except Exception as e:
logger.warn("Unable to get config value 'TCPDUMP_BINARY': %s" % e)
logger.warning("Unable to get config value 'TCPDUMP_BINARY': %s" % e)
pass
if TCPDUMP_BINARY == "auto":
TCPDUMP_BINARY = find_file("tcpdump")
if not TCPDUMP_BINARY or not os.path.exists(TCPDUMP_BINARY):
logger.warn("Could not find 'tcpdump' binary.")
logger.warning("Could not find 'tcpdump' binary.")
TCPDUMP_BINARY = ""

IDS_BINARY = "auto"
try:
IDS_BINARY = config.get("dalton", "IDS_BINARY")
except Exception as e:
logger.warn("Unable to get config value 'IDS_BINARY': %s" % e)
logger.warning("Unable to get config value 'IDS_BINARY': %s" % e)
pass
if IDS_BINARY == "auto":
IDS_BINARY = find_file("suricata")
Expand Down Expand Up @@ -344,7 +345,7 @@ def hash_file(filenames):
# Socket Control supported in Suricata 1.4 and later
if float(".".join(prefix_strip(eng_ver).split(".")[:2])) < 3.0:
msg = f"Dalton Agent does not support Suricata Socket Control for Suricata versions before 3.0. This is running Suricata version {eng_ver}. Disabling Suricata Socket Control Mode."
logger.warn(msg)
logger.warning(msg)
USE_SURICATA_SOCKET_CONTROL = False

if USE_SURICATA_SOCKET_CONTROL:
Expand Down Expand Up @@ -466,14 +467,20 @@ def print_msg(msg):
send_update(msg, JOB_ID)


def print_warning(msg):
logger.warning(msg)
msg = "WARNING: %s" % msg
print_debug(msg)


def print_debug(msg):
global JOB_DEBUG_LOG
if JOB_DEBUG_LOG:
fh = open(JOB_DEBUG_LOG, "a")
fh.write("*****\n%s\n" % msg)
fh.close()
else:
logger.debug("print_debug() called but no JOB_DEBUG_LOG exists")
logger.warning("print_debug() called but no JOB_DEBUG_LOG exists")


# **********************
Expand Down Expand Up @@ -545,7 +552,7 @@ def stop_suricata_daemon(self):
"""Stop Suricata daemon using socket control."""
logger.debug("stop_suricata_daemon() called")
if not self.suricata_is_running:
logger.warn(
logger.warning(
"stop_suricata_daemon() called but Suricata may not be running."
" Still attempting shutdown but it will likely error."
)
Expand Down Expand Up @@ -853,7 +860,7 @@ def post_results(json_data):
urllib.request.urlopen(req, timeout=URLLIB_TIMEOUT)
except Exception as e:
try:
re.search("(^[^\?]*)", url).group(1)
re.search(r"(^[^?]*)", url).group(1)
except Exception:
pass

Expand Down Expand Up @@ -1122,7 +1129,7 @@ def run_suricata_sc():
SCONTROL.restart_suricata_socket_mode(newconfig=IDS_CONFIG_FILE)
else:
if not SCONTROL.suricata_is_running:
logger.warn("Suricata thread not running ... starting it back up....")
logger.warning("Suricata thread not running ... starting it back up....")
SCONTROL.ruleset_hash = ruleset_hash
SCONTROL.config_hash = config_hash
SCONTROL.restart_suricata_socket_mode(newconfig=IDS_CONFIG_FILE)
Expand Down Expand Up @@ -1364,7 +1371,7 @@ def check_for_errors(tech):
"Bad pcap file(s) submitted to Snort. Pcap files should be in libpcap or pcapng format.\n"
)
else:
logger.warn(
logger.warning(
f"Unexpected engine value passed to check_for_errors(): {tech}"
)
ids_log_fh.close()
Expand Down Expand Up @@ -1636,16 +1643,27 @@ def submit_job(job_id, job_directory):
< 3.0
):
msg = f"Dalton Agent does not support Suricata Socket Control for Suricata versions before 3.0. This is running Suricata version {eng_ver}. Cannot use Suricata Socket Control Mode."
logger.warn(msg)
print_warning(msg)
# should not be necessary but just in case
USE_SURICATA_SOCKET_CONTROL = False
else:
msg = f"Changing Suricata Socket Control option to '{useSuricataSC}' per job settings."
logger.info(msg)
print_debug(msg)
USE_SURICATA_SOCKET_CONTROL = useSuricataSC
if (
USE_SURICATA_SOCKET_CONTROL
== USE_SURICATA_SOCKET_CONTROL_CONFIG_SETTING
):
msg = f"Changing Suricata Socket Control option to '{useSuricataSC}' per job settings."
logger.info(msg)
print_debug(msg)
USE_SURICATA_SOCKET_CONTROL = useSuricataSC
else:
# Suricata Socket Control has been disabled upstream in the code for some reason (e.g. Python libs not present)
print_warning(
"Unable to use Suricata Socket Control. Either the Suricata version does not support it or the libs could not be found."
)
except Exception as e:
logger.warn("Problem getting 'use-suricatasc' value from manifest: %s" % e)
logger.warning(
"Problem getting 'use-suricatasc' value from manifest: %s" % e
)

trackPerformance = False
try:
Expand Down Expand Up @@ -1825,8 +1843,7 @@ def submit_job(job_id, job_directory):
# cannot get rule profiling or keyword profiling when using Socket Control
if trackPerformance and USE_SURICATA_SOCKET_CONTROL:
msg = "'Rule profiling' enabled, disabling Suricata Socket control."
logger.warn(msg)
print_debug(msg)
print_warning(msg)
USE_SURICATA_SOCKET_CONTROL = False
# run the Suricata job
if USE_SURICATA_SOCKET_CONTROL:
Expand Down Expand Up @@ -2028,7 +2045,7 @@ def submit_job(job_id, job_directory):
)
if JOB_ID:
# unexpected error happened on agent when trying to process a job but there may not be job data so compile an empty response with the exception error message and try to send it
logger.warn(
logger.warning(
"Possible communication error processing jobid %s. Attempting to send error message to controller."
% JOB_ID
)
Expand Down