From dce20c636375bce49a86e42e065031100da40870 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Mon, 23 Apr 2018 15:22:55 +0200
Subject: [PATCH 01/10] MAINT: Start development of 1.0.2

---
 CHANGELOG.md                   | 25 +++++++++++++++++++++++++
 intelmq-manager/php/config.php |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b0047d..a5dece8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,31 @@
 CHANGELOG
 =========
 
+1.0.2 (unreleased)
+------------------
+
+### Backend
+
+### Pages
+
+#### Landing page
+
+#### Configuration
+
+#### Management
+
+#### Monitor
+
+#### Check
+
+### Documentation
+
+### Third-party libraries
+
+### Packaging
+
+### Known issues
+
 1.0.1 (2018-04-23)
 ------------------
 The version is compatible with intelmq >= 1.0.3
diff --git a/intelmq-manager/php/config.php b/intelmq-manager/php/config.php
index 5746d86..3ba18ab 100644
--- a/intelmq-manager/php/config.php
+++ b/intelmq-manager/php/config.php
@@ -16,5 +16,5 @@
     
     $BOT_CONFIGS_REJECT_REGEX = '/[^[:print:]\n\r\t]/';
     $BOT_ID_REJECT_REGEX = '/[^A-Za-z0-9.-]/';
-    $VERSION = "1.0.1";
+    $VERSION = "1.0.2.alpha1";
 ?>

From 771947b42f53a0b871e3c438746cf526e0c1b057 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Mon, 23 Apr 2018 15:23:40 +0200
Subject: [PATCH 02/10] DOC: Add release documentation

---
 docs/Release.md | 75 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 docs/Release.md

