fix for issue #48 and logging fix

laikaboss/objectmodel.py

@@ -50,6 +50,25 @@ def ensureNotUnicode(buffer):
     else:
         return buffer
 
+# Utility function to make sure the buffer is a string and not None 
+# (or whatever other weirdness comes through)
+def ensureStr(child_buffer):
+    # buffers and bytearrays can be cast to string
+    try:
+        if type(child_buffer) == buffer or type(child_buffer) == bytearray:
+            child_buffer = str(child_buffer)
+    except:
+        # Test cases do not produce any exceptions, but it's here just in case
+        raise Exception("Buffer of %s found, not creating child scanObject" % str(type(child_buffer)))
+
+    # refuse to process anything else, as non-string objects can crash the worker
+    if not type(child_buffer) is str:
+        raise Exception("Buffer of %s found, not creating child scanObject" % str(type(child_buffer)))
+
+    child_buffer = ensureNotUnicode(child_buffer)
+
+    return child_buffer
+
 def cleanKey(key):
     bad_chars = ['\0', '.', '$']
     new_key = key
@@ -101,7 +120,7 @@ def __init__(self, objectHash = "",
         self.scanModules = []
         self.flags = []
         self.objectHash = objectHash
-        self.buffer = ensureNotUnicode(buffer)
+        self.buffer = ensureStr(buffer)
         self.objectSize = objectSize
         self.filename = filename
         self.ephID = convertToUTF8(ephID)
@@ -228,7 +247,7 @@ def __init__(self, source=None, level=None, rootUID=None):
 
 class SI_Object(object):
     def __init__(self, buffer, externalVars):
-        self.buffer = ensureNotUnicode(buffer)
+        self.buffer = ensureStr(buffer)
         self.externalVars = externalVars 
     buffer = ""
     externalVars = None

laikamilter.py

@@ -576,6 +576,7 @@ def __init__(self, logger):
         self.milterConfig.loadAll()
         self.logger = logger
         self.attachements           = ""
+        self.uuid                   = ""
 
 
     #Required final call to close zmq connection
@@ -588,7 +589,14 @@ def close(self):
 
     #public function to get flags from si-scan
     def zmqGetFlagswithRetry(self, numRetries, milterContext):
+        self.uuid = milterContext.uuid
         sendResponse = self._zmqGetFlags(numRetries, milterContext)
+        if sendResponse == -1:
+            #If your servers list is blank, you need to add servers into your laikamilter config
+            self.logger.writeLog(syslog.LOG_ERR, \
+                        "ERROR Laikamilter failed to get a response from the Laikad servers:"\
+                        + str(milterContext.milterConfig.servers)
+                    )
 
 
     def _getNextScanServer(self):
@@ -628,15 +636,15 @@ def _zmqGetFlags(self, numRetries, milterContext):
     def _zmqSendBuffer(self, milterContext,numRetries, REQUEST_TIMEOUT,SERVER_ENDPOINT):
         gotResponseFromScanner=-1
         self.client = Client(SERVER_ENDPOINT)
-
         log = milterContext.uuid+" Sending "+ str(milterContext.qid)+" to "+ SERVER_ENDPOINT
         self.logger.writeLog(syslog.LOG_DEBUG, "%s"%(str(log)))
         myhostname = socket.gethostname()
         externalObject = ExternalObject(
                                         buffer=milterContext.fileBuffer, 
                                         externalVars=ExternalVars(
                                                                   filename=milterContext.archiveFileName, 
-                                                                  source=milterContext.milterConfig.milterName+"-"+str(myhostname[:myhostname.index(".")]),
+                                                                  source=milterContext.milterConfig.milterName+"-"+ \
+                                                                          myhostname.split(".")[0],
                                                                   ephID=milterContext.qid,
                                                                   uniqID=milterContext.messageID
                                                                  ),