MAINT: fix ending newlines in various places

Sebastian Wagner · Sebastian Wagner · commit 4e60abe99647 · 2021-03-08T20:51:17.000+01:00
some files were missing a newline at the end of the file fixes #1777
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,10 +22,12 @@ CHANGELOG
 #### Outputs
 
 ### Documentation
+- Add missing newlines at end of `docs/_static/intelmq-manager/*.png.license` files (PR#1785 by Sebastian Wagner, fixes #1777).
 
 ### Packaging
 
 ### Tests
+- Add missing newlines at end of various test input files (PR#1785 by Sebastian Wagner, fixes #1777).
 
 ### Tools
 
diff --git a/docs/_static/intelmq-manager/configuration-path-form.png.license b/docs/_static/intelmq-manager/configuration-path-form.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2020 IntelMQ Team <intelmq-team@cert.at>
 
-SPDX-License-Identifier: CC0-1.0
+SPDX-License-Identifier: CC0-1.0
diff --git a/docs/_static/intelmq-manager/configuration-path-set.png.license b/docs/_static/intelmq-manager/configuration-path-set.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2020 IntelMQ Team <intelmq-team@cert.at>
 
-SPDX-License-Identifier: CC0-1.0
+SPDX-License-Identifier: CC0-1.0
diff --git a/docs/_static/intelmq-manager/configuration.png.license b/docs/_static/intelmq-manager/configuration.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2020 IntelMQ Team <intelmq-team@cert.at>
 
-SPDX-License-Identifier: CC0-1.0
+SPDX-License-Identifier: CC0-1.0
diff --git a/docs/_static/intelmq-manager/configuration2.png.license b/docs/_static/intelmq-manager/configuration2.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2020 IntelMQ Team <intelmq-team@cert.at>
 
-SPDX-License-Identifier: CC0-1.0
+SPDX-License-Identifier: CC0-1.0
diff --git a/docs/_static/intelmq-manager/management.png.license b/docs/_static/intelmq-manager/management.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2020 IntelMQ Team <intelmq-team@cert.at>
 
-SPDX-License-Identifier: CC0-1.0
+SPDX-License-Identifier: CC0-1.0
diff --git a/docs/_static/intelmq-manager/monitor.png.license b/docs/_static/intelmq-manager/monitor.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2020 IntelMQ Team <intelmq-team@cert.at>
 
-SPDX-License-Identifier: CC0-1.0
+SPDX-License-Identifier: CC0-1.0
diff --git a/docs/_static/intelmq-manager/monitor2.png.license b/docs/_static/intelmq-manager/monitor2.png.license
@@ -1,3 +1,3 @@
 SPDX-FileCopyrightText: 2020 IntelMQ Team <intelmq-team@cert.at>
 
-SPDX-License-Identifier: CC0-1.0
+SPDX-License-Identifier: CC0-1.0
diff --git a/intelmq/bots/collectors/github_api/REQUIREMENTS.txt b/intelmq/bots/collectors/github_api/REQUIREMENTS.txt
@@ -1 +1 @@
-requests
+requests
diff --git a/intelmq/bots/parsers/github_feed/REQUIREMENTS.txt b/intelmq/bots/parsers/github_feed/REQUIREMENTS.txt
@@ -1 +1 @@
-validators
+validators
diff --git a/intelmq/tests/bots/collectors/github_api/example_github_repo_contents_response.json b/intelmq/tests/bots/collectors/github_api/example_github_repo_contents_response.json
@@ -31,4 +31,4 @@
       "html": "some_html_url"
     }
   }