diff --git a/docs/Release.md b/docs/Release.md
new file mode 100644
index 0000000..c2006a7
--- /dev/null
+++ b/docs/Release.md
@@ -0,0 +1,75 @@
+# Release procedure
+
+Make sure the current state is really final ;)
+You can test most of the steps described here locally before doing it real.
+
+Assumption: You are working on branch maintenance, the next version is a bug fix release. For feature releaese it is slightly different.
+
+## Documentation
+
+ * CHANGELOG.MD and
+ * NEWS.MD: Update the latest header, fix the order and remove empty sections if necessary.
+ * `intelmq/version.py`: Update the version.
+ * `debian/changelog`: Insert a new section for the new version with the tool `dch`.
+
+Eventually adapt the default log levels if necessary. Should be INFO for stable releases. See older releases.
+
+## Commit and tag.
+Commit your changes, the message should start with `REL: `. Push and create a pull request from maintenance to master. Someone else should review the changes. Eventually fix them, make sure the `REL: ` is the last commit, you can also push that one at last, after the reviews.
+
+## Tag and release
+
+Tag the commit with `git tag -s version HEAD`, merge it into master, push the both branches *and* the tag. The tag is just `a.b.c`, not prefixed with `v` (that was necessary only with SVN a long time ago...).
+
+Go to https://github.com/certtools/intelmq/tags and enter the release notes (changelog) for the new tag, then it's considered a release by github.
+
+## Tarballs and PyPI
+
+ * Build the source and binary (wheel) distribution: `python3 setup.py sdist bdist_wheel`
+ * Upload the files including signatures to PyPI with e.g. twine: `twine upload -s dist/intelmq...`
+
+## Packages
+We are currently using the public Open Build Service instance of openSUSE: http://build.opensuse.org/project/show/home:sebix:intelmq
+
+First, test all the steps first with the [unstable-repository](http://build.opensuse.org/project/show/home:sebix:intelmq:unstable) and check that at least installations succeed.
+
+ * Create the tarballs with the script `create-archives.sh`.
+ * Update the dsc and spec files for new filenames and versions.
+ * Update the .changes file
+ * Build locally for all distributions.
+ * Commit.
+
+## Announcements
+
+Announce the new version at the mailinglists intelmq-users, intelmq-dev.
+For bigger releases, probably also at IHAP, Twitter, etc. Ask your favorite social media consultant.
+
+## Prepare new version
+
+Increase the version in `intelmq-manager/php/config.php` and declare it as alpha version.
+
+Add a new empty changelog section:
+
+```
+### Backend
+
+### Pages
+
+#### Landing page
+
+#### Configuration
+
+#### Management
+
+#### Monitor
+
+#### Check
+
+### Documentation
+
+### Third-party libraries
+
+### Packaging
+
+### Known issues
+```

From 9ac3df22d9ca95a5fac218155dccdc8ea51f815f Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Fri, 1 Jun 2018 19:03:32 +0200
Subject: [PATCH 03/10] BUG: Fix link to monitor bot page

fixes certtools/intelmq-manager#157
---
 CHANGELOG.md                  | 1 +
 intelmq-manager/js/monitor.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5dece8..c4a9aca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ CHANGELOG
 #### Management
 
 #### Monitor
+* Fix link to monitor page (#157).
 
 #### Check
 
diff --git a/intelmq-manager/js/monitor.js b/intelmq-manager/js/monitor.js
index 3aceef6..0cad258 100644
--- a/intelmq-manager/js/monitor.js
+++ b/intelmq-manager/js/monitor.js
@@ -176,7 +176,7 @@ function redraw_queues() {
             cell0.innerHTML = dst_queues[index][0];
             cell0.addEventListener("click", function (event) {
                 var selectedBot = dst_queues[$(event.target).closest('tr').index()]["parent"];
-                window.location.href = "monitor.html?bot_id=" + selectedBot;
+                window.location.href = "?page=monitor&bot_id=" + selectedBot;
             });
 
             var cell1 = destination_queue.insertCell(1);

From 3901ca283f10350d85fd7a85e0aedc511f03434b Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Mon, 25 Jun 2018 11:55:17 +0200
Subject: [PATCH 04/10] BUG: js/config: fix regex check for param name

fixes certtools/intelmq-manager#153
---
 CHANGELOG.md                 | 1 +
 intelmq-manager/js/main.js   | 4 ++--
 intelmq-manager/js/static.js | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5dece8..ffacfc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
 #### Landing page
 
 #### Configuration
+- Underscore is now allowed for new parameter names (#153).
 
 #### Management
 
diff --git a/intelmq-manager/js/main.js b/intelmq-manager/js/main.js
index 21ae0c6..6e595ec 100644
--- a/intelmq-manager/js/main.js
+++ b/intelmq-manager/js/main.js
@@ -496,8 +496,8 @@ function addNewKey() {
     var newKeyInput = document.getElementById('newKeyInput');
     var newValueInput = document.getElementById('newValueInput');
 
-    if (!BOT_ID_REGEX.test(newKeyInput.value)) {
-        show_error("Bot ID's can only be composed of numbers, letters and hiphens");
+    if (!PARAM_KEY_REGEX.test(newKeyInput.value)) {
+        show_error("Parameter names can only be composed of numbers, letters, hiphens and underscores");
         $('#newKeyInput').focus();
     } else {
         hideModal();
diff --git a/intelmq-manager/js/static.js b/intelmq-manager/js/static.js
index adac0ad..2d78b92 100644
--- a/intelmq-manager/js/static.js
+++ b/intelmq-manager/js/static.js
@@ -32,6 +32,7 @@ var LEVEL_CLASS = {
 var STARTUP_KEYS = ['group', 'name', 'module', 'description', 'enabled', 'run_mode'];
 
 var BOT_ID_REGEX = /^[0-9a-zA-Z.-]+$/;
+var PARAM_KEY_REGEX = /^[0-9a-zA-Z._-]+$/;
 
 var ROOT = window.location.href.substring(0,window.location.href.lastIndexOf('/')+1);
 

From a4a595cfd1f358bf5db045553ad27f711619d372 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Thu, 26 Jul 2018 10:08:42 +0200
Subject: [PATCH 05/10] DOC: Add FAQ about docker /tmp issue

fixes certtools/intelmq-manager#160
---
 CHANGELOG.md |  1 +
 docs/FAQ.md  | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 docs/FAQ.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7687aac..7468dd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ CHANGELOG
 #### Check
 
 ### Documentation
+- Add a FAQ and add a section about the docker issue #160.
 
 ### Third-party libraries
 
diff --git a/docs/FAQ.md b/docs/FAQ.md
new file mode 100644
index 0000000..4bdfeb2
--- /dev/null
+++ b/docs/FAQ.md
@@ -0,0 +1,11 @@
+FAQ
+===
+
+Error saving a big configuration in docker
+------------------------------------------
+
+Problem: When saving a configuration with lots of bots (~30) the reponse is always an error. All files are saved correctly, but not the runtime configuration, which is unchanged.
+
+Reason: Look at your apache error logs, it may say that it discarded the data because the temporary directory is not writeable.
+
+Solution: Fix your docker image by making the temporary directoy `/tmp` writeable as it should be.

From 1355469b55871ad9b4a6dca11d09333c08f719c2 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Fri, 27 Jul 2018 13:18:03 +0200
Subject: [PATCH 06/10] ENH: More specific error message for #160

---
 CHANGELOG.md                 | 1 +
 intelmq-manager/php/save.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7468dd4..f9a0648 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ------------------
 
 ### Backend
+- Emit a more specific error message for cases like #160.
 
 ### Pages
 
diff --git a/intelmq-manager/php/save.php b/intelmq-manager/php/save.php
index b450fb3..d9fd142 100644
--- a/intelmq-manager/php/save.php
+++ b/intelmq-manager/php/save.php
@@ -12,6 +12,9 @@
     }
 
     $post_contents = file_get_contents("php://input");
+    if ($post_contents === '') {
+        die('Error: Received an empty string, which is invalid. Check your webserver log for error messages.');
+    }
 
     $decoded_config = json_decode($post_contents);
     if (gettype($decoded_config) != 'object') {

From 21666bb33445fe716ca29059181deeb0ee5d2e31 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebix@sebix.at>
Date: Tue, 31 Jul 2018 22:59:41 +0200
Subject: [PATCH 07/10] BUG: set timeout to 20s

fixes certtools/intelmq#164
---
 CHANGELOG.md                       | 1 +
 intelmq-manager/php/controller.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9a0648..a550c52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ CHANGELOG
 
 ### Backend
 - Emit a more specific error message for cases like #160.
+- The timeout for calls to `intelmqctl` has been raised to 20s (#164).
 
 ### Pages
 
diff --git a/intelmq-manager/php/controller.php b/intelmq-manager/php/controller.php
index 592986e..043b933 100644
--- a/intelmq-manager/php/controller.php
+++ b/intelmq-manager/php/controller.php
@@ -80,7 +80,7 @@
 
     $command = sprintf($CONTROLLER, $arguments);
 
-    set_time_limit(10);
+    set_time_limit(20);
 
     $return = shell_exec($command);
 

From 1c8c081039e7e2b2cffc6e48a3bec05bf4e8eed4 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Mon, 3 Sep 2018 16:19:34 +0200
Subject: [PATCH 08/10] DOC: install: Add newer OSs instructions

fixes certtools/intelmq#168
---
 CHANGELOG.md    |  1 +
 docs/INSTALL.md | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a550c52..13dc555 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ CHANGELOG
 
 ### Documentation
 - Add a FAQ and add a section about the docker issue #160.
+- Add instructions for Debian 9, Ubuntu 18.04, and openSUSE Leap 42.3, 15.0 (#168).
 
 ### Third-party libraries
 
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index ef20788..ae7d5f5 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -46,12 +46,18 @@ If you are using native packages, you can simply skip this section as all depend
 apt-get install git apache2 php5 libapache2-mod-php5
 ```
 
-## Ubuntu 16.04
+## Ubuntu 16.04 / Debian 9
 
 ```bash
 apt-get install git apache2 php libapache2-mod-php7.0
 ```
 
+## Ubuntu 18.04
+
+```bash
+apt-get install git apache2 php libapache2-mod-php7.2
+```
+
 ## CentOS 7
 
 ```bash
@@ -59,7 +65,7 @@ yum install epel-release
 yum install git httpd httpd-tools php
 ```
 
-## openSUSE Leap 42.2
+## openSUSE Leap 42.2 / 42.3 / 15.0
 
 ```bash
 yum install git apache2 apache2-utils apache2-mod_php7

From eb29d2056ea000fd5f58b939f77dff05a532bb05 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Mon, 24 Sep 2018 17:27:17 +0200
Subject: [PATCH 09/10] PKG: ship default positions file

fixes certtools/intelmq-manager#171
---
 CHANGELOG.md          |  1 +
 debian/positions.conf | 63 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13dc555..b5308e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ CHANGELOG
 ### Third-party libraries
 
 ### Packaging
+- Include a positions file matching the default configuration of intelmq (#171).
 
 ### Known issues
 
diff --git a/debian/positions.conf b/debian/positions.conf
index 0967ef4..4264ce3 100644
--- a/debian/positions.conf
+++ b/debian/positions.conf
@@ -1 +1,62 @@
-{}
+{
+    "abusech-domain-parser": {
+        "x": -304,
+        "y": 250
+    },
+    "abusech-feodo-domains-collector": {
+        "x": -508,
+        "y": 282
+    },
+    "cymru-whois-expert": {
+        "x": 510,
+        "y": -407
+    },
+    "deduplicator-expert": {
+        "x": -107,
+        "y": 162
+    },
+    "file-output": {
+        "x": 504,
+        "y": -614
+    },
+    "gethostbyname-1-expert": {
+        "x": 481,
+        "y": -198
+    },
+    "gethostbyname-2-expert": {
+        "x": 322,
+        "y": -325
+    },
+    "malc0de-parser": {
+        "x": -292,
+        "y": 48
+    },
+    "malc0de-windows-format-collector": {
+        "x": -477,
+        "y": -46
+    },
+    "malware-domain-list-collector": {
+        "x": 230,
+        "y": 382
+    },
+    "malware-domain-list-parser": {
+        "x": 60,
+        "y": 276
+    },
+    "spamhaus-drop-collector": {
+        "x": -88,
+        "y": 589
+    },
+    "spamhaus-drop-parser": {
+        "x": -114,
+        "y": 381
+    },
+    "taxonomy-expert": {
+        "x": 89,
+        "y": 29
+    },
+    "url2fqdn-expert": {
+        "x": 275,
+        "y": -116
+    }
+}
\ No newline at end of file

From 80678163cec84f0e361c4ff8f6402992eb388280 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <wagner@cert.at>
Date: Mon, 24 Sep 2018 17:32:38 +0200
Subject: [PATCH 10/10] REL: Release version 1.0.2

---
 CHANGELOG.md                   | 18 ++++++++----------
 NEWS.md                        | 10 ++++++++++
 debian/changelog               |  6 ++++++
 docs/Release.md                |  4 +---
 intelmq-manager/php/config.php |  2 +-
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5308e5..ec83f8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-1.0.2 (unreleased)
+1.0.2 (2018-09-24)
 ------------------
 
 ### Backend
@@ -10,28 +10,26 @@ CHANGELOG
 
 ### Pages
 
-#### Landing page
-
 #### Configuration
 - Underscore is now allowed for new parameter names (#153).
 
-#### Management
-
 #### Monitor
 * Fix link to monitor page (#157).
 
-#### Check
-
 ### Documentation
-- Add a FAQ and add a section about the docker issue #160.
+- Add a FAQ and add a section about the docker issue (#160).
 - Add instructions for Debian 9, Ubuntu 18.04, and openSUSE Leap 42.3, 15.0 (#168).
 
-### Third-party libraries
-
 ### Packaging
 - Include a positions file matching the default configuration of intelmq (#171).
 
 ### Known issues
+* Missing CSRF protection (#111).
+* Missing copyright notices (#140).
+* Graph jumps around on "Add edge" bug component (#148).
+* new runtime parameters with _ not possible (#153).
+* wrong error message for new bots with existing ID (#152).
+* Queue size for deleted queue remains displayed (#158).
 
 1.0.1 (2018-04-23)
 ------------------
diff --git a/NEWS.md b/NEWS.md
index af25701..0534a0e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,16 @@ NEWS
 
 See the changelog for a full list of changes.
 
+1.0.1 (2018-09-24)
+------------------
+
+No changes are required by administrators.
+
+1.0.0 (2018-04-23)
+------------------
+
+No changes are required by administrators.
+
 0.3.1
 -----
 
diff --git a/debian/changelog b/debian/changelog
index 5e0d1be..0458f7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+intelmq-manager (1.0.1-2) stable; urgency=medium
+
+  * update to version 1.0.2
+
+ -- Wagner Sebastian <wagner@cert.at>  Mon, 24 Sep 2018 17:30:06 +0200
+
 intelmq-manager (1.0.1-1) stable; urgency=low
 
   * update to version 1.0.1
diff --git a/docs/Release.md b/docs/Release.md
index c2006a7..1523df9 100644
--- a/docs/Release.md
+++ b/docs/Release.md
@@ -9,11 +9,9 @@ Assumption: You are working on branch maintenance, the next version is a bug fix
 
  * CHANGELOG.MD and
  * NEWS.MD: Update the latest header, fix the order and remove empty sections if necessary.
- * `intelmq/version.py`: Update the version.
+ * `intelmq-manager/php/config.php`: Update the version.
  * `debian/changelog`: Insert a new section for the new version with the tool `dch`.
 
-Eventually adapt the default log levels if necessary. Should be INFO for stable releases. See older releases.
-
 ## Commit and tag.
 Commit your changes, the message should start with `REL: `. Push and create a pull request from maintenance to master. Someone else should review the changes. Eventually fix them, make sure the `REL: ` is the last commit, you can also push that one at last, after the reviews.
 
diff --git a/intelmq-manager/php/config.php b/intelmq-manager/php/config.php
index 3ba18ab..1f9c1ea 100644
--- a/intelmq-manager/php/config.php
+++ b/intelmq-manager/php/config.php
@@ -16,5 +16,5 @@
     
     $BOT_CONFIGS_REJECT_REGEX = '/[^[:print:]\n\r\t]/';
     $BOT_ID_REJECT_REGEX = '/[^A-Za-z0-9.-]/';
-    $VERSION = "1.0.2.alpha1";
+    $VERSION = "1.0.2";
 ?>