Skip to content

Make changes to the ABNF grammar for non-chainable directives #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nightwatchcyber merged 5 commits into from
Apr 19, 2019
Merged

Make changes to the ABNF grammar for non-chainable directives #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4465ece
Resolve ABNF issues relating to non-chainable fields
joker314 Apr 17, 2019
4a9049d
Allow Canonical/Preferred-Languages directives be optional in ABNF
joker314 Apr 17, 2019
f82dd03
Add history entry for ABNF grammar changes
joker314 Apr 17, 2019
6abc837
Remove ambiguous parsings & fix ABNF syntax
joker314 Apr 18, 2019
c602455
Indent RHS by 1 space in ABNF for alignment
joker314 Apr 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
231 changes: 120 additions & 111 deletions draft-foudil-securitytxt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,82 +9,32 @@


<style type="text/css">/*<![CDATA[*/
@viewport {
zoom: 1.0;
width: extend-to-zoom;
}
@-ms-viewport {
width: extend-to-zoom;
zoom: 1.0;
}

@media screen and (min-width: 1024px) {
body>ul.toc, body>#rfc\.toc {
position: fixed;
bottom: 0;
right: 0;
right: calc(50vw - 550px);
width: 300px;
z-index: 1;
}
#rfc\.toc {
top: 55px;
overflow: auto;
overscroll-behavior: contain;
}
ul.toc, #rfc\.toc {
overflow: auto;
overscroll-behavior: contain;
}
body>ul.toc {
top: 140px;
}

body {
padding-right: 350px;
}
}

body {
font: 16px "Helvetica Neue",Helvetica,Arial,sans-serif;
font: 16px "Helvetica Neue","Open Sans",Helvetica,Calibri,sans-serif;
color: #333;
font-size-adjust: 0.5;
line-height: 24px;
margin: 75px auto;
max-width: 724px;
max-width: 624px;
padding: 0 5px;
}

.title, .filename, h1, h2, h3, h4 {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
.title, .filename, h1, h2, h3, h4, h5 {
font: 16px "Roboto Condensed","Helvetica Neue","Open Sans",Helvetica,Calibri,sans-serif;
font-size-adjust: 0.5;
font-weight: 500;
font-weight: bold;
color: #333;
line-height: 100%;
margin: 0.8em 0 0.3em;
margin: 1.2em 0 0.3em;
}
.title { font-size: 36px; }
h1 { font-size: 36px; }
h2 { font-size: 24px; }
h3, h4 { font-size: 18px; }
.title, #rfc\.title h1 { font-size: 32px; }
h1, section h1, h2, section h2, section h3, nav h2 { font-size: 20px; }
h3, section h4, h4, section h5 { font-size: 16px; }
h1 a[href], h2 a[href], h3 a[href], h4 a[href] {
color: #333;
}

ul.toc li {
list-style: none;
text-indent: -2.5em;
padding-left: 2.5em;
padding-bottom: 5px;
margin: 0;
}
ul.toc ul {
margin: 0;
}
/* xml2rfc nests ul directly inside ul which messes with the style badly */
ul.toc, ul.toc>ul, ul.toc ul>ul {
margin: 0 0 0 1.5em;
}

table {
margin-left: 0em;
border-collapse: collapse;
Expand All @@ -111,28 +61,30 @@
}


table.header {
table.header, table#rfc\.headerblock {
width: 100%;
}
table.header td {
table.header td, table#rfc\.headerblock td {
border: none;
background-color: transparent;
color: black;
padding: 0;
}
.filename {
display: block;
color: rgb(119, 119, 119);
font-size: 23px;
font-size: 20px;
font-weight: normal;
height: auto;
line-height: 100%;
margin: 10px 0 32px;
}
#rfc\.abstract+p, #rfc\.abstract p {
font-size: 18px;
line-height: 27px%;
font-size: 20px;
line-height: 28px;
}

