From 4465ece3948328fa4a550410068f601b88889cdf Mon Sep 17 00:00:00 2001 From: Joke Book Date: Wed, 17 Apr 2019 22:03:07 +0300 Subject: [PATCH 1/5] Resolve ABNF issues relating to non-chainable fields --- draft-foudil-securitytxt.html | 166 +++++++++++++++++----------------- draft-foudil-securitytxt.md | 3 +- draft-foudil-securitytxt.txt | 116 ++++++++++++------------ 3 files changed, 143 insertions(+), 142 deletions(-) diff --git a/draft-foudil-securitytxt.html b/draft-foudil-securitytxt.html index 828d4e2..8b131d2 100644 --- a/draft-foudil-securitytxt.html +++ b/draft-foudil-securitytxt.html @@ -9,82 +9,32 @@ + /*]]>*/ + @@ -333,12 +332,12 @@ - + - + @@ -362,12 +361,12 @@ Y. Shafranovich -Expires: October 10, 2019 +Expires: October 19, 2019 Nightwatch Cybersecurity -April 08, 2019 +April 17, 2019 @@ -383,7 +382,7 @@

Status of This Memo

This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79.

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/.

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."

-

This Internet-Draft will expire on October 10, 2019.

+

This Internet-Draft will expire on October 19, 2019.

Copyright Notice

Copyright (c) 2019 IETF Trust and the persons identified as the document authors. All rights reserved.

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.

@@ -733,7 +732,8 @@

