Fixed exception in directory input

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.2.4
+
+- Fixed exception in directory input. (Thanks to Georgi Georgiev for providing a patch)
+
 ## 3.2.3
 
 - Added support for Splunk 8.1. (Thanks to Aaron Myers for reporting the issue)

README.md

@@ -353,6 +353,7 @@ This add-on is maintained by Jorrit Folmer. These people and organisations have
 
 - Aaron Myers
 - Christopher G Andrews (ChristopherGAndrews)
+- Georgi Georgiev
 - John (john-9c54a80b)
 - Martin Wright
 - Mike Kolk

app.manifest

@@ -5,7 +5,7 @@
     "id": {
       "group": null,
       "name": "TA-dmarc",
-      "version": "3.2.3"
+      "version": "3.2.4"
     },
     "author": [
       {

bin/dmarc/dir2splunk.py

@@ -75,6 +75,14 @@ def __init__(
         self.tmp_dir = None
         self.source_filename = ""
 
+    def myfsencode(self, file):
+        ''' Given a filename
+            Return the byte version of it, depending on the Python version '''
+        if sys.version_info[0] < 3:
+            return(file)
+        else:
+            return(os.fsencode(file))
+
     def list_incoming(self):
         """ Returns a list of files for the incoming directory """
         newfileslist = []
@@ -107,7 +115,7 @@ def filter_seen_files(self, fileslist):
         encoding of the filename because mongo doesn't like slashes in the key """
         seen_files = set()
         for file in fileslist:
-            key = "%s" % base64.b64encode(file)
+            key = "%s" % base64.b64encode(self.myfsencode(file))
             if self.helper.get_check_point(key) is not None:
                 seen_files.add(file)
         new_files = set(fileslist) - seen_files
@@ -126,7 +134,7 @@ def save_check_point(self, file):
         """ Save a filename to the KVstore with base64 encoded key because
             mongo doesn't like os.sep characters in the key
         """
-        key = "%s" % base64.b64encode(file)
+        key = "%s" % base64.b64encode(self.myfsencode(file))
         value = "input=dmarc_dir, file='%s'" % file
         try:
             self.helper.save_check_point(key, value)

default/app.conf

@@ -7,7 +7,7 @@ build = 1
 
 [launcher]
 author = Jorrit Folmer
-version = 3.2.3
+version = 3.2.4
 description = TA-dmarc add-on for Splunk
 
 [ui]