samp, tt, code, pre {
font: 11pt consolas, monospace;
samp, tt, code, pre, span.tt {
font: 13.5px Consolas, monospace;
font-size-adjust: none;
}
pre {
Expand All @@ -142,22 +94,24 @@
padding: 5px;
margin: 5px;
}
.figure {
.figure, caption {
font-style: italic;
margin: 0 1.5em;
text-align: left;
}

address {
margin: 10px 0 0;
margin: 16px 2px;
line-height: 20px;
}
.vcard {
font-style: normal;
}
.vcardline {
display: block;
}
.vcardline .fn {
font-weight: bold;
.vcardline .fn, address b {
font-weight: normal;
}
.vcardline .hidden {
display: none;
Expand Down Expand Up @@ -211,17 +165,61 @@
background-color: #eee;
}

ol, ul, li, p {
p, ol, ul, li {
padding: 0;
margin: 0.5em 0 0.5em 2em;
}
li, p {
margin-left: 0;
p {
margin: 0.5em 0;
}
ol, ul {
margin: 0.2em 0 0.2em 2em;
}
li {
margin: 0.2em 0;
}
address {
font-style: normal;
}

ul.toc ul {
margin: 0 0 0 2em;
}
ul.toc li {
list-style: none;
margin: 0;
}

@media screen and (min-width: 924px) {
body {
padding-right: 350px;
}
body>ul.toc, body>#rfc\.toc {
position: fixed;
bottom: 0;
right: 0;
right: calc(50vw - 500px);
width: 300px;
z-index: 1;
overflow: auto;
overscroll-behavior: contain;
}
body>#rfc\.toc {
top: 55px;
}
body>ul.toc {
top: 100px;
}

ul.toc {
margin: 0 0 0 4px;
font-size: 12px;
line-height: 20px;
}
ul.toc ul {
margin-left: 1.2em;
}
}

.github-fork-ribbon-wrapper {
display: none;
}
Expand Down Expand Up @@ -278,7 +276,8 @@
.github-fork-ribbon-wrapper {
position: fixed;
}
/*]]>*/</style>
/*]]>*/</style>
<meta name="viewport" content="initial-scale=1.0">


<link href="#rfc.toc" rel="Contents">
Expand Down Expand Up @@ -330,15 +329,16 @@
<link href="#rfc.appendix.B.4" rel="Chapter" title="B.4 Since draft-foudil-securitytxt-03">
<link href="#rfc.appendix.B.5" rel="Chapter" title="B.5 Since draft-foudil-securitytxt-04">
<link href="#rfc.appendix.B.6" rel="Chapter" title="B.6 Since draft-foudil-securitytxt-05">
<link href="#rfc.appendix.B.7" rel="Chapter" title="B.7 Since draft-foudil-securitytxt-06">
<link href="#rfc.authors" rel="Chapter">


<meta name="generator" content="xml2rfc version 2.16.0 - https://tools.ietf.org/tools/xml2rfc" />
<meta name="generator" content="xml2rfc version 2.22.3 - https://tools.ietf.org/tools/xml2rfc" />
<link rel="schema.dct" href="http://purl.org/dc/terms/" />

<meta name="dct.creator" content="Foudil, E. and Y. Shafranovich" />
<meta name="dct.identifier" content="urn:ietf:id:draft-foudil-securitytxt-06" />
<meta name="dct.issued" scheme="ISO8601" content="2019-04-08" />
<meta name="dct.issued" scheme="ISO8601" content="2019-04-19" />
<meta name="dct.abstract" content="When security vulnerabilities are discovered by independent security researchers, they often lack the channels to report them properly. As a result, security vulnerabilities may be left unreported. This document defines a format (&#8220;security.txt&#8221;) to help organizations describe the process for security researchers to follow in order to report security vulnerabilities." />
<meta name="description" content="When security vulnerabilities are discovered by independent security researchers, they often lack the channels to report them properly. As a result, security vulnerabilities may be left unreported. This document defines a format (&#8220;security.txt&#8221;) to help organizations describe the process for security researchers to follow in order to report security vulnerabilities." />

Expand All @@ -362,12 +362,12 @@
<td class="right">Y. Shafranovich</td>
</tr>
<tr>
<td class="left">Expires: October 10, 2019</td>
<td class="left">Expires: October 21, 2019</td>
<td class="right">Nightwatch Cybersecurity</td>
</tr>
<tr>
<td class="left"></td>
<td class="right">April 08, 2019</td>
<td class="right">April 19, 2019</td>
</tr>


Expand All @@ -383,7 +383,7 @@ <h1 id="rfc.status"><a href="#rfc.status">Status of This Memo</a></h1>
<p>This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79.</p>
<p>Internet-Drafts are working documents of the Internet Engineering Task Force (IETF). Note that other groups may also distribute working documents as Internet-Drafts. The list of current Internet-Drafts is at https://datatracker.ietf.org/drafts/current/.</p>
<p>Internet-Drafts are draft documents valid for a maximum of six months and may be updated, replaced, or obsoleted by other documents at any time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress."</p>
<p>This Internet-Draft will expire on October 10, 2019.</p>
<p>This Internet-Draft will expire on October 21, 2019.</p>
<h1 id="rfc.copyrightnotice"><a href="#rfc.copyrightnotice">Copyright Notice</a></h1>
<p>Copyright (c) 2019 IETF Trust and the persons identified as the document authors. All rights reserved.</p>
<p>This document is subject to BCP 78 and the IETF Trust's Legal Provisions Relating to IETF Documents (https://trustee.ietf.org/license-info) in effect on the date of publication of this document. Please review these documents carefully, as they describe your rights and restrictions with respect to this document. Code Components extracted from this document must include Simplified BSD License text as described in Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License.</p>
Expand Down Expand Up @@ -489,6 +489,8 @@ <h1 class="np" id="rfc.toc"><a href="#rfc.toc">Table of Contents</a></h1>
</li>
<li>B.6. <a href="#rfc.appendix.B.6">Since draft-foudil-securitytxt-05</a>
</li>
<li>B.7. <a href="#rfc.appendix.B.7">Since draft-foudil-securitytxt-06</a>
</li>
</ul><li><a href="#rfc.authors">Authors' Addresses</a>
</li>

Expand Down Expand Up @@ -725,56 +727,57 @@ <h1 id="rfc.section.5">
<p id="rfc.section.5.p.1">The expected file format of the security.txt file is plain text (MIME type &#8220;text/plain&#8221;) as defined in section 4.1.3 of <a href="#RFC2046" class="xref">[RFC2046]</a> and is encoded using UTF-8 <a href="#RFC3629" class="xref">[RFC3629]</a> in Net-Unicode form <a href="#RFC5198" class="xref">[RFC5198]</a>.</p>
<p id="rfc.section.5.p.2">The following is an ABNF definition of the security.txt format, using the conventions defined in <a href="#RFC5234" class="xref">[RFC5234]</a>.</p>
<pre>
body = signed / unsigned
body = signed / unsigned

signed = sign-header unsigned sign-footer
signed = sign-header unsigned sign-footer

sign-header = &lt;headers and line from section 7 of [RFC4880]&gt;
sign-header = &lt;headers and line from section 7 of [RFC4880]&gt;

sign-footer = &lt;OpenPGP signature from section 7 of [RFC4880]&gt;
sign-footer = &lt;OpenPGP signature from section 7 of [RFC4880]&gt;

unsigned = *line (canonical-field eol) (lang-field eol) *line
unsigned = *line [canonical-field eol *line] [lang-field eol] *line
unsigned =/ *line [lang-field eol *line] [canonical-field eol] *line

line = (field / comment) eol
line = (field / comment) eol

eol = *WSP [CR] LF
eol = *WSP [CR] LF

field = ack-field /
contact-field /
encryption-field /
hiring-field /
policy-field /
ext-field
field = ack-field /
contact-field /
encryption-field /
hiring-field /
policy-field /
ext-field

fs = ":"
fs = ":"

comment = "#" *(WSP / VCHAR / %x80-FFFFF)
comment = "#" *(WSP / VCHAR / %x80-FFFFF)

ack-field = "Acknowledgments" fs SP uri
ack-field = "Acknowledgments" fs SP uri

canonical-field = "Canonical" fs SP uri
canonical-field = "Canonical" fs SP uri

contact-field = "Contact" fs SP uri
contact-field = "Contact" fs SP uri

lang-tag = &lt;Language-Tag from section 2.1 of [RFC5646]&gt;
lang-tag = &lt;Language-Tag from section 2.1 of [RFC5646]&gt;

uri = &lt;URI as per [RFC3986]&gt;
uri = &lt;URI as per [RFC3986]&gt;

encryption-field = "Encryption" fs SP uri
encryption-field = "Encryption" fs SP uri

hiring-field = "Hiring" fs SP uri
hiring-field = "Hiring" fs SP uri

policy-field = "Policy" fs SP uri
policy-field = "Policy" fs SP uri

lang-field = "Preferred-Languages" fs SP lang-values
lang-field = "Preferred-Languages" fs SP lang-values

lang-values = lang-tag *("," [WSP] lang-tag)
lang-values = lang-tag *("," [WSP] lang-tag)

ext-field = field-name fs SP unstructured
ext-field = field-name fs SP unstructured

field-name = &lt;imported from section 3.6.8 of [RFC5322]&gt;
field-name = &lt;imported from section 3.6.8 of [RFC5322]&gt;

unstructured = &lt;imported from section 3.2.5 of [RFC5322]&gt;
unstructured = &lt;imported from section 3.2.5 of [RFC5322]&gt;
</pre>
<p id="rfc.section.5.p.3">&#8220;ext-field&#8221; refers to extension fields, which are discussed in <a href="#extensibility" class="xref">Section 4.4</a></p>
<h1 id="rfc.section.6">
Expand Down Expand Up @@ -1142,7 +1145,13 @@ <h1 id="rfc.appendix.B.6">
<li>Added language handling redirects (#143)</li>
<li>Expanded security considerations section and fixed typos (#30, #73, #103, #112)</li>
</ul>
<p id="rfc.section.B.6.p.2">Full list of changes can be viewed via the IETF document tracker: https://tools.ietf.org/html/draft-foudil-securitytxt</p>
<h1 id="rfc.appendix.B.7">
<a href="#rfc.appendix.B.7">B.7.</a> <a href="#since-draft-foudil-securitytxt-06" id="since-draft-foudil-securitytxt-06">Since draft-foudil-securitytxt-06</a>
</h1>
<p></p>

<ul><li>Fixed ABNF grammar for non-chainable directives (#150)</li></ul>
<p id="rfc.section.B.7.p.2">Full list of changes can be viewed via the IETF document tracker: https://tools.ietf.org/html/draft-foudil-securitytxt</p>
<h1 id="rfc.authors"><a href="#rfc.authors">Authors' Addresses</a></h1>
<div class="avoidbreak">
<address class="vcard">
Expand Down
Loading