Skip to content

Commit

Permalink
1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tomsteele committed Apr 16, 2015
1 parent b99023f commit fd0c05b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.DS_Store
build
.idea/
*.idea
*.pyc
Expand Down
2 changes: 2 additions & 0 deletions MANIFEST
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 4 additions & 3 deletions lairdrone/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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']:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name="lairdrone",
version="0.1.9",
version="1.0.0",
author='Dan Kottmann, Tom Steele',
author_email='[email protected], [email protected]',
packages=['lairdrone'],
Expand All @@ -11,7 +11,7 @@
license='LICENSE.txt',
description='Packages and scripts for use with Lair',
install_requires=[
"pymongo >= 2.5",
"pymongo >= 3.0",
],

)

0 comments on commit fd0c05b

Please sign in to comment.