-]
+]
diff --git a/intelmq/tests/bots/experts/sieve/test_sieve_files/test_comments.sieve b/intelmq/tests/bots/experts/sieve/test_sieve_files/test_comments.sieve
@@ -2,4 +2,4 @@ if source.ip == '127.0.0.1' {
     add comment = 'hello'
     // update comment = 'I should not be here'
     # update comment = 'neither should I'
-}
+}
diff --git a/intelmq/tests/bots/experts/sieve/test_sieve_files/test_named_queues.sieve b/intelmq/tests/bots/experts/sieve/test_sieve_files/test_named_queues.sieve
@@ -9,4 +9,4 @@ if comment == "keep with path" {
 
 if comment == "drop" {
     drop
-}
+}
diff --git a/intelmq/tests/bots/experts/sieve/test_sieve_files/test_numeric_invalid_key.sieve b/intelmq/tests/bots/experts/sieve/test_sieve_files/test_numeric_invalid_key.sieve
@@ -1,3 +1,3 @@
 if source.fqdn == 2 {
     add comment = "this should fail"
-}
+}
diff --git a/intelmq/tests/bots/experts/sieve/test_sieve_files/test_string_invalid_ipaddr.sieve b/intelmq/tests/bots/experts/sieve/test_sieve_files/test_string_invalid_ipaddr.sieve
@@ -1,3 +1,3 @@
 if source.ip == "#fail" {
     add comment = "this should fail"
-}
+}
diff --git a/intelmq/tests/bots/parsers/abusech/feodoips.txt b/intelmq/tests/bots/parsers/abusech/feodoips.txt
@@ -9,4 +9,4 @@
 "first_seen_utc","dst_ip","dst_port","c2_status","last_online","malware"
 "2021-01-17 07:30:05","10.213.75.205","443","online","2021-02-10","Dridex"
 "2021-01-17 07:44:46","192.16.238.101","443","online","2021-02-10","Dridex"
-# END (2) entries
+# END (2) entries
diff --git a/intelmq/tests/bots/parsers/blocklistde/imap.txt b/intelmq/tests/bots/parsers/blocklistde/imap.txt
@@ -3,4 +3,4 @@
 198.51.100.34
 198.51.100.80
 203.0.113.34
-203.0.113.254
+203.0.113.254
diff --git a/intelmq/tests/bots/parsers/cznic/example_proki.json b/intelmq/tests/bots/parsers/cznic/example_proki.json
@@ -30,4 +30,4 @@
       "source.abuse_contact": "contact@example.com"
     }
   ]
-}
+}
diff --git a/intelmq/tests/bots/parsers/github_feed/example_ioc_strangereal_intel.json b/intelmq/tests/bots/parsers/github_feed/example_ioc_strangereal_intel.json
@@ -19,4 +19,4 @@
     "Indicator": "https://10.2.2.1/malicious.docm",
     "Description": "URL"
   }
-]
+]
diff --git a/intelmq/tests/bots/parsers/hibp/breach_callbacktest.json b/intelmq/tests/bots/parsers/hibp/breach_callbacktest.json
@@ -34,4 +34,4 @@
             "IsSpamList":false
         }
     ]
-}
+}
diff --git a/intelmq/tests/bots/parsers/hibp/paste_callbacktest.json b/intelmq/tests/bots/parsers/hibp/paste_callbacktest.json
@@ -17,4 +17,4 @@
             "EmailCount": 30
         }
     ]
-}
+}
diff --git a/intelmq/tests/bots/parsers/misp/misp_attribute.json b/intelmq/tests/bots/parsers/misp/misp_attribute.json
@@ -1 +1 @@
-{"ShadowAttribute": [], "SharingGroup": [], "category": "Payload delivery", "comment": "", "deleted": false, "distribution": "5", "event_id": "2", "id": "7", "sharing_group_id": "0", "timestamp": "1465681304", "to_ids": false, "type": "url", "uuid": "575c8598-f1f0-4c16-a94a-0612c0a83866", "value": "http://fake.example.com/malware/is/here"}
+{"ShadowAttribute": [], "SharingGroup": [], "category": "Payload delivery", "comment": "", "deleted": false, "distribution": "5", "event_id": "2", "id": "7", "sharing_group_id": "0", "timestamp": "1465681304", "to_ids": false, "type": "url", "uuid": "575c8598-f1f0-4c16-a94a-0612c0a83866", "value": "http://fake.example.com/malware/is/here"}
diff --git a/intelmq/tests/bots/parsers/misp/test_parser.py b/intelmq/tests/bots/parsers/misp/test_parser.py
@@ -11,7 +11,7 @@
     EXAMPLE_MISP_EVENT = handle.read()
 
 with open(os.path.join(os.path.dirname(__file__), 'misp_attribute.json')) as handle:
-    EXAMPLE_MISP_ATTR = handle.read()
+    EXAMPLE_MISP_ATTR = handle.read().strip()
 
 EXAMPLE_REPORT = {
     "__type": "Report",
diff --git a/intelmq/tests/bots/parsers/netlab_360/dga.txt b/intelmq/tests/bots/parsers/netlab_360/dga.txt
@@ -6,4 +6,4 @@
 # netlab@360.cn
 
 suppobox	difficultdress.net	2016-11-12 11:58:56	2016-11-13 00:04:15
-foobar	example.com	2018-01-01 00:00:00	2030-05-04 00:08:08
+foobar	example.com	2018-01-01 00:00:00	2030-05-04 00:08:08
diff --git a/intelmq/tests/bots/parsers/openphish/feed_commercial.txt b/intelmq/tests/bots/parsers/openphish/feed_commercial.txt
@@ -1,2 +1,2 @@
 {"sector": "Email Provider", "url": "http://example.com/glossy/zip/secure/d553c33636b465c21554b757e48bcf04/", "ip": "104.24.119.70", "brand": "Webmail Providers", "isotime": "2018-02-06T15:16:06Z", "asn_name": "Example Pete", "discover_time": "06-02-2018 15:16:06 UTC", "asn": "AS13335", "family_id": "922070603a96d81be0e354099d62f54e", "host": "example.com", "country_code": "US", "tld": "ga", "country_name": "United States", "phishing_kit": null, "emails": []}
-{"sector": "e-Commerce", "url": "http://signin.eby.de.h7r9pganeatdzn6.civpro.example.com/?Ct5A47GsT3bMpTNwYXCmsa6JR7ylCJx2tpr3GordYJZnl", "ip": "196.41.123.211", "brand": "eBay Inc.", "isotime": "2018-02-06T15:13:22Z", "asn_name": "Example Richard", "discover_time": "06-02-2018 15:13:22 UTC", "asn": "AS36874", "family_id": "3513702e078b6e6d70bb7f9abbf40cd6", "host": "signin.eby.de.h7r9pganeatdzn6.civpro.example.com", "country_code": "ZA", "tld": "co.za", "country_name": "South Africa", "phishing_kit": null, "emails": []}
+{"sector": "e-Commerce", "url": "http://signin.eby.de.h7r9pganeatdzn6.civpro.example.com/?Ct5A47GsT3bMpTNwYXCmsa6JR7ylCJx2tpr3GordYJZnl", "ip": "196.41.123.211", "brand": "eBay Inc.", "isotime": "2018-02-06T15:13:22Z", "asn_name": "Example Richard", "discover_time": "06-02-2018 15:13:22 UTC", "asn": "AS36874", "family_id": "3513702e078b6e6d70bb7f9abbf40cd6", "host": "signin.eby.de.h7r9pganeatdzn6.civpro.example.com", "country_code": "ZA", "tld": "co.za", "country_name": "South Africa", "phishing_kit": null, "emails": []}
diff --git a/intelmq/tests/bots/parsers/shadowserver/testdata/scan_ard.csv b/intelmq/tests/bots/parsers/shadowserver/testdata/scan_ard.csv
@@ -8,4 +8,4 @@
 "2019-10-02 09:18:06","207.254.60.30","udp",3283,,"ard",395337,"US","NEVADA","LAS VEGAS",0,0,8034,1006
 "2019-10-02 09:18:06","140.116.183.179","udp",3283,,"ard",1659,"TW","TAIPEI CITY","TAIPEI",923110,0,"CCKs Black Mac Pro",1006
 "2019-10-02 09:18:06","172.90.125.237","udp",3283,"cpe-172-90-125-237.socal.res.rr.com","ard",20001,"US","CALIFORNIA","ORANGE",517311,737401,"chadski_s computer",1006
-"2019-10-02 09:18:06","208.78.107.204","udp",3283,,"ard",395336,"US","NEVADA","LAS VEGAS",0,0,"Atlanta6",1006
+"2019-10-02 09:18:06","208.78.107.204","udp",3283,,"ard",395336,"US","NEVADA","LAS VEGAS",0,0,"Atlanta6",1006
diff --git a/intelmq/tests/bots/parsers/spamhaus/cert.txt b/intelmq/tests/bots/parsers/spamhaus/cert.txt
@@ -18,4 +18,4 @@
 203.0.113.81,AS65551,AT,1530789932,authspoofbadehlo,,,25,,tcp
 172.20.148.82,AS65551,AT,1556001482,extortion,,,25,,tcp
 172.20.148.82,AS65551,AT,1570955975,misc,,,25,,tcp
-; EOF
+; EOF

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`SPDX-FileCopyrightText: 2020 IntelMQ Team <[email protected]>`
`2`	`2`
`3`		`-SPDX-License-Identifier: CC0-1.0`
	`3`	`+SPDX-License-Identifier: CC0-1.0`