Merge pull request #111 from jeffkause/CyHyMessage.py-update

Update CyhyMessage.py

cyhy/mailer/CyhyMessage.py

@@ -33,6 +33,8 @@ class CyhyMessage(ReportMessage):
 
 The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)
 
+Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments. To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.
+
 {{#has_tech_pocs}}
 Note: CISA has the following information listed as the Technical Points of Contact for {{acronym}}:
 
@@ -61,6 +63,8 @@ class CyhyMessage(ReportMessage):
 
 <p>The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)</p>
 
+<p><b>Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments.</b> To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.</p>
+
 {{#has_tech_pocs}}
 <p>Note: CISA has the following information listed as the Technical Points of Contact for {{acronym}}:</p>
 

cyhy/mailer/__init__.py

@@ -1,3 +1,3 @@
 """This package contains the cyhy-mailer code."""
 
-__version__ = "1.7.1"
+__version__ = "1.7.2"

tests/test_cyhymessage.py

@@ -46,6 +46,8 @@ def test_four_params_single_recipient_no_pocs(self):
 
 The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)
 
+Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments. To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.
+
 If you have any questions, please contact our office.
 
 Cheers,
@@ -64,6 +66,8 @@ def test_four_params_single_recipient_no_pocs(self):
 
 <p>The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)</p>
 
+<p><b>Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments.</b> To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.</p>
+
 <p>If you have any questions, please contact our office.</p>
 
 <p>Cheers,<br>
@@ -116,6 +120,8 @@ def test_four_params_single_recipient_multiple_pocs(self):
 
 The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)
 
+Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments. To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.
+
 Note: CISA has the following information listed as the Technical Points of Contact for CLARKE:
 
 Name:  Cixin Liu
@@ -144,6 +150,8 @@ def test_four_params_single_recipient_multiple_pocs(self):
 
 <p>The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)</p>
 
+<p><b>Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments.</b> To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.</p>
+
 <p>Note: CISA has the following information listed as the Technical Points of Contact for CLARKE:</p>
 
 <p>
@@ -206,6 +214,8 @@ def test_four_params_multiple_recipients_one_poc(self):
 
 The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)
 
+Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments. To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.
+
 Note: CISA has the following information listed as the Technical Points of Contact for CLARKE:
 
 Name:  Cixin Liu
@@ -231,6 +241,8 @@ def test_four_params_multiple_recipients_one_poc(self):
 
 <p>The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)</p>
 
+<p><b>Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments.</b> To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.</p>
+
 <p>Note: CISA has the following information listed as the Technical Points of Contact for CLARKE:</p>
 
 <p>
@@ -300,6 +312,8 @@ def test_six_params_single_cc_one_poc(self):
 
 The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)
 
+Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments. To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.
+
 Note: CISA has the following information listed as the Technical Points of Contact for CLARKE:
 
 Name:  Cixin Liu
@@ -325,6 +339,8 @@ def test_six_params_single_cc_one_poc(self):
 
 <p>The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)</p>
 
+<p><b>Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments.</b> To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.</p>
+
 <p>Note: CISA has the following information listed as the Technical Points of Contact for CLARKE:</p>
 
 <p>
@@ -394,6 +410,8 @@ def test_six_params_multiple_cc_one_poc(self):
 
 The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)
 
+Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments. To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.
+
 Note: CISA has the following information listed as the Technical Points of Contact for CLARKE:
 
 Name:  Cixin Liu
@@ -419,6 +437,8 @@ def test_six_params_multiple_cc_one_poc(self):
 
 <p>The Cyber Hygiene scan results are attached for your review. Same password as before. (If this is your first report and you have yet to receive a password, please let us know.)</p>
 
+<p><b>Additional details regarding findings, hosts, mitigated vulnerabilities, potentially risky services, etc., can be found under Appendix G: Attachments.</b> To access the attachments embedded within the report, open the report with a dedicated PDF reader (such as Adobe Acrobat), and click on the paper clip icon to the left of the attachment name.</p>
+
 <p>Note: CISA has the following information listed as the Technical Points of Contact for CLARKE:</p>
 
 <p>