From 3686f141a35afd577c51e592ea3f9bede3ff687a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 8 Mar 2018 14:31:54 -0400 Subject: [PATCH 1/2] Add Issue templates for Bug and Security --- .gitlab/issue_templates/Bug.md | 38 +++++++++++++++++++++++++++++ .gitlab/issue_templates/Security.md | 3 +++ util/copyrights | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 .gitlab/issue_templates/Bug.md create mode 100644 .gitlab/issue_templates/Security.md diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md new file mode 100644 index 0000000000..4873a52dac --- /dev/null +++ b/.gitlab/issue_templates/Bug.md @@ -0,0 +1,38 @@ + + +### Summary + +(Summarize the bug encountered concisely) + +### Steps to reproduce + +(How one can reproduce the issue - this is very important) + +### What is the current *bug* behavior? + +(What actually happens) + +### What is the expected *correct* behavior? + +(What you should see instead) + +### Relevant configuration files + +(Paste any relevant configuration files - please use code blocks (```) +to format console output, If submitting the contents of your +configuration file in a non-confidential Issue, it is advisable to +obscure key secrets: this can be done automatically by using +`named-checkconf -px`.) + +### Relevant logs and/or screenshots + +(Paste any relevant logs - please use code blocks (```) to format console output, +logs, and code as it's very hard to read otherwise.) + +### Possible fixes + +(If you can, link to the line of code that might be responsible for the problem) + +/label ~bug diff --git a/.gitlab/issue_templates/Security.md b/.gitlab/issue_templates/Security.md new file mode 100644 index 0000000000..14f9becf79 --- /dev/null +++ b/.gitlab/issue_templates/Security.md @@ -0,0 +1,3 @@ +### Security Issue + +If the bug you are reporting is security related, please do not fill it here, but send an email to [security-officer@isc.org](security-officer@isc.org). diff --git a/util/copyrights b/util/copyrights index 6fb3ae7552..a241d146d2 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1,6 +1,8 @@ ./.gitattributes X 2015,2017,2018 ./.gitignore X 2012,2013,2014,2015,2016,2017,2018 ./.gitlab-ci.yml X 2018 +./.gitlab/issue_templates/Bug.md X 2018 +./.gitlab/issue_templates/Security.md X 2018 ./Atffile X 2011,2018 ./CHANGES X 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 ./CONTRIBUTING X 2017,2018 From 2df7134d6957b8d06b99eb9a002c7836ae4fed87 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 13 Mar 2018 09:43:01 -0700 Subject: [PATCH 2/2] some tweaks for grammar and clarity --- .gitlab/issue_templates/Bug.md | 22 +++++++++++++--------- .gitlab/issue_templates/Security.md | 5 ++++- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 4873a52dac..a39de7da1b 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -1,38 +1,42 @@ ### Summary -(Summarize the bug encountered concisely) +(Summarize the bug encountered concisely.) ### Steps to reproduce -(How one can reproduce the issue - this is very important) +(How one can reproduce the issue - this is very important.) ### What is the current *bug* behavior? -(What actually happens) +(What actually happens.) ### What is the expected *correct* behavior? -(What you should see instead) +(What you should see instead.) ### Relevant configuration files (Paste any relevant configuration files - please use code blocks (```) -to format console output, If submitting the contents of your +to format console output. If submitting the contents of your configuration file in a non-confidential Issue, it is advisable to obscure key secrets: this can be done automatically by using `named-checkconf -px`.) ### Relevant logs and/or screenshots -(Paste any relevant logs - please use code blocks (```) to format console output, -logs, and code as it's very hard to read otherwise.) +(Paste any relevant logs - please use code blocks (```) to format console +output, logs, and code, as it's very hard to read otherwise.) ### Possible fixes -(If you can, link to the line of code that might be responsible for the problem) +(If you can, link to the line of code that might be responsible for the +problem.) /label ~bug diff --git a/.gitlab/issue_templates/Security.md b/.gitlab/issue_templates/Security.md index 14f9becf79..8b27f7b43a 100644 --- a/.gitlab/issue_templates/Security.md +++ b/.gitlab/issue_templates/Security.md @@ -1,3 +1,6 @@ ### Security Issue -If the bug you are reporting is security related, please do not fill it here, but send an email to [security-officer@isc.org](security-officer@isc.org). +If the bug you are reporting is potentially security-related - for example, +if it involves an assertion failure or other crash in `named` that can be +triggered repeatedly - then please do *NOT* report it here, but send an +email to [security-officer@isc.org](security-officer@isc.org).