Merge branch 'Shuffle:master' into master

email/1.1.0/src/app.py

@@ -64,7 +64,7 @@ def send_email_shuffle(self, apikey, recipients, subject, body):
         elif "," in recipients:
             targets = recipients.split(",")
 
-        data = {"targets": targets, "body": body, "subject": subject, "type": "alert"}
+        data = {"targets": targets, "body": body, "subject": subject, "type": "alert", "email_app": True}
 
         url = "https://shuffler.io/functions/sendmail"
         headers = {"Authorization": "Bearer %s" % apikey}

email/1.2.0/requirements.txt

@@ -1,6 +1,6 @@
 requests==2.25.1
 glom==20.11.0
-eml-parser==1.17.0
+eml-parser==1.17.5
 msg-parser==1.2.0
 mail-parser==3.15.0
 extract-msg==0.30.9

email/1.2.0/src/app.py

@@ -67,7 +67,7 @@ def send_email_shuffle(self, apikey, recipients, subject, body):
         elif "," in recipients:
             targets = recipients.split(",")
 
-        data = {"targets": targets, "body": body, "subject": subject, "type": "alert"}
+        data = {"targets": targets, "body": body, "subject": subject, "type": "alert", "email_app": True}
 
         url = "https://shuffler.io/functions/sendmail"
         headers = {"Authorization": "Bearer %s" % apikey}
@@ -391,10 +391,9 @@ def parse_email_file(self, file_id, file_extension):
                 "reason": "Couldn't get file with ID %s" % file_id
             }
 
-        print("File: %s" % file_path)
         if file_extension.lower() == 'eml':
             print('working with .eml file')
-            ep = eml_parser.EmlParser(include_attachment_data=True, include_raw_body=True, parse_attachment=True)
+            ep = eml_parser.EmlParser(include_attachment_data=True, include_raw_body=True, parse_attachments=True)
             try:
                 parsed_eml = ep.decode_email_bytes(file_path['data'])
                 if str(parsed_eml["header"]["date"]) == "1970-01-01 00:00:00+00:00":

email/1.3.0/api.yaml

@@ -83,6 +83,13 @@ actions:
         required: true
         schema:
           type: string
+      - name: cc_emails
+        description: cc_emails
+        multiline: false
+        example: "[email protected],[email protected]"
+        required: false
+        schema:
+          type: string
       - name: subject
         description: The subject of the email
         multiline: false
@@ -233,6 +240,25 @@ actions:
         required: false 
         schema:
           type: bool    
+  - name: parse_eml
+    description: Takes an eml string and parses it to JSON
+    parameters:
+      - name: filedata 
+        description: The EML string data
+        required: true
+        multiline: true
+        example: 'EML string data'
+        schema:
+          type: string
+      - name: extract_attachments 
+        description: Whether to extract the attachments straight into files
+        required: true
+        options:
+          - true 
+          - false 
+        example: 'true'
+        schema:
+          type: string
   - name: parse_email_file
     description: Takes a file from shuffle and analyzes it if it's a valid .eml or .msg
     parameters:
@@ -277,4 +303,31 @@ actions:
     returns:
       schema:
         type: string
+  - name: send_sms_shuffle
+    description: Send an SMS from Shuffle
+    parameters:
+      - name: apikey
+        description: Your https://shuffler.io organization apikey
+        multiline: false
+        example: "https://shuffler.io apikey"
+        required: true
+        schema:
+          type: string
+      - name: phone_numbers
+        description: The receivers of the SMS
+        multiline: false
+        example: "+4741323535,+8151023022"
+        required: true
+        schema:
+          type: string
+      - name: body
+        description: The SMS to add to the numbers
+        multiline: true
+        example: "This is an alert from Shuffle :)"
+        required: true
+        schema:
+          type: string
+    returns:
+      schema:
+        type: string
 large_image: data:image/png;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/4QAYRXhpZgAASUkqAAgAAAAAAAAAAAAAAP/hAytodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Nzg4QTJBMjVEMDI1MTFFN0EwQUVDODc5QjYyQkFCMUQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Nzg4QTJBMjZEMDI1MTFFN0EwQUVDODc5QjYyQkFCMUQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3ODhBMkEyM0QwMjUxMUU3QTBBRUM4NzlCNjJCQUIxRCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3ODhBMkEyNEQwMjUxMUU3QTBBRUM4NzlCNjJCQUIxRCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pv/bAEMAAwICAgICAwICAgMDAwMEBgQEBAQECAYGBQYJCAoKCQgJCQoM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

