diff --git a/cuckoo.py b/cuckoo.py index 4738bc4b7..a7e81fc54 100644 --- a/cuckoo.py +++ b/cuckoo.py @@ -15,7 +15,7 @@ from lib.cuckoo.common.exceptions import CuckooCriticalError from lib.cuckoo.common.exceptions import CuckooDependencyError from lib.cuckoo.core.database import Database - from lib.cuckoo.core.startup import check_working_directory, check_configs, check_signatures, cuckoo_clean, cuckoo_clean_failed_tasks, cuckoo_clean_failed_url_tasks,cuckoo_clean_before_day,cuckoo_clean_sorted_pcap_dump,cuckoo_clean_bson_suri_logs, cuckoo_clean_pending_tasks + from lib.cuckoo.core.startup import check_working_directory, check_configs, cuckoo_clean, cuckoo_clean_failed_tasks, cuckoo_clean_failed_url_tasks,cuckoo_clean_before_day,cuckoo_clean_sorted_pcap_dump,cuckoo_clean_bson_suri_logs, cuckoo_clean_pending_tasks from lib.cuckoo.core.startup import create_structure from lib.cuckoo.core.startup import init_logging, init_modules, init_console_logging from lib.cuckoo.core.startup import init_tasks, init_yara @@ -38,7 +38,6 @@ def cuckoo_init(quiet=False, debug=False, artwork=False, test=False): logo() check_working_directory() check_configs() - check_signatures() create_structure() if artwork: @@ -111,7 +110,7 @@ def cuckoo_main(max_analysis_count=0): if args.failed_clean: cuckoo_clean_failed_tasks() - sys.exit(0) + sys.exit(0) if args.failed_url_clean: cuckoo_clean_failed_url_tasks() diff --git a/docs/book/src/usage/utilities.rst b/docs/book/src/usage/utilities.rst index 8da678c62..81c405b32 100644 --- a/docs/book/src/usage/utilities.rst +++ b/docs/book/src/usage/utilities.rst @@ -67,36 +67,6 @@ running Cuckoo with many virtual machines: This could increase the performance of your system because the reporting is not yet demanded to Cuckoo. -Community Download Utility -========================== - -This utility downloads signatures from `Cuckoo Community Repository`_ and installs -specific additional modules in your local setup. -Following are the usage options:: - - $ ./utils/community.py -h - - usage: community.py [-h] [-a] [-s] [-p] [-m] [-r] [-f] [-w] [-b BRANCH] - - optional arguments: - -h, --help show this help message and exit - -a, --all Download everything - -s, --signatures Download Cuckoo signatures - -p, --processing Download processing modules - -m, --machinemanagers - Download machine managers - -r, --reporting Download reporting modules - -f, --force Install files without confirmation - -w, --rewrite Rewrite existing files - -b BRANCH, --branch BRANCH - Specify a different branch - -*Example*: install all available signatures:: - - $ ./utils/community.py --signatures --force - -.. _`Cuckoo Community Repository`: https://github.com/cuckoobox/community - Database migration utility ========================== diff --git a/lib/cuckoo/core/startup.py b/lib/cuckoo/core/startup.py index 2bf2765f8..bd301666f 100644 --- a/lib/cuckoo/core/startup.py +++ b/lib/cuckoo/core/startup.py @@ -69,26 +69,6 @@ def check_configs(): return True -def check_signatures(): - """Checks if user pulled in community signature modules - @raise CuckooStartupError: if community signature modules not installed. - """ - - sigpath = os.path.join(CUCKOO_ROOT, "modules", "signatures") - bad = False - - if os.path.exists(sigpath): - path, dirs, files = os.walk(sigpath).next() - if len(files) < 20: - bad = True - else: - bad = True - - if bad: - log.info( - "Signature modules are not installed. Please run: utils/community.py --force --rewrite --all") - - def create_structure(): """Creates Cuckoo directories.""" folders = [