management: Fix socket fd leak (#67)

Additionally, bump the version to 3.0.6.

Author: theopolis

osquery/__init__.py

@@ -4,7 +4,7 @@
 """
 
 __title__ = "osquery"
-__version__ = "3.0.5"
+__version__ = "3.0.6"
 __author__ = "osquery developers"
 __license__ = "BSD"
 __copyright__ = "Copyright 2015 Facebook"

osquery/management.py

@@ -71,7 +71,6 @@ def __init__(self, path=None):
                 self.path = LINUX_BINARY_PATH
         else:
             self.path = path
-        self._socket = tempfile.mkstemp(prefix="pyosqsock")
 
         # Disable logging for the thrift module (can be loud).
         logging.getLogger('thrift').addHandler(logging.NullHandler())
@@ -88,9 +87,16 @@ def __init__(self, path=None):
     def __del__(self):
         if self.connection is not None:
             self.connection.close()
+            self.connection = None
         if self.instance is not None:
             self.instance.kill()
             self.instance.wait()
+            self.instance = None
+
+        # On macOS and Linux mkstemp opens a descriptor.
+        if self._socket is not None and self._socket[0] is not None:
+            os.close(self._socket[0])
+            self._socket = None
 
     def open(self, timeout=2, interval=0.01):
         """