email/1.3.0/src/app.py

@@ -68,14 +68,14 @@ def send_email_shuffle(self, apikey, recipients, subject, body):
         elif "," in recipients:
             targets = recipients.split(",")
 
-        data = {"targets": targets, "body": body, "subject": subject, "type": "alert"}
+        data = {"targets": targets, "body": body, "subject": subject, "type": "alert", "email_app": True}
 
         url = "https://shuffler.io/functions/sendmail"
         headers = {"Authorization": "Bearer %s" % apikey}
         return requests.post(url, headers=headers, json=data).text
 
     def send_email_smtp(
-        self, smtp_host, recipient, subject, body, smtp_port, attachments="", username="", password="", ssl_verify="True", body_type="html"
+        self, smtp_host, recipient, subject, body, smtp_port, attachments="", username="", password="", ssl_verify="True", body_type="html", cc_emails=""
     ):
         if type(smtp_port) == str:
             try:
@@ -112,6 +112,10 @@ def send_email_smtp(
         msg["From"] = username
         msg["To"] = recipient
         msg["Subject"] = subject
+
+        if cc_emails != None and len(cc_emails) > 0:
+            msg["Cc"] = cc_emails
+
         msg.attach(MIMEText(body, body_type))
 
         # Read the attachments
@@ -161,7 +165,7 @@ def send_email_smtp(
         self.logger.info("Successfully sent email with subject %s to %s" % (subject, recipient))
         return {
             "success": True, 
-            "reason": "Email sent to %s!" % recipient,
+            "reason": "Email sent to %s, %s!" %(recipient,cc_emails) if cc_emails else "Email sent to %s!" % recipient,
             "attachments": attachment_count
         }
 
@@ -384,14 +388,46 @@ def merge(d1, d2):
                 "messages": json.dumps(emails, default=default),
             }
 
+    def parse_eml(self, filedata, extract_attachments=False):
+        parsedfile = {
+            "success": True,
+            "filename": "email.eml",
+            "data": filedata,
+        }
+
+        # Encode the data as utf-8 if it's not base64
+        if not str(parsedfile["data"]).endswith("="):
+            parsedfile["data"] = parsedfile["data"].encode("utf-8")
+
+        return self.parse_email_file(parsedfile, extract_attachments)
+
     def parse_email_file(self, file_id, extract_attachments=False):
-        file_path = self.get_file(file_id)
+        file_path = {
+            "success": False,
+        }
+
+        if isinstance(file_id, dict) and "data" in file_id:
+            file_path = file_id
+        else:
+            file_path = self.get_file(file_id)
+
         if file_path["success"] == False:
             return {
                 "success": False,
                 "reason": "Couldn't get file with ID %s" % file_id
             }
 
+        # Check if data is in base64 and decode it
+        # If it ends with = then it may be bas64
+
+        if str(file_path["data"]).endswith("="):
+            try:
+                file_path["data"] = base64.b64decode(file_path["data"])
+            except Exception as e:
+                print(f"Failed to decode base64: {e}")
+
+        #print("POST: ", file_path)
+
         #print("File: %s" % file_path)
         print('working with .eml file? %s' % file_path["filename"])
 
@@ -400,6 +436,16 @@ def parse_email_file(self, file_id, extract_attachments=False):
         else:
             extract_attachments = False
 
+        # Replace raw newlines \\r\\n with actual newlines
+        # The data is a byte string, so we need to decode it to utf-8
+        try:
+            print("Pre size: %d" % len(file_path["data"]))
+            file_path["data"] = file_path["data"].decode("utf-8").replace("\\r\\n", "\n").encode("utf-8")
+            print("Post size: %d" % len(file_path["data"]))
+        except Exception as e:
+            print(f"Failed to decode file: {e}")
+            pass
+
         # Makes msg into eml
         if ".msg" in file_path["filename"] or "." not in file_path["filename"]:
             print(f"[DEBUG] Working with .msg file {file_path['filename']}. Filesize: {len(file_path['data'])}")
@@ -414,6 +460,7 @@ def parse_email_file(self, file_id, extract_attachments=False):
                 if ".msg" in file_path["filename"]:
                     return {"success":False, "reason":f"Exception occured during msg parsing: {e}"}    
 
+
         ep = eml_parser.EmlParser(
             include_attachment_data=True, 
             include_raw_body=True 
@@ -422,8 +469,8 @@ def parse_email_file(self, file_id, extract_attachments=False):
         try:
             print("Pre email")
             parsed_eml = ep.decode_email_bytes(file_path['data'])
-            if str(parsed_eml["header"]["date"]) == "1970-01-01 00:00:00+00:00" and len(parsed_eml["header"]["subject"]) == 0:
-                return {"success":False,"reason":"Not a valid EML/MSG file, or the file have a timestamp or subject defined (required).", "date": str(parsed_eml["header"]["date"]), "subject": str(parsed_eml["header"]["subject"])}
+            #if str(parsed_eml["header"]["date"]) == "1970-01-01 00:00:00+00:00" and len(parsed_eml["header"]["subject"]) == 0:
+            #    return {"success":False,"reason":"Not a valid EML/MSG file, or the file have a timestamp or subject defined (required).", "date": str(parsed_eml["header"]["date"]), "subject": str(parsed_eml["header"]["subject"])}
 
             # Put attachments in the shuffle file system
             print("Pre attachment")
@@ -471,6 +518,8 @@ def parse_email_headers(self, email_headers):
     # Basic function to check headers in an email
     # Can be dumped in in pretty much any format
     def analyze_headers(self, headers):
+        self.logger.info("Input headers: %s" % headers)
+
         # Raw
         if isinstance(headers, str):
             headers = self.parse_email_headers(headers)
@@ -484,6 +533,11 @@ def analyze_headers(self, headers):
             headers = headers["header"]
             if "header" in headers:
                 headers = headers["header"]
+
+        if "headers" in headers:
+            headers = headers["headers"]
+            if "headers" in headers:
+                headers = headers["headers"]
 
         if not isinstance(headers, list):
             newheaders = []
@@ -501,6 +555,7 @@ def analyze_headers(self, headers):
 
             headers = newheaders
 
+        #self.logger.info("Parsed headers: %s" % headers)
 
         spf = False
         dkim = False
@@ -509,19 +564,36 @@ def analyze_headers(self, headers):
 
         analyzed_headers = {
             "success": True,
+            "sender": "",
+            "receiver": "",
+            "subject": "",
+            "date": "",
             "details": {
                 "spf": "",
                 "dkim": "",
                 "dmarc": "",
                 "spoofed": "",
-            }
+            },
         }
 
         for item in headers:
             if "name" in item:
                 item["key"] = item["name"]
 
             item["key"] = item["key"].lower()
+
+            # Handle sender/receiver
+            if item["key"] == "from" or item["key"] == "sender" or item["key"] == "delivered-to":
+                analyzed_headers["sender"] = item["value"]
+
+            if item["key"] == "to" or item["key"] == "receiver" or item["key"] == "delivered-to":
+                analyzed_headers["receiver"] = item["value"]
+
+            if item["key"] == "subject" or item["key"] == "title":
+                analyzed_headers["subject"] = item["value"]
+
+            if item["key"] == "date": 
+                analyzed_headers["date"] = item["value"]
 
             if "spf" in item["key"]:
                 analyzed_headers["details"]["spf"] = spf
@@ -599,6 +671,17 @@ def analyze_headers(self, headers):
         # Should be a dictionary
         return analyzed_headers 
 
+    # This is an SMS function of Shuffle
+    def send_sms_shuffle(self, apikey, phone_numbers, body):
+        phone_numbers = phone_numbers.replace(" ", "")
+        targets = phone_numbers.split(",")
+
+        data = {"numbers": targets, "body": body}
+
+        url = "https://shuffler.io/api/v1/functions/sendsms"
+        headers = {"Authorization": "Bearer %s" % apikey}
+        return requests.post(url, headers=headers, json=data, verify=False).text
+
 
 # Run the actual thing after we've checked params
 def run(request):

http/1.4.0/src/app.py

@@ -304,6 +304,11 @@ def PATCH(self, url, headers="", body="", username="", password="", verify=True,
             else: 
                 auth = requests.auth.HTTPBasicAuth(username, password)
 
+        if not timeout:
+            timeout = 5
+        if timeout:
+            timeout = int(timeout)
+
         if to_file == "true":
             to_file = True
         else: