From fd0c05b70d8c5137e2d6d763a8b713f2873a257e Mon Sep 17 00:00:00 2001 From: Tom Steele Date: Wed, 15 Apr 2015 21:47:15 -0700 Subject: [PATCH] 1.0.0 --- .gitignore | 1 + MANIFEST | 2 ++ lairdrone/api.py | 7 ++++--- setup.py | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ee6e6a0..3908ae2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store +build .idea/ *.idea *.pyc diff --git a/MANIFEST b/MANIFEST index b867f26..27ac31a 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,12 +1,14 @@ # file GENERATED by distutils, do NOT edit setup.py bin/drone-burp +bin/drone-dirb bin/drone-nessus bin/drone-nexpose bin/drone-nmap bin/drone-raw lairdrone/__init__.py lairdrone/api.py +lairdrone/dirb.py lairdrone/drone_models.py lairdrone/exceptions.py lairdrone/helper.py diff --git a/lairdrone/api.py b/lairdrone/api.py index 85c927c..1fc5ae1 100644 --- a/lairdrone/api.py +++ b/lairdrone/api.py @@ -6,6 +6,7 @@ import os import copy import hashlib +import ssl from pymongo import ASCENDING, DESCENDING from datetime import datetime from bson.objectid import ObjectId @@ -26,7 +27,7 @@ def db_connect(): :return:database connection object """ - from pymongo import Connection, uri_parser + from pymongo import MongoClient, uri_parser # Connect to the database if 'MONGO_URL' not in os.environ: @@ -36,12 +37,12 @@ def db_connect(): mongo_options = uri_parser.parse_uri(os.environ['MONGO_URL']) (host, port) = mongo_options['nodelist'][0] - ssl = mongo_options['options'].get('ssl', False) + is_ssl = mongo_options['options'].get('ssl', False) print "[+] Attempting connection to database '{0}:{1}/{2}'".format( host, str(port), mongo_options['database'] ) - conn = Connection(host, port, ssl=ssl) + conn = MongoClient(host, port, ssl=is_ssl, ssl_cert_reqs=ssl.CERT_NONE) db = conn[mongo_options['database']] if mongo_options['username'] or mongo_options['password']: diff --git a/setup.py b/setup.py index f740a07..c5776d4 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name="lairdrone", - version="0.1.9", + version="1.0.0", author='Dan Kottmann, Tom Steele', author_email='dan.kottmann@fishnetsecurity.com, thomas.steele@fishnetsecurity.com', packages=['lairdrone'], @@ -11,7 +11,7 @@ license='LICENSE.txt', description='Packages and scripts for use with Lair', install_requires=[ - "pymongo >= 2.5", + "pymongo >= 3.0", ], )