Merge branch 'release-1.0.1'

certtools · Aug 30, 2017 · 799b9c7 · 799b9c7
2 parents ca5bb92 + c182c31
commit 799b9c7
Show file tree

Hide file tree

Showing 18 changed files with 214 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,23 @@
 CHANGELOG
 ==========
 
+1.0.1 Bugfix release
+--------------------
+### Documentation
+- Feeds: use more https:// URLs
+- minor fixes
+
+### Bots
+- bots/experts/ripencc_abuse_contact/expert.py: Use HTTPS URLs for rest.db.ripe.net
+- bots/outputs/file/output.py: properly close the file handle on shutdown
+
+### Core
+- lib/bot: Bots will now log the used intelmq version at startup
+
+### Tools
+- intelmqctl: To check the status of a bot, the comandline of the running process is compared to the actual executable of the bot. Otherwise unrelated programs with the same PID are detected as running bot.
+- intelmqctl: enable, disable, check, clear now support the JSON output
+
 1.0.0 Stable release
 --------------------
 ### Core

diff --git a/NEWS.md b/NEWS.md
@@ -3,6 +3,10 @@ NEWS
 
 See the changelog for a full list of changes.
 
+1.0.1 Bugfix release
+--------------------
+No changes needed.
+
 1.0.0 Stable release
 --------------------
 ### Configuration

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,15 @@
+intelmq (1.0.1-1) experimental; urgency=low
+
+  * update to version 1.0.1
+
+ -- Wagner Sebastian <[email protected]>  Wed, 30 Aug 2017 15:07:45 +0200
+
+intelmq (1.0.1~rc1-1) experimental; urgency=low
+
+  * release release candidate 1.0.1 RC
+
+ -- Wagner Sebastian <[email protected]>  Wed, 23 Aug 2017 16:02:58 +0200
+
 intelmq (1.0.0.rel-1) experimental; urgency=medium
 
   * release version 1.0.0

diff --git a/docs/Developers-Guide.md b/docs/Developers-Guide.md
@@ -115,6 +115,13 @@ For example, to run all tests you can use:
 INTELMQ_TEST_DATABASES=1 INTELMQ_TEST_LOCAL_WEB=1 INTELMQ_TEST_EXOTIC=1 nosetests
 ```
 
+### Configuration files
+
+The tests use the configuration files in your working directory, not those
+installed in `/opt/intelmq/etc/` or `/etc/`.  You can run the
+tests for a locally changed intelmq without affecting an installation or
+requiring root to run them.
+
 # Development Guidelines
 
 ## Coding-Rules

diff --git a/docs/Feeds.md b/docs/Feeds.md
@@ -357,7 +357,7 @@ id: bambenek-c2-domains-collector
 provider: Bambenek
 feed: Bambenek C2 Domains
 rate_limit: FIXME
-http_url: http://osint.bambenekconsulting.com/feeds/c2-dommasterlist.txt
+http_url: https://osint.bambenekconsulting.com/feeds/c2-dommasterlist.txt
 ```
 
 ### Parser Bot
@@ -372,7 +372,7 @@ id: bambenek-c2-domains-parser
 ```
 
 **Notes:** Master Feed of known, active and non-sinkholed C&Cs domain names.
-License: http://osint.bambenekconsulting.com/license.txt
+License: https://osint.bambenekconsulting.com/license.txt
 
 ## C2 IPs
 
@@ -390,7 +390,7 @@ id: bambenek-c2-ips-collector
 provider: Bambenek
 feed: Bambenek C2 IPs
 rate_limit: FIXME
-http_url: http://osint.bambenekconsulting.com/feeds/c2-ipmasterlist.txt
+http_url: https://osint.bambenekconsulting.com/feeds/c2-ipmasterlist.txt
 ```
 
 ### Parser Bot
@@ -405,7 +405,7 @@ id: bambenek-c2-ips-parser
 ```
 
 **Notes:** Master Feed of known, active and non-sinkholed C&Cs IP addresses
-License: http://osint.bambenekconsulting.com/license.txt
+License: https://osint.bambenekconsulting.com/license.txt
 
 ## DGA Domains
 
@@ -423,7 +423,7 @@ id: bambenek-dga-domains-collector
 provider: Bambenek
 feed: Bambenek DGA Domains
 rate_limit: FIXME
-http_url: http://osint.bambenekconsulting.com/feeds/dga-feed.txt
+http_url: https://osint.bambenekconsulting.com/feeds/dga-feed.txt
 ```
 
 ### Parser Bot
@@ -438,7 +438,7 @@ id: bambenek-dga-domains-parser
 ```
 
 **Notes:** Domain feed of known DGA domains from -2 to +3 days
-License: http://osint.bambenekconsulting.com/license.txt
+License: https://osint.bambenekconsulting.com/license.txt
 
 
 # Bitcash
@@ -457,7 +457,7 @@ id: bitcash-collector
 provider: BitCash
 feed: BitCash
 rate_limit: FIXME
-http_url: http://bitcash.cz/misc/log/blacklist
+http_url: https://bitcash.cz/misc/log/blacklist
 ```
 
 ## Parser Bot

diff --git a/docs/User-Guide.md b/docs/User-Guide.md
@@ -428,7 +428,7 @@ In many cases, it is useful to schedule a bot at a specific time (i.e. via cron(
     "module": "intelmq.bots.collectors.http.collector_http",
     "description": "All IP addresses which have been reported within the last 48 hours as having run attacks on the service Apache, Apache-DDOS, RFI-Attacks.",
     "enabled": false,
-    "run_mode": "scheduled"
+    "run_mode": "scheduled",
     "parameters": {
         "feed": "Blocklist.de Apache",
         "provider": "Blocklist.de",
@@ -457,7 +457,7 @@ Most of the cases, bots will need to be configured as `continuous` run mode (the
     "module": "intelmq.bots.parsers.blocklistde.parser",
     "description": "Blocklist.DE Parser is the bot responsible to parse the report and sanitize the information.",
     "enabled": false,
-    "run_mode": "continuous"
+    "run_mode": "continuous",
     "parameters": {
     },
 },