sign-footer = <OpenPGP signature from section 7 of [RFC4880]> -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 diff --git a/draft-foudil-securitytxt.md b/draft-foudil-securitytxt.md index ff9874b..0a62c88 100644 --- a/draft-foudil-securitytxt.md +++ b/draft-foudil-securitytxt.md @@ -421,7 +421,8 @@ sign-header = sign-footer = -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 diff --git a/draft-foudil-securitytxt.txt b/draft-foudil-securitytxt.txt index 5fb115b..edd8331 100644 --- a/draft-foudil-securitytxt.txt +++ b/draft-foudil-securitytxt.txt @@ -5,8 +5,8 @@ Network Working Group E. Foudil Internet-Draft Intended status: Informational Y. Shafranovich -Expires: October 10, 2019 Nightwatch Cybersecurity - April 08, 2019 +Expires: October 19, 2019 Nightwatch Cybersecurity + April 17, 2019 A Method for Web Security Policies @@ -36,7 +36,7 @@ Status of This Memo time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on October 10, 2019. + This Internet-Draft will expire on October 19, 2019. Copyright Notice @@ -53,7 +53,7 @@ Copyright Notice -Foudil & Shafranovich Expires October 10, 2019 [Page 1] +Foudil & Shafranovich Expires October 19, 2019 [Page 1] Internet-Draft A Method for Web Security Policies April 2019 @@ -109,7 +109,7 @@ Table of Contents -Foudil & Shafranovich Expires October 10, 2019 [Page 2] +Foudil & Shafranovich Expires October 19, 2019 [Page 2] Internet-Draft A Method for Web Security Policies April 2019 @@ -165,7 +165,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 3] +Foudil & Shafranovich Expires October 19, 2019 [Page 3] Internet-Draft A Method for Web Security Policies April 2019 @@ -221,7 +221,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 4] +Foudil & Shafranovich Expires October 19, 2019 [Page 4] Internet-Draft A Method for Web Security Policies April 2019 @@ -277,7 +277,7 @@ https://[2001:db8:8:4::2]/.well-known/security.txt -Foudil & Shafranovich Expires October 10, 2019 [Page 5] +Foudil & Shafranovich Expires October 19, 2019 [Page 5] Internet-Draft A Method for Web Security Policies April 2019 @@ -333,7 +333,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 6] +Foudil & Shafranovich Expires October 19, 2019 [Page 6] Internet-Draft A Method for Web Security Policies April 2019 @@ -389,7 +389,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 7] +Foudil & Shafranovich Expires October 19, 2019 [Page 7] Internet-Draft A Method for Web Security Policies April 2019 @@ -445,7 +445,7 @@ Encryption: dns:5d2d37ab76d47d36._openpgpkey.example.com?type=OPENPGPKEY -Foudil & Shafranovich Expires October 10, 2019 [Page 8] +Foudil & Shafranovich Expires October 19, 2019 [Page 8] Internet-Draft A Method for Web Security Policies April 2019 @@ -501,7 +501,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 9] +Foudil & Shafranovich Expires October 19, 2019 [Page 9] Internet-Draft A Method for Web Security Policies April 2019 @@ -557,7 +557,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 10] +Foudil & Shafranovich Expires October 19, 2019 [Page 10] Internet-Draft A Method for Web Security Policies April 2019 @@ -574,63 +574,65 @@ Internet-Draft A Method for Web Security Policies April 2019 The following is an ABNF definition of the security.txt format, using the conventions defined in [RFC5234]. - body = signed / unsigned +body = signed / unsigned - signed = sign-header unsigned sign-footer +signed = sign-header unsigned sign-footer - sign-header = +sign-header = - sign-footer = +sign-footer = - 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 = +lang-tag = - uri = +uri = - encryption-field = "Encryption" fs SP uri -Foudil & Shafranovich Expires October 10, 2019 [Page 11] +Foudil & Shafranovich Expires October 19, 2019 [Page 11] Internet-Draft A Method for Web Security Policies April 2019 - hiring-field = "Hiring" fs SP uri +encryption-field = "Encryption" fs SP uri - policy-field = "Policy" fs SP uri +hiring-field = "Hiring" fs SP uri - lang-field = "Preferred-Languages" fs SP lang-values +policy-field = "Policy" fs SP uri - lang-values = lang-tag *("," [WSP] lang-tag) +lang-field = "Preferred-Languages" fs SP lang-values - ext-field = field-name fs SP unstructured +lang-values = lang-tag *("," [WSP] lang-tag) - field-name = +ext-field = field-name fs SP unstructured - unstructured = +field-name = + +unstructured = "ext-field" refers to extension fields, which are discussed in Section 4.4 @@ -663,17 +665,18 @@ Internet-Draft A Method for Web Security Policies April 2019 If information and resources referenced in a "security.txt" file are incorrect or not kept up to date, this can result in security reports - not being received by the organization or sent to incorrect contacts, - thus exposing possible security issues to third parties. -Foudil & Shafranovich Expires October 10, 2019 [Page 12] +Foudil & Shafranovich Expires October 19, 2019 [Page 12] Internet-Draft A Method for Web Security Policies April 2019 + not being received by the organization or sent to incorrect contacts, + thus exposing possible security issues to third parties. + Organizations SHOULD ensure that information in this file and any referenced resources such as web pages, email addresses and telephone numbers are kept current, are accessible, controlled by the @@ -722,10 +725,7 @@ Internet-Draft A Method for Web Security Policies April 2019 - - - -Foudil & Shafranovich Expires October 10, 2019 [Page 13] +Foudil & Shafranovich Expires October 19, 2019 [Page 13] Internet-Draft A Method for Web Security Policies April 2019 @@ -781,7 +781,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 14] +Foudil & Shafranovich Expires October 19, 2019 [Page 14] Internet-Draft A Method for Web Security Policies April 2019 @@ -837,7 +837,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 15] +Foudil & Shafranovich Expires October 19, 2019 [Page 15] Internet-Draft A Method for Web Security Policies April 2019 @@ -893,7 +893,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 16] +Foudil & Shafranovich Expires October 19, 2019 [Page 16] Internet-Draft A Method for Web Security Policies April 2019 @@ -949,7 +949,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 17] +Foudil & Shafranovich Expires October 19, 2019 [Page 17] Internet-Draft A Method for Web Security Policies April 2019 @@ -1005,7 +1005,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 10, 2019 [Page 18] +Foudil & Shafranovich Expires October 19, 2019 [Page 18] Internet-Draft A Method for Web Security Policies April 2019 @@ -1061,7 +1061,7 @@ Appendix A. Note to Readers -Foudil & Shafranovich Expires October 10, 2019 [Page 19] +Foudil & Shafranovich Expires October 19, 2019 [Page 19] Internet-Draft A Method for Web Security Policies April 2019 @@ -1117,7 +1117,7 @@ B.2. Since draft-foudil-securitytxt-01 -Foudil & Shafranovich Expires October 10, 2019 [Page 20] +Foudil & Shafranovich Expires October 19, 2019 [Page 20] Internet-Draft A Method for Web Security Policies April 2019 @@ -1173,7 +1173,7 @@ B.5. Since draft-foudil-securitytxt-04 -Foudil & Shafranovich Expires October 10, 2019 [Page 21] +Foudil & Shafranovich Expires October 19, 2019 [Page 21] Internet-Draft A Method for Web Security Policies April 2019 @@ -1229,4 +1229,4 @@ Authors' Addresses -Foudil & Shafranovich Expires October 10, 2019 [Page 22] +Foudil & Shafranovich Expires October 19, 2019 [Page 22] From 4a9049dd2f137c4e546f157f6298da133ec07975 Mon Sep 17 00:00:00 2001 From: Joke Book Date: Wed, 17 Apr 2019 22:12:19 +0300 Subject: [PATCH 2/5] Allow Canonical/Preferred-Languages directives be optional in ABNF --- draft-foudil-securitytxt.html | 4 ++-- draft-foudil-securitytxt.md | 4 ++-- draft-foudil-securitytxt.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/draft-foudil-securitytxt.html b/draft-foudil-securitytxt.html index 8b131d2..1bcacaf 100644 --- a/draft-foudil-securitytxt.html +++ b/draft-foudil-securitytxt.html @@ -732,8 +732,8 @@

sign-footer = <OpenPGP signature from section 7 of [RFC4880]> -unsigned = *line (canonical-field eol) *line (lang-field eol) *line -unsigned /= *line (lang-field eol) *line (canonical-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 diff --git a/draft-foudil-securitytxt.md b/draft-foudil-securitytxt.md index 0a62c88..9347c84 100644 --- a/draft-foudil-securitytxt.md +++ b/draft-foudil-securitytxt.md @@ -421,8 +421,8 @@ sign-header = sign-footer = -unsigned = *line (canonical-field eol) *line (lang-field eol) *line -unsigned /= *line (lang-field eol) *line (canonical-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 diff --git a/draft-foudil-securitytxt.txt b/draft-foudil-securitytxt.txt index edd8331..553d238 100644 --- a/draft-foudil-securitytxt.txt +++ b/draft-foudil-securitytxt.txt @@ -582,8 +582,8 @@ sign-header = sign-footer = -unsigned = *line (canonical-field eol) *line (lang-field eol) *line -unsigned /= *line (lang-field eol) *line (canonical-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 From f82dd03c708a728423ae6d50630c6ad43292d1e2 Mon Sep 17 00:00:00 2001 From: Joke Book Date: Wed, 17 Apr 2019 22:15:24 +0300 Subject: [PATCH 3/5] Add history entry for ABNF grammar changes --- draft-foudil-securitytxt.html | 11 ++++++++++- draft-foudil-securitytxt.md | 3 +++ draft-foudil-securitytxt.txt | 10 +++++----- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/draft-foudil-securitytxt.html b/draft-foudil-securitytxt.html index 1bcacaf..4f2a003 100644 --- a/draft-foudil-securitytxt.html +++ b/draft-foudil-securitytxt.html @@ -329,6 +329,7 @@ + @@ -488,6 +489,8 @@

Table of Contents

  • B.6. Since draft-foudil-securitytxt-05
    • +
  • B.7. Since draft-foudil-securitytxt-06 +
  • Authors' Addresses
    • @@ -1142,7 +1145,13 @@

  • Added language handling redirects (#143)
  • Expanded security considerations section and fixed typos (#30, #73, #103, #112)
    • -

    Full list of changes can be viewed via the IETF document tracker: https://tools.ietf.org/html/draft-foudil-securitytxt

    +

    +B.7. Since draft-foudil-securitytxt-06 +

    +

    + +
    • Fixed ABNF grammar for non-chainable directives (#150)
    +

    Full list of changes can be viewed via the IETF document tracker: https://tools.ietf.org/html/draft-foudil-securitytxt

    Authors' Addresses

    diff --git a/draft-foudil-securitytxt.md b/draft-foudil-securitytxt.md index 9347c84..40ed043 100644 --- a/draft-foudil-securitytxt.md +++ b/draft-foudil-securitytxt.md @@ -741,5 +741,8 @@ of DNS-stored encryption keys (#28 and #94) - Added language handling redirects (#143) - Expanded security considerations section and fixed typos (#30, #73, #103, #112) +## Since draft-foudil-securitytxt-06 +- Fixed ABNF grammar for non-chainable directives (#150) + Full list of changes can be viewed via the IETF document tracker: https://tools.ietf.org/html/draft-foudil-securitytxt diff --git a/draft-foudil-securitytxt.txt b/draft-foudil-securitytxt.txt index 553d238..364c651 100644 --- a/draft-foudil-securitytxt.txt +++ b/draft-foudil-securitytxt.txt @@ -119,6 +119,7 @@ Internet-Draft A Method for Web Security Policies April 2019 B.4. Since draft-foudil-securitytxt-03 . . . . . . . . . . . . 21 B.5. Since draft-foudil-securitytxt-04 . . . . . . . . . . . . 21 B.6. Since draft-foudil-securitytxt-05 . . . . . . . . . . . . 22 + B.7. Since draft-foudil-securitytxt-06 . . . . . . . . . . . . 22 Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 22 1. Introduction @@ -164,7 +165,6 @@ Internet-Draft A Method for Web Security Policies April 2019 - Foudil & Shafranovich Expires October 19, 2019 [Page 3] Internet-Draft A Method for Web Security Policies April 2019 @@ -1201,6 +1201,10 @@ B.6. Since draft-foudil-securitytxt-05 o Expanded security considerations section and fixed typos (#30, #73, #103, #112) +B.7. Since draft-foudil-securitytxt-06 + + o Fixed ABNF grammar for non-chainable directives (#150) + Full list of changes can be viewed via the IETF document tracker: https://tools.ietf.org/html/draft-foudil-securitytxt @@ -1225,8 +1229,4 @@ Authors' Addresses - - - - Foudil & Shafranovich Expires October 19, 2019 [Page 22] From 6abc8374820bb6346499870abae07843360742f4 Mon Sep 17 00:00:00 2001 From: Joke Book Date: Fri, 19 Apr 2019 01:14:52 +0300 Subject: [PATCH 4/5] Remove ambiguous parsings & fix ABNF syntax --- draft-foudil-securitytxt.html | 12 ++++---- draft-foudil-securitytxt.md | 4 +-- draft-foudil-securitytxt.txt | 54 +++++++++++++++++------------------ 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/draft-foudil-securitytxt.html b/draft-foudil-securitytxt.html index 4f2a003..461b7ea 100644 --- a/draft-foudil-securitytxt.html +++ b/draft-foudil-securitytxt.html @@ -338,7 +338,7 @@ - + @@ -362,12 +362,12 @@ Y. Shafranovich -Expires: October 19, 2019 +Expires: October 21, 2019 Nightwatch Cybersecurity -April 17, 2019 +April 19, 2019 @@ -383,7 +383,7 @@

    Status of This Memo

    This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79.

    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/.

    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."

    -

    This Internet-Draft will expire on October 19, 2019.

    +

    This Internet-Draft will expire on October 21, 2019.

    Copyright Notice

    Copyright (c) 2019 IETF Trust and the persons identified as the document authors. All rights reserved.

    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.

    @@ -735,8 +735,8 @@

    sign-footer = <OpenPGP signature from section 7 of [RFC4880]> -unsigned = *line [canonical-field eol] *line [lang-field eol] *line -unsigned /= *line [lang-field eol] *line [canonical-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 diff --git a/draft-foudil-securitytxt.md b/draft-foudil-securitytxt.md index 40ed043..ae74c03 100644 --- a/draft-foudil-securitytxt.md +++ b/draft-foudil-securitytxt.md @@ -421,8 +421,8 @@ sign-header = sign-footer = -unsigned = *line [canonical-field eol] *line [lang-field eol] *line -unsigned /= *line [lang-field eol] *line [canonical-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 diff --git a/draft-foudil-securitytxt.txt b/draft-foudil-securitytxt.txt index 364c651..cc6d004 100644 --- a/draft-foudil-securitytxt.txt +++ b/draft-foudil-securitytxt.txt @@ -5,8 +5,8 @@ Network Working Group E. Foudil Internet-Draft Intended status: Informational Y. Shafranovich -Expires: October 19, 2019 Nightwatch Cybersecurity - April 17, 2019 +Expires: October 21, 2019 Nightwatch Cybersecurity + April 19, 2019 A Method for Web Security Policies @@ -36,7 +36,7 @@ Status of This Memo time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on October 19, 2019. + This Internet-Draft will expire on October 21, 2019. Copyright Notice @@ -53,7 +53,7 @@ Copyright Notice -Foudil & Shafranovich Expires October 19, 2019 [Page 1] +Foudil & Shafranovich Expires October 21, 2019 [Page 1] Internet-Draft A Method for Web Security Policies April 2019 @@ -109,7 +109,7 @@ Table of Contents -Foudil & Shafranovich Expires October 19, 2019 [Page 2] +Foudil & Shafranovich Expires October 21, 2019 [Page 2] Internet-Draft A Method for Web Security Policies April 2019 @@ -165,7 +165,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 3] +Foudil & Shafranovich Expires October 21, 2019 [Page 3] Internet-Draft A Method for Web Security Policies April 2019 @@ -221,7 +221,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 4] +Foudil & Shafranovich Expires October 21, 2019 [Page 4] Internet-Draft A Method for Web Security Policies April 2019 @@ -277,7 +277,7 @@ https://[2001:db8:8:4::2]/.well-known/security.txt -Foudil & Shafranovich Expires October 19, 2019 [Page 5] +Foudil & Shafranovich Expires October 21, 2019 [Page 5] Internet-Draft A Method for Web Security Policies April 2019 @@ -333,7 +333,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 6] +Foudil & Shafranovich Expires October 21, 2019 [Page 6] Internet-Draft A Method for Web Security Policies April 2019 @@ -389,7 +389,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 7] +Foudil & Shafranovich Expires October 21, 2019 [Page 7] Internet-Draft A Method for Web Security Policies April 2019 @@ -445,7 +445,7 @@ Encryption: dns:5d2d37ab76d47d36._openpgpkey.example.com?type=OPENPGPKEY -Foudil & Shafranovich Expires October 19, 2019 [Page 8] +Foudil & Shafranovich Expires October 21, 2019 [Page 8] Internet-Draft A Method for Web Security Policies April 2019 @@ -501,7 +501,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 9] +Foudil & Shafranovich Expires October 21, 2019 [Page 9] Internet-Draft A Method for Web Security Policies April 2019 @@ -557,7 +557,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 10] +Foudil & Shafranovich Expires October 21, 2019 [Page 10] Internet-Draft A Method for Web Security Policies April 2019 @@ -582,8 +582,8 @@ sign-header = sign-footer = -unsigned = *line [canonical-field eol] *line [lang-field eol] *line -unsigned /= *line [lang-field eol] *line [canonical-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 @@ -613,7 +613,7 @@ uri = -Foudil & Shafranovich Expires October 19, 2019 [Page 11] +Foudil & Shafranovich Expires October 21, 2019 [Page 11] Internet-Draft A Method for Web Security Policies April 2019 @@ -669,7 +669,7 @@ unstructured = -Foudil & Shafranovich Expires October 19, 2019 [Page 12] +Foudil & Shafranovich Expires October 21, 2019 [Page 12] Internet-Draft A Method for Web Security Policies April 2019 @@ -725,7 +725,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 13] +Foudil & Shafranovich Expires October 21, 2019 [Page 13] Internet-Draft A Method for Web Security Policies April 2019 @@ -781,7 +781,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 14] +Foudil & Shafranovich Expires October 21, 2019 [Page 14] Internet-Draft A Method for Web Security Policies April 2019 @@ -837,7 +837,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 15] +Foudil & Shafranovich Expires October 21, 2019 [Page 15] Internet-Draft A Method for Web Security Policies April 2019 @@ -893,7 +893,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 16] +Foudil & Shafranovich Expires October 21, 2019 [Page 16] Internet-Draft A Method for Web Security Policies April 2019 @@ -949,7 +949,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 17] +Foudil & Shafranovich Expires October 21, 2019 [Page 17] Internet-Draft A Method for Web Security Policies April 2019 @@ -1005,7 +1005,7 @@ Internet-Draft A Method for Web Security Policies April 2019 -Foudil & Shafranovich Expires October 19, 2019 [Page 18] +Foudil & Shafranovich Expires October 21, 2019 [Page 18] Internet-Draft A Method for Web Security Policies April 2019 @@ -1061,7 +1061,7 @@ Appendix A. Note to Readers -Foudil & Shafranovich Expires October 19, 2019 [Page 19] +Foudil & Shafranovich Expires October 21, 2019 [Page 19] Internet-Draft A Method for Web Security Policies April 2019 @@ -1117,7 +1117,7 @@ B.2. Since draft-foudil-securitytxt-01 -Foudil & Shafranovich Expires October 19, 2019 [Page 20] +Foudil & Shafranovich Expires October 21, 2019 [Page 20] Internet-Draft A Method for Web Security Policies April 2019 @@ -1173,7 +1173,7 @@ B.5. Since draft-foudil-securitytxt-04 -Foudil & Shafranovich Expires October 19, 2019 [Page 21] +Foudil & Shafranovich Expires October 21, 2019 [Page 21] Internet-Draft A Method for Web Security Policies April 2019 @@ -1229,4 +1229,4 @@ Authors' Addresses -Foudil & Shafranovich Expires October 19, 2019 [Page 22] +Foudil & Shafranovich Expires October 21, 2019 [Page 22] From c602455511a1410f44cd2504e438954018db5d9a Mon Sep 17 00:00:00 2001 From: Joke Book Date: Fri, 19 Apr 2019 16:42:20 +0300 Subject: [PATCH 5/5] Indent RHS by 1 space in ABNF for alignment --- draft-foudil-securitytxt.html | 56 +++++++++++++++++------------------ draft-foudil-securitytxt.md | 56 +++++++++++++++++------------------ draft-foudil-securitytxt.txt | 56 +++++++++++++++++------------------ 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/draft-foudil-securitytxt.html b/draft-foudil-securitytxt.html index 461b7ea..54c6057 100644 --- a/draft-foudil-securitytxt.html +++ b/draft-foudil-securitytxt.html @@ -727,57 +727,57 @@

    The expected file format of the security.txt file is plain text (MIME type “text/plain”) as defined in section 4.1.3 of [RFC2046] and is encoded using UTF-8 [RFC3629] in Net-Unicode form [RFC5198].

    The following is an ABNF definition of the security.txt format, using the conventions defined in [RFC5234].

    -body             = signed / unsigned
+body             =  signed / unsigned
 
-signed           = sign-header unsigned sign-footer
+signed           =  sign-header unsigned sign-footer
 
-sign-header      = <headers and line from section 7 of [RFC4880]>
+sign-header      =  <headers and line from section 7 of [RFC4880]>
 
-sign-footer      = <OpenPGP signature from section 7 of [RFC4880]>
+sign-footer      =  <OpenPGP signature from section 7 of [RFC4880]>
 
-unsigned         = *line [canonical-field eol *line] [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         = <Language-Tag from section 2.1 of [RFC5646]>
+lang-tag         =  <Language-Tag from section 2.1 of [RFC5646]>
 
-uri              = <URI as per [RFC3986]>
+uri              =  <URI as per [RFC3986]>
 
-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       = <imported from section 3.6.8 of [RFC5322]>
+field-name       =  <imported from section 3.6.8 of [RFC5322]>
 
-unstructured     = <imported from section 3.2.5 of [RFC5322]>
+unstructured     =  <imported from section 3.2.5 of [RFC5322]>

    “ext-field” refers to extension fields, which are discussed in Section 4.4

    diff --git a/draft-foudil-securitytxt.md b/draft-foudil-securitytxt.md index ae74c03..2b3223d 100644 --- a/draft-foudil-securitytxt.md +++ b/draft-foudil-securitytxt.md @@ -413,57 +413,57 @@ The following is an ABNF definition of the security.txt format, using the conventions defined in {{!RFC5234}}. ~~~~~~~~~~ -body = signed / unsigned +body = signed / unsigned -signed = sign-header unsigned sign-footer +signed = sign-header unsigned sign-footer -sign-header = +sign-header = -sign-footer = +sign-footer = -unsigned = *line [canonical-field eol *line] [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 = +lang-tag = -uri = +uri = -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 = +field-name = -unstructured = +unstructured = ~~~~~~~~~~ "ext-field" refers to extension fields, which are discussed in {{extensibility}} diff --git a/draft-foudil-securitytxt.txt b/draft-foudil-securitytxt.txt index cc6d004..65c43ed 100644 --- a/draft-foudil-securitytxt.txt +++ b/draft-foudil-securitytxt.txt @@ -574,41 +574,41 @@ Internet-Draft A Method for Web Security Policies April 2019 The following is an ABNF definition of the security.txt format, using the conventions defined in [RFC5234]. -body = signed / unsigned +body = signed / unsigned -signed = sign-header unsigned sign-footer +signed = sign-header unsigned sign-footer -sign-header = +sign-header = -sign-footer = +sign-footer = -unsigned = *line [canonical-field eol *line] [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 = +lang-tag = -uri = +uri = @@ -618,21 +618,21 @@ Foudil & Shafranovich Expires October 21, 2019 [Page 11] Internet-Draft A Method for Web Security Policies April 2019 -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 = +field-name = -unstructured = +unstructured = "ext-field" refers to extension fields, which are discussed in Section 4.4