allow re-enabling disabled sources

Closes redmine ticket 3843.

diff --git a/suricata/update/commands/enablesource.py b/suricata/update/commands/enablesource.py
index 45a859878d37371c276201d273960fa3e857df24..53bb68a3c7150c35f66ce1f0adab7cd81bb58513 100644 (file)
--- a/suricata/update/commands/enablesource.py
+++ b/suricata/update/commands/enablesource.py
@@ -62,7 +62,7 @@ def enable_source():
 
     source_index = sources.load_source_index(config)
 
-    if not name in source_index.get_sources():
+    if not name in source_index.get_sources() and not name in sources.get_sources_from_dir():
         logger.error("Unknown source: %s", name)
         return 1
 

diff --git a/suricata/update/sources.py b/suricata/update/sources.py
index 1cef09b5a3b97e0301f6bb33557ee4fe50931b7a..651a4d60d8125a701e5d1681425773a22bd074c7 100644 (file)
--- a/suricata/update/sources.py
+++ b/suricata/update/sources.py
@@ -44,6 +44,14 @@ def get_source_directory():
 def get_index_filename():
     return os.path.join(config.get_cache_dir(), SOURCE_INDEX_FILENAME)
 
+def get_sources_from_dir():
+    """Return names of all files existing in the sources dir"""
+    source_dir = get_source_directory()
+    source_names = []
+    (_, _, fnames) = next(os.walk(source_dir))
+    source_names = [".".join(fname.split('.')[:-1]) for fname in fnames]
+    return source_names
+
 def get_enabled_source_filename(name):
     return os.path.join(get_source_directory(), "%s.yaml" % (
         safe_filename(name)))