draft-ietf-netconf-restconf-client-server-15.txt   draft-ietf-netconf-restconf-client-server-16.txt 
NETCONF Working Group K. Watsen NETCONF Working Group K. Watsen
Internet-Draft Watsen Networks Internet-Draft Watsen Networks
Intended status: Standards Track October 18, 2019 Intended status: Standards Track November 1, 2019
Expires: April 20, 2020 Expires: May 4, 2020
RESTCONF Client and Server Models RESTCONF Client and Server Models
draft-ietf-netconf-restconf-client-server-15 draft-ietf-netconf-restconf-client-server-16
Abstract Abstract
This document defines two YANG modules, one module to configure a This document defines two YANG modules, one module to configure a
RESTCONF client and the other module to configure a RESTCONF server. RESTCONF client and the other module to configure a RESTCONF server.
Both modules support the TLS transport protocol with both standard Both modules support the TLS transport protocol with both standard
RESTCONF and RESTCONF Call Home connections. RESTCONF and RESTCONF Call Home connections.
Editorial Note (To be removed by RFC Editor) Editorial Note (To be removed by RFC Editor)
skipping to change at page 2, line 11 skipping to change at page 2, line 11
o "BBBB" --> the assigned RFC value for I-D.ietf-netconf-tls-client- o "BBBB" --> the assigned RFC value for I-D.ietf-netconf-tls-client-
server server
o "CCCC" --> the assigned RFC value for I-D.ietf-netconf-http- o "CCCC" --> the assigned RFC value for I-D.ietf-netconf-http-
client-server client-server
Artwork in this document contains placeholder values for the date of Artwork in this document contains placeholder values for the date of
publication of this draft. Please apply the following replacement: publication of this draft. Please apply the following replacement:
o "2019-10-18" --> the publication date of this draft o "2019-11-02" --> the publication date of this draft
The following Appendix section is to be removed prior to publication: The following Appendix section is to be removed prior to publication:
o Appendix B. Change Log o Appendix B. Change Log
Status of This Memo Status of This Memo
This Internet-Draft is submitted in full conformance with the This Internet-Draft is submitted in full conformance with the
provisions of BCP 78 and BCP 79. provisions of BCP 78 and BCP 79.
Internet-Drafts are working documents of the Internet Engineering Internet-Drafts are working documents of the Internet Engineering
Task Force (IETF). Note that other groups may also distribute Task Force (IETF). Note that other groups may also distribute
working documents as Internet-Drafts. The list of current Internet- working documents as Internet-Drafts. The list of current Internet-
Drafts is at https://datatracker.ietf.org/drafts/current/. Drafts is at https://datatracker.ietf.org/drafts/current/.
Internet-Drafts are draft documents valid for a maximum of six months Internet-Drafts are draft documents valid for a maximum of six months
and may be updated, replaced, or obsoleted by other documents at any and may be updated, replaced, or obsoleted by other documents at any
time. It is inappropriate to use Internet-Drafts as reference time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress." material or to cite them other than as "work in progress."
This Internet-Draft will expire on April 20, 2020. This Internet-Draft will expire on May 4, 2020.
Copyright Notice Copyright Notice
Copyright (c) 2019 IETF Trust and the persons identified as the Copyright (c) 2019 IETF Trust and the persons identified as the
document authors. All rights reserved. document authors. All rights reserved.
This document is subject to BCP 78 and the IETF Trust's Legal This document is subject to BCP 78 and the IETF Trust's Legal
Provisions Relating to IETF Documents Provisions Relating to IETF Documents
(https://trustee.ietf.org/license-info) in effect on the date of (https://trustee.ietf.org/license-info) in effect on the date of
publication of this document. Please review these documents publication of this document. Please review these documents
skipping to change at page 3, line 17 skipping to change at page 3, line 17
1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 3 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 3
1.1. Terminology . . . . . . . . . . . . . . . . . . . . . . . 4 1.1. Terminology . . . . . . . . . . . . . . . . . . . . . . . 4
2. The RESTCONF Client Model . . . . . . . . . . . . . . . . . . 4 2. The RESTCONF Client Model . . . . . . . . . . . . . . . . . . 4
2.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4 2.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4
2.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 5 2.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 5
2.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 9 2.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 9
3. The RESTCONF Server Model . . . . . . . . . . . . . . . . . . 19 3. The RESTCONF Server Model . . . . . . . . . . . . . . . . . . 19
3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 19 3.1. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 19
3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 20 3.2. Example Usage . . . . . . . . . . . . . . . . . . . . . . 20
3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 25 3.3. YANG Module . . . . . . . . . . . . . . . . . . . . . . . 25
4. Security Considerations . . . . . . . . . . . . . . . . . . . 36 4. Security Considerations . . . . . . . . . . . . . . . . . . . 37
5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 37 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 38
5.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 37 5.1. The IETF XML Registry . . . . . . . . . . . . . . . . . . 38
5.2. The YANG Module Names Registry . . . . . . . . . . . . . 38 5.2. The YANG Module Names Registry . . . . . . . . . . . . . 38
6. References . . . . . . . . . . . . . . . . . . . . . . . . . 38 6. References . . . . . . . . . . . . . . . . . . . . . . . . . 38
6.1. Normative References . . . . . . . . . . . . . . . . . . 38 6.1. Normative References . . . . . . . . . . . . . . . . . . 38
6.2. Informative References . . . . . . . . . . . . . . . . . 39 6.2. Informative References . . . . . . . . . . . . . . . . . 40
Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 41 Appendix A. Expanded Tree Diagrams . . . . . . . . . . . . . . . 41
A.1. Expanded Tree Diagram for 'ietf-restconf-client' . . . . 41 A.1. Expanded Tree Diagram for 'ietf-restconf-client' . . . . 41
A.2. Expanded Tree Diagram for 'ietf-restconf-server' . . . . 53 A.2. Expanded Tree Diagram for 'ietf-restconf-server' . . . . 53
Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 63 Appendix B. Change Log . . . . . . . . . . . . . . . . . . . . . 63
B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 63 B.1. 00 to 01 . . . . . . . . . . . . . . . . . . . . . . . . 63
B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 63 B.2. 01 to 02 . . . . . . . . . . . . . . . . . . . . . . . . 63
B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 63 B.3. 02 to 03 . . . . . . . . . . . . . . . . . . . . . . . . 63
B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 63 B.4. 03 to 04 . . . . . . . . . . . . . . . . . . . . . . . . 63
B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 64 B.5. 04 to 05 . . . . . . . . . . . . . . . . . . . . . . . . 63
B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 64 B.6. 05 to 06 . . . . . . . . . . . . . . . . . . . . . . . . 64
B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 64 B.7. 06 to 07 . . . . . . . . . . . . . . . . . . . . . . . . 64
B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 64 B.8. 07 to 08 . . . . . . . . . . . . . . . . . . . . . . . . 64
B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 64 B.9. 08 to 09 . . . . . . . . . . . . . . . . . . . . . . . . 64
B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 65 B.10. 09 to 10 . . . . . . . . . . . . . . . . . . . . . . . . 64
B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 65 B.11. 10 to 11 . . . . . . . . . . . . . . . . . . . . . . . . 65
B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 65 B.12. 11 to 12 . . . . . . . . . . . . . . . . . . . . . . . . 65
B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 65 B.13. 12 to 13 . . . . . . . . . . . . . . . . . . . . . . . . 65
B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 66 B.14. 13 to 14 . . . . . . . . . . . . . . . . . . . . . . . . 66
B.15. 14 to 15 . . . . . . . . . . . . . . . . . . . . . . . . 66 B.15. 14 to 15 . . . . . . . . . . . . . . . . . . . . . . . . 66
B.16. 15 to 16 . . . . . . . . . . . . . . . . . . . . . . . . 66
Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 66 Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 66
Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 67 Author's Address . . . . . . . . . . . . . . . . . . . . . . . . 67
1. Introduction 1. Introduction
This document defines two YANG [RFC7950] modules, one module to This document defines two YANG [RFC7950] modules, one module to
configure a RESTCONF client and the other module to configure a configure a RESTCONF client and the other module to configure a
RESTCONF server [RFC8040]. Both modules support the TLS [RFC8446] RESTCONF server [RFC8040]. Both modules support the TLS [RFC8446]
transport protocol with both standard RESTCONF and RESTCONF Call Home transport protocol with both standard RESTCONF and RESTCONF Call Home
connections [RFC8071]. connections [RFC8071].
skipping to change at page 6, line 48 skipping to change at page 6, line 51
<truststore-reference>explicitly-trusted-server-ce\ <truststore-reference>explicitly-trusted-server-ce\
rts</truststore-reference> rts</truststore-reference>
</server-certs> </server-certs>
</server-authentication> </server-authentication>
<keepalives> <keepalives>
<max-wait>30</max-wait> <max-wait>30</max-wait>
<max-attempts>3</max-attempts> <max-attempts>3</max-attempts>
</keepalives> </keepalives>
</tls-client-parameters> </tls-client-parameters>
<http-client-parameters> <http-client-parameters>
<protocol-version>HTTP/1.1</protocol-version>
<client-identity> <client-identity>
<basic> <basic>
<user-id>bob</user-id> <user-id>bob</user-id>
<password>secret</password> <password>secret</password>
</basic> </basic>
</client-identity> </client-identity>
</http-client-parameters> </http-client-parameters>
</https> </https>
</endpoint> </endpoint>
<endpoint> <endpoint>
skipping to change at page 7, line 46 skipping to change at page 7, line 47
<truststore-reference>explicitly-trusted-server-ce\ <truststore-reference>explicitly-trusted-server-ce\
rts</truststore-reference> rts</truststore-reference>
</server-certs> </server-certs>
</server-authentication> </server-authentication>
<keepalives> <keepalives>
<max-wait>30</max-wait> <max-wait>30</max-wait>
<max-attempts>3</max-attempts> <max-attempts>3</max-attempts>
</keepalives> </keepalives>
</tls-client-parameters> </tls-client-parameters>
<http-client-parameters> <http-client-parameters>
<protocol-version>HTTP/1.1</protocol-version>
<client-identity> <client-identity>
<basic> <basic>
<user-id>bob</user-id> <user-id>bob</user-id>
<password>secret</password> <password>secret</password>
</basic> </basic>
</client-identity> </client-identity>
</http-client-parameters> </http-client-parameters>
</https> </https>
</endpoint> </endpoint>
skipping to change at page 8, line 45 skipping to change at page 8, line 45
<truststore-reference>explicitly-trusted-server-ca-cer\ <truststore-reference>explicitly-trusted-server-ca-cer\
ts</truststore-reference> ts</truststore-reference>
</ca-certs> </ca-certs>
<server-certs> <server-certs>
<truststore-reference>explicitly-trusted-server-certs<\ <truststore-reference>explicitly-trusted-server-certs<\
/truststore-reference> /truststore-reference>
</server-certs> </server-certs>
</server-authentication> </server-authentication>
</tls-client-parameters> </tls-client-parameters>
<http-client-parameters> <http-client-parameters>
<protocol-version>HTTP/1.1</protocol-version>
<client-identity> <client-identity>
<basic> <basic>
<user-id>bob</user-id> <user-id>bob</user-id>
<password>secret</password> <password>secret</password>
</basic> </basic>
</client-identity> </client-identity>
</http-client-parameters> </http-client-parameters>
</https> </https>
</endpoint> </endpoint>
</listen> </listen>
</restconf-client> </restconf-client>
2.3. YANG Module 2.3. YANG Module
This YANG module has normative references to [RFC6991], [RFC8040], This YANG module has normative references to [RFC6991], [RFC8040],
and [RFC8071], [I-D.kwatsen-netconf-tcp-client-server], and [RFC8071], [I-D.kwatsen-netconf-tcp-client-server],
[I-D.ietf-netconf-tls-client-server], and [I-D.ietf-netconf-tls-client-server], and
[I-D.kwatsen-netconf-http-client-server]. [I-D.kwatsen-netconf-http-client-server].
skipping to change at page 9, line 17 skipping to change at page 9, line 16
</listen> </listen>
</restconf-client> </restconf-client>
2.3. YANG Module 2.3. YANG Module
This YANG module has normative references to [RFC6991], [RFC8040], This YANG module has normative references to [RFC6991], [RFC8040],
and [RFC8071], [I-D.kwatsen-netconf-tcp-client-server], and [RFC8071], [I-D.kwatsen-netconf-tcp-client-server],
[I-D.ietf-netconf-tls-client-server], and [I-D.ietf-netconf-tls-client-server], and
[I-D.kwatsen-netconf-http-client-server]. [I-D.kwatsen-netconf-http-client-server].
<CODE BEGINS> file "ietf-restconf-client@2019-10-18.yang" <CODE BEGINS> file "ietf-restconf-client@2019-11-02.yang"
module ietf-restconf-client { module ietf-restconf-client {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-client"; namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-client";
prefix rcc; prefix rcc;
import ietf-yang-types { import ietf-yang-types {
prefix yang; prefix yang;
reference reference
"RFC 6991: Common YANG Data Types"; "RFC 6991: Common YANG Data Types";
skipping to change at page 10, line 38 skipping to change at page 10, line 38
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcXXXX); see the RFC
itself for full legal notices.; itself for full legal notices.;
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document
are to be interpreted as described in BCP 14 (RFC 2119) are to be interpreted as described in BCP 14 (RFC 2119)
(RFC 8174) when, and only when, they appear in all (RFC 8174) when, and only when, they appear in all
capitals, as shown here."; capitals, as shown here.";
revision 2019-10-18 { revision 2019-11-02 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: RESTCONF Client and Server Models"; "RFC XXXX: RESTCONF Client and Server Models";
} }
// Features // Features
feature https-initiate { feature https-initiate {
description description
skipping to change at page 22, line 8 skipping to change at page 22, line 8
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<protocol-version>HTTP/2.0</protocol-version> <protocol-version>HTTP/2.0</protocol-version>
</protocol-versions> </protocol-versions>
</http-server-parameters> </http-server-parameters>
<restconf-server-parameters> <restconf-server-parameters>
<client-identification> <client-identification>
<cert-maps> <cert-maps>
<cert-to-name> <cert-to-name>
<id>1</id> <id>1</id>
<fingerprint>11:0A:05:11:00</fingerprint> <fingerprint>11:0A:05:11:00</fingerprint>
<map-type>x509c2n:san-any</map-type> <map-type>x509c2n:specified</map-type>
<name>scooby-doo</name>
</cert-to-name> </cert-to-name>
<cert-to-name> <cert-to-name>
<id>2</id> <id>2</id>
<fingerprint>B3:4F:A1:8C:54</fingerprint> <map-type>x509c2n:san-any</map-type>
<map-type>x509c2n:specified</map-type>
<name>scooby-doo</name>
</cert-to-name> </cert-to-name>
</cert-maps> </cert-maps>
</client-identification> </client-identification>
</restconf-server-parameters> </restconf-server-parameters>
</https> </https>
</endpoint> </endpoint>
</listen> </listen>
<!-- call home to a RESTCONF client with two endpoints --> <!-- call home to a RESTCONF client with two endpoints -->
<call-home> <call-home>
skipping to change at page 23, line 20 skipping to change at page 23, line 20
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<protocol-version>HTTP/2.0</protocol-version> <protocol-version>HTTP/2.0</protocol-version>
</protocol-versions> </protocol-versions>
</http-server-parameters> </http-server-parameters>
<restconf-server-parameters> <restconf-server-parameters>
<client-identification> <client-identification>
<cert-maps> <cert-maps>
<cert-to-name> <cert-to-name>
<id>1</id> <id>1</id>
<fingerprint>11:0A:05:11:00</fingerprint> <fingerprint>11:0A:05:11:00</fingerprint>
<map-type>x509c2n:san-any</map-type> <map-type>x509c2n:specified</map-type>
<name>scooby-doo</name>
</cert-to-name> </cert-to-name>
<cert-to-name> <cert-to-name>
<id>2</id> <id>2</id>
<fingerprint>B3:4F:A1:8C:54</fingerprint> <map-type>x509c2n:san-any</map-type>
<map-type>x509c2n:specified</map-type>
<name>scooby-doo</name>
</cert-to-name> </cert-to-name>
</cert-maps> </cert-maps>
</client-identification> </client-identification>
</restconf-server-parameters> </restconf-server-parameters>
</https> </https>
</endpoint> </endpoint>
<endpoint> <endpoint>
<name>west-data-center</name> <name>west-data-center</name>
<https> <https>
<tcp-client-parameters> <tcp-client-parameters>
skipping to change at page 24, line 26 skipping to change at page 24, line 23
<protocol-version>HTTP/1.1</protocol-version> <protocol-version>HTTP/1.1</protocol-version>
<protocol-version>HTTP/2.0</protocol-version> <protocol-version>HTTP/2.0</protocol-version>
</protocol-versions> </protocol-versions>
</http-server-parameters> </http-server-parameters>
<restconf-server-parameters> <restconf-server-parameters>
<client-identification> <client-identification>
<cert-maps> <cert-maps>
<cert-to-name> <cert-to-name>
<id>1</id> <id>1</id>
<fingerprint>11:0A:05:11:00</fingerprint> <fingerprint>11:0A:05:11:00</fingerprint>
<map-type>x509c2n:san-any</map-type> <map-type>x509c2n:specified</map-type>
<name>scooby-doo</name>
</cert-to-name> </cert-to-name>
<cert-to-name> <cert-to-name>
<id>2</id> <id>2</id>
<fingerprint>B3:4F:A1:8C:54</fingerprint> <map-type>x509c2n:san-any</map-type>
<map-type>x509c2n:specified</map-type>
<name>scooby-doo</name>
</cert-to-name> </cert-to-name>
</cert-maps> </cert-maps>
</client-identification> </client-identification>
</restconf-server-parameters> </restconf-server-parameters>
</https> </https>
</endpoint> </endpoint>
</endpoints> </endpoints>
<connection-type> <connection-type>
<periodic> <periodic>
<idle-timeout>300</idle-timeout> <idle-timeout>300</idle-timeout>
skipping to change at page 25, line 12 skipping to change at page 25, line 12
</call-home> </call-home>
</restconf-server> </restconf-server>
3.3. YANG Module 3.3. YANG Module
This YANG module has normative references to [RFC6991], [RFC7407], This YANG module has normative references to [RFC6991], [RFC7407],
[RFC8040], [RFC8071], [I-D.kwatsen-netconf-tcp-client-server], [RFC8040], [RFC8071], [I-D.kwatsen-netconf-tcp-client-server],
[I-D.ietf-netconf-tls-client-server], and [I-D.ietf-netconf-tls-client-server], and
[I-D.kwatsen-netconf-http-client-server]. [I-D.kwatsen-netconf-http-client-server].
<CODE BEGINS> file "ietf-restconf-server@2019-10-18.yang" <CODE BEGINS> file "ietf-restconf-server@2019-11-02.yang"
module ietf-restconf-server { module ietf-restconf-server {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-server"; namespace "urn:ietf:params:xml:ns:yang:ietf-restconf-server";
prefix rcs; prefix rcs;
import ietf-yang-types { import ietf-yang-types {
prefix yang; prefix yang;
reference reference
"RFC 6991: Common YANG Data Types"; "RFC 6991: Common YANG Data Types";
skipping to change at page 26, line 49 skipping to change at page 26, line 49
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC (https://www.rfc-editor.org/info/rfcXXXX); see the RFC
itself for full legal notices.; itself for full legal notices.;
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document
are to be interpreted as described in BCP 14 (RFC 2119) are to be interpreted as described in BCP 14 (RFC 2119)
(RFC 8174) when, and only when, they appear in all (RFC 8174) when, and only when, they appear in all
capitals, as shown here."; capitals, as shown here.";
revision 2019-10-18 { revision 2019-11-02 {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXXX: RESTCONF Client and Server Models"; "RFC XXXX: RESTCONF Client and Server Models";
} }
// Features // Features
feature http-listen { feature http-listen {
description description
skipping to change at page 28, line 12 skipping to change at page 28, line 12
statement in a container called, e.g., statement in a container called, e.g.,
'restconf-server-parameters'. This model purposely does 'restconf-server-parameters'. This model purposely does
not do this itself so as to provide maximum flexibility not do this itself so as to provide maximum flexibility
to consuming models."; to consuming models.";
container client-identification { // FIXME: if-feature? container client-identification { // FIXME: if-feature?
description description
"Specifies a mapping through which clients MAY be identified "Specifies a mapping through which clients MAY be identified
(i.e., the RESTCONF username) from a supplied certificate. (i.e., the RESTCONF username) from a supplied certificate.
Note that a client MAY alternatively be identified via an Note that a client MAY alternatively be identified via an
HTTP-level authentication schema. This configuration does alternate authentication scheme (e.g., HTTP-level
not necessitate clients send a certificate (that can be authentication).";
controlled via the ietf-restconf-server module).";
container cert-maps { container cert-maps {
uses x509c2n:cert-to-name; uses x509c2n:cert-to-name {
refine "cert-to-name/fingerprint" {
mandatory false;
description
"A 'fingerprint' value does not need to be specified
when the 'cert-to-name' mapping is independent of
fingerprint matching. A 'cert-to-name' having no
fingerprint value will match any client certificate
and therefore should only be present at the end of
the user-ordered 'cert-to-name' list.";
}
}
description description
"The cert-maps container is used by TLS-based RESTCONF "The cert-maps container is used by TLS-based RESTCONF
servers (even if the TLS sessions are terminated servers (even if the TLS sessions are terminated
externally) to map the RESTCONF client's presented externally) to map the RESTCONF client's presented
X.509 certificate to a RESTCONF username. If no X.509 certificate to a RESTCONF username. If no
matching and valid cert-to-name list entry can be matching and valid cert-to-name list entry can be
found, then the RESTCONF server MUST close the found, then the RESTCONF server MUST close the
connection, and MUST NOT accept RESTCONF messages connection, and MUST NOT accept RESTCONF messages
over it."; over it.";
reference reference
skipping to change at page 30, line 36 skipping to change at page 30, line 46
"The RESTCONF server will listen on the IANA- "The RESTCONF server will listen on the IANA-
assigned well-known port value for 'https' assigned well-known port value for 'https'
(443) if no value is specified."; (443) if no value is specified.";
} }
} }
} }
container tls-server-parameters { container tls-server-parameters {
description description
"A wrapper around the TLS server parameters "A wrapper around the TLS server parameters
to avoid name collisions."; to avoid name collisions.";
uses tlss:tls-server-grouping; uses tlss:tls-server-grouping; /* {
FIXME: commented out since auth could also be external.
^-- need a better 'must' expression?
refine "client-authentication" {
must 'ca-certs or client-certs';
description
"NETCONF/TLS servers MUST validate client
certificates.";
}*/
} }
container http-server-parameters { container http-server-parameters {
description description
"A wrapper around the HTTP server parameters "A wrapper around the HTTP server parameters
to avoid name collisions."; to avoid name collisions.";
uses https:http-server-grouping; uses https:http-server-grouping;
} }
container restconf-server-parameters { container restconf-server-parameters {
description description
"A wrapper around the RESTCONF server parameters "A wrapper around the RESTCONF server parameters
skipping to change at page 31, line 43 skipping to change at page 32, line 12
connect to the IANA-assigned well-known connect to the IANA-assigned well-known
port for 'restconf-ch-tls' (4336) if no port for 'restconf-ch-tls' (4336) if no
value is specified."; value is specified.";
} }
} }
} }
container tls-server-parameters { container tls-server-parameters {
description description
"A wrapper around the TLS server parameters "A wrapper around the TLS server parameters
to avoid name collisions."; to avoid name collisions.";
uses tlss:tls-server-grouping; uses tlss:tls-server-grouping; /* {
FIXME: commented out since auth could also be external.
^-- need a better 'must' expression?
refine "client-authentication" {
must 'ca-certs or client-certs';
description
"NETCONF/TLS servers MUST validate client
certificates.";
}*/
} }
container http-server-parameters { container http-server-parameters {
description description
"A wrapper around the HTTP server parameters "A wrapper around the HTTP server parameters
to avoid name collisions."; to avoid name collisions.";
uses https:http-server-grouping; uses https:http-server-grouping;
} }
container restconf-server-parameters { container restconf-server-parameters {
description description
"A wrapper around the RESTCONF server parameters "A wrapper around the RESTCONF server parameters
skipping to change at page 38, line 27 skipping to change at page 38, line 51
namespace: urn:ietf:params:xml:ns:yang:ietf-restconf-server namespace: urn:ietf:params:xml:ns:yang:ietf-restconf-server
prefix: ncs prefix: ncs
reference: RFC XXXX reference: RFC XXXX
6. References 6. References
6.1. Normative References 6.1. Normative References
[I-D.ietf-netconf-keystore] [I-D.ietf-netconf-keystore]
Watsen, K., "A YANG Data Model for a Keystore", draft- Watsen, K., "A YANG Data Model for a Keystore", draft-
ietf-netconf-keystore-12 (work in progress), July 2019. ietf-netconf-keystore-13 (work in progress), October 2019.
[I-D.ietf-netconf-tls-client-server] [I-D.ietf-netconf-tls-client-server]
Watsen, K., Wu, G., and L. Xia, "YANG Groupings for TLS Watsen, K., Wu, G., and L. Xia, "YANG Groupings for TLS
Clients and TLS Servers", draft-ietf-netconf-tls-client- Clients and TLS Servers", draft-ietf-netconf-tls-client-
server-14 (work in progress), July 2019. server-15 (work in progress), October 2019.
[I-D.kwatsen-netconf-http-client-server] [I-D.kwatsen-netconf-http-client-server]
Watsen, K., "YANG Groupings for HTTP Clients and HTTP Watsen, K., "YANG Groupings for HTTP Clients and HTTP
Servers", draft-kwatsen-netconf-http-client-server-03 Servers", draft-kwatsen-netconf-http-client-server-04
(work in progress), June 2019. (work in progress), October 2019.
[I-D.kwatsen-netconf-tcp-client-server] [I-D.kwatsen-netconf-tcp-client-server]
Watsen, K. and M. Scharf, "YANG Groupings for TCP Clients Watsen, K. and M. Scharf, "YANG Groupings for TCP Clients
and TCP Servers", draft-kwatsen-netconf-tcp-client- and TCP Servers", draft-kwatsen-netconf-tcp-client-
server-02 (work in progress), April 2019. server-02 (work in progress), April 2019.
[RFC2119] Bradner, S., "Key words for use in RFCs to Indicate [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate
Requirement Levels", BCP 14, RFC 2119, Requirement Levels", BCP 14, RFC 2119,
DOI 10.17487/RFC2119, March 1997, DOI 10.17487/RFC2119, March 1997,
<https://www.rfc-editor.org/info/rfc2119>. <https://www.rfc-editor.org/info/rfc2119>.
skipping to change at page 39, line 33 skipping to change at page 40, line 9
<https://www.rfc-editor.org/info/rfc8071>. <https://www.rfc-editor.org/info/rfc8071>.
[RFC8174] Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC [RFC8174] Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC
2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174,
May 2017, <https://www.rfc-editor.org/info/rfc8174>. May 2017, <https://www.rfc-editor.org/info/rfc8174>.
6.2. Informative References 6.2. Informative References
[I-D.ietf-netconf-trust-anchors] [I-D.ietf-netconf-trust-anchors]
Watsen, K., "A YANG Data Model for a Truststore", draft- Watsen, K., "A YANG Data Model for a Truststore", draft-
ietf-netconf-trust-anchors-05 (work in progress), June ietf-netconf-trust-anchors-06 (work in progress), October
2019. 2019.
[RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688, [RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688,
DOI 10.17487/RFC3688, January 2004, DOI 10.17487/RFC3688, January 2004,
<https://www.rfc-editor.org/info/rfc3688>. <https://www.rfc-editor.org/info/rfc3688>.
[RFC6241] Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed., [RFC6241] Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed.,
and A. Bierman, Ed., "Network Configuration Protocol and A. Bierman, Ed., "Network Configuration Protocol
(NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011, (NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011,
<https://www.rfc-editor.org/info/rfc6241>. <https://www.rfc-editor.org/info/rfc6241>.
skipping to change at page 41, line 51 skipping to change at page 41, line 51
| | | +--rw max-probes uint16 | | | +--rw max-probes uint16
| | | +--rw probe-interval uint16 | | | +--rw probe-interval uint16
| | +--rw tls-client-parameters | | +--rw tls-client-parameters
| | | +--rw client-identity | | | +--rw client-identity
| | | | +--rw (local-or-keystore) | | | | +--rw (local-or-keystore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-suppo\ | | | | | {local-definitions-suppo\
\rted}? \rted}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw algorithm | | | | | +--rw algorithm
| | | | | | asymmetric-key-algo\ | | | | | | iasa:asymmetric-alg\
\rithm-t \orithm-type
| | | | | +--rw public-key-format? | | | | | +--rw public-key-format?
| | | | | | identityref | | | | | | identityref
| | | | | +--rw public-key | | | | | +--rw public-key
| | | | | | binary | | | | | | binary
| | | | | +--rw private-key-format? | | | | | +--rw private-key-format?
| | | | | | identityref | | | | | | identityref
| | | | | +--rw (private-key-type) | | | | | +--rw (private-key-type)
| | | | | | +--:(private-key) | | | | | | +--:(private-key)
| | | | | | | +--rw private-key? | | | | | | | +--rw private-key?
| | | | | | | binary | | | | | | | binary
skipping to change at page 43, line 17 skipping to change at page 43, line 17
| | | | +--:(keystore) | | | | +--:(keystore)
| | | | {keystore-supported}? | | | | {keystore-supported}?
| | | | +--rw keystore-reference | | | | +--rw keystore-reference
| | | | +--rw asymmetric-key? | | | | +--rw asymmetric-key?
| | | | | ks:asymmetric-key-r\ | | | | | ks:asymmetric-key-r\
\ef \ef
| | | | +--rw certificate? lea\ | | | | +--rw certificate? lea\
\fref \fref
| | | +--rw server-authentication | | | +--rw server-authentication
| | | | +--rw ca-certs! | | | | +--rw ca-certs!
| | | | | {ts:x509-certificates}?
| | | | | +--rw (local-or-truststore) | | | | | +--rw (local-or-truststore)
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-definitions-su\ | | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | | +--rw cert* | | | | | | +--rw cert*
| | | | | | | trust-anchor-cer\ | | | | | | | trust-anchor-cer\
\t-cms \t-cms
| | | | | | +---n certificate-expira\ | | | | | | +---n certificate-expira\
\tion \tion
| | | | | | +-- expiration-date | | | | | | +-- expiration-date
| | | | | | yang:date-and\ | | | | | | yang:date-and\
\-time \-time
| | | | | +--:(truststore) | | | | | +--:(truststore)
| | | | | {truststore-supported\ | | | | | {truststore-supported\
\,x509-certificates}? \,x509-certificates}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:certificates-ref | | | | | ts:certificates-ref
| | | | +--rw server-certs! | | | | +--rw server-certs!
| | | | {ts:x509-certificates}?
| | | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-su\ | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw cert* | | | | | +--rw cert*
| | | | | | trust-anchor-cer\ | | | | | | trust-anchor-cer\
\t-cms \t-cms
| | | | | +---n certificate-expira\ | | | | | +---n certificate-expira\
\tion \tion
skipping to change at page 44, line 20 skipping to change at page 44, line 17
\}? \}?
| | | | +--rw tls-versions | | | | +--rw tls-versions
| | | | | +--rw tls-version* identityref | | | | | +--rw tls-version* identityref
| | | | +--rw cipher-suites | | | | +--rw cipher-suites
| | | | +--rw cipher-suite* identityref | | | | +--rw cipher-suite* identityref
| | | +--rw keepalives! | | | +--rw keepalives!
| | | {tls-client-keepalives}? | | | {tls-client-keepalives}?
| | | +--rw max-wait? uint16 | | | +--rw max-wait? uint16
| | | +--rw max-attempts? uint8 | | | +--rw max-attempts? uint8
| | +--rw http-client-parameters | | +--rw http-client-parameters
| | | +--rw protocol-version? enumeration
| | | +--rw client-identity | | | +--rw client-identity
| | | | +--rw (auth-type) | | | | +--rw (auth-type)
| | | | +--:(basic) | | | | +--:(basic)
| | | | +--rw basic {basic-auth}? | | | | +--rw basic {basic-auth}?
| | | | +--rw user-id string | | | | +--rw user-id string
| | | | +--rw password string | | | | +--rw password string
| | | +--rw proxy-server! {proxy-connect}? | | | +--rw proxy-server! {proxy-connect}?
| | | +--rw tcp-client-parameters | | | +--rw tcp-client-parameters
| | | | +--rw remote-address inet:host | | | | +--rw remote-address inet:host
| | | | +--rw remote-port? | | | | +--rw remote-port?
skipping to change at page 44, line 51 skipping to change at page 44, line 47
| | | | +--rw max-probes uint16 | | | | +--rw max-probes uint16
| | | | +--rw probe-interval uint16 | | | | +--rw probe-interval uint16
| | | +--rw tls-client-parameters | | | +--rw tls-client-parameters
| | | | +--rw client-identity | | | | +--rw client-identity
| | | | | +--rw (local-or-keystore) | | | | | +--rw (local-or-keystore)
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-definitions\ | | | | | | {local-definitions\
\-supported}? \-supported}?
| | | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | | +--rw algorithm | | | | | | +--rw algorithm
| | | | | | | asymmetric-ke\ | | | | | | | iasa:asymmetr\
\y-algorithm-t \ic-algorithm-type
| | | | | | +--rw public-key-form\ | | | | | | +--rw public-key-form\
\at? \at?
| | | | | | | identityref | | | | | | | identityref
| | | | | | +--rw public-key | | | | | | +--rw public-key
| | | | | | | binary | | | | | | | binary
| | | | | | +--rw private-key-for\ | | | | | | +--rw private-key-for\
\mat? \mat?
| | | | | | | identityref | | | | | | | identityref
| | | | | | +--rw (private-key-ty\ | | | | | | +--rw (private-key-ty\
\pe) \pe)
skipping to change at page 46, line 27 skipping to change at page 46, line 24
| | | | | {keystore-supporte\ | | | | | {keystore-supporte\
\d}? \d}?
| | | | | +--rw keystore-reference | | | | | +--rw keystore-reference
| | | | | +--rw asymmetric-key? | | | | | +--rw asymmetric-key?
| | | | | | ks:asymmetric\ | | | | | | ks:asymmetric\
\-key-ref \-key-ref
| | | | | +--rw certificate? \ | | | | | +--rw certificate? \
\ leafref \ leafref
| | | | +--rw server-authentication | | | | +--rw server-authentication
| | | | | +--rw ca-certs! | | | | | +--rw ca-certs!
| | | | | | {ts:x509-certificates}?
| | | | | | +--rw (local-or-truststore) | | | | | | +--rw (local-or-truststore)
| | | | | | +--:(local) | | | | | | +--:(local)
| | | | | | | {local-definiti\ | | | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | | | +--rw local-definition | | | | | | | +--rw local-definition
| | | | | | | +--rw cert* | | | | | | | +--rw cert*
| | | | | | | | trust-anch\ | | | | | | | | trust-anch\
\or-cert-cms \or-cert-cms
| | | | | | | +---n certificate-\ | | | | | | | +---n certificate-\
\expiration \expiration
skipping to change at page 46, line 50 skipping to change at page 46, line 46
| | | | | | | yang:da\ | | | | | | | yang:da\
\te-and-time \te-and-time
| | | | | | +--:(truststore) | | | | | | +--:(truststore)
| | | | | | {truststore-sup\ | | | | | | {truststore-sup\
\ported,x509-certificates}? \ported,x509-certificates}?
| | | | | | +--rw truststore-refe\ | | | | | | +--rw truststore-refe\
\rence? \rence?
| | | | | | ts:certificat\ | | | | | | ts:certificat\
\es-ref \es-ref
| | | | | +--rw server-certs! | | | | | +--rw server-certs!
| | | | | {ts:x509-certificates}?
| | | | | +--rw (local-or-truststore) | | | | | +--rw (local-or-truststore)
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-definiti\ | | | | | | {local-definiti\
\ons-supported}? \ons-supported}?
| | | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | | +--rw cert* | | | | | | +--rw cert*
| | | | | | | trust-anch\ | | | | | | | trust-anch\
\or-cert-cms \or-cert-cms
| | | | | | +---n certificate-\ | | | | | | +---n certificate-\
\expiration \expiration
skipping to change at page 48, line 31 skipping to change at page 48, line 26
| +--rw idle-time uint16 | +--rw idle-time uint16
| +--rw max-probes uint16 | +--rw max-probes uint16
| +--rw probe-interval uint16 | +--rw probe-interval uint16
+--rw tls-client-parameters +--rw tls-client-parameters
| +--rw client-identity | +--rw client-identity
| | +--rw (local-or-keystore) | | +--rw (local-or-keystore)
| | +--:(local) | | +--:(local)
| | | {local-definitions-supported}? | | | {local-definitions-supported}?
| | | +--rw local-definition | | | +--rw local-definition
| | | +--rw algorithm | | | +--rw algorithm
| | | | asymmetric-key-algorithm-t | | | | iasa:asymmetric-algorithm\
\-type
| | | +--rw public-key-format? | | | +--rw public-key-format?
| | | | identityref | | | | identityref
| | | +--rw public-key | | | +--rw public-key
| | | | binary | | | | binary
| | | +--rw private-key-format? | | | +--rw private-key-format?
| | | | identityref | | | | identityref
| | | +--rw (private-key-type) | | | +--rw (private-key-type)
| | | | +--:(private-key) | | | | +--:(private-key)
| | | | | +--rw private-key? | | | | | +--rw private-key?
| | | | | binary | | | | | binary
skipping to change at page 49, line 34 skipping to change at page 49, line 30
| | | +--ro output | | | +--ro output
| | | +--ro certificate-signing-r\ | | | +--ro certificate-signing-r\
\equest \equest
| | | binary | | | binary
| | +--:(keystore) {keystore-supported}? | | +--:(keystore) {keystore-supported}?
| | +--rw keystore-reference | | +--rw keystore-reference
| | +--rw asymmetric-key? | | +--rw asymmetric-key?
| | | ks:asymmetric-key-ref | | | ks:asymmetric-key-ref
| | +--rw certificate? leafref | | +--rw certificate? leafref
| +--rw server-authentication | +--rw server-authentication
| | +--rw ca-certs! {ts:x509-certificates}? | | +--rw ca-certs!
| | | +--rw (local-or-truststore) | | | +--rw (local-or-truststore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-supporte\ | | | | {local-definitions-supporte\
\d}? \d}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw cert* | | | | +--rw cert*
| | | | | trust-anchor-cert-cms | | | | | trust-anchor-cert-cms
| | | | +---n certificate-expiration | | | | +---n certificate-expiration
| | | | +-- expiration-date | | | | +-- expiration-date
| | | | yang:date-and-time | | | | yang:date-and-time
| | | +--:(truststore) | | | +--:(truststore)
| | | {truststore-supported,x509-\ | | | {truststore-supported,x509-\
\certificates}? \certificates}?
| | | +--rw truststore-reference? | | | +--rw truststore-reference?
| | | ts:certificates-ref | | | ts:certificates-ref
| | +--rw server-certs! {ts:x509-certificates}? | | +--rw server-certs!
| | +--rw (local-or-truststore) | | +--rw (local-or-truststore)
| | +--:(local) | | +--:(local)
| | | {local-definitions-supporte\ | | | {local-definitions-supporte\
\d}? \d}?
| | | +--rw local-definition | | | +--rw local-definition
| | | +--rw cert* | | | +--rw cert*
| | | | trust-anchor-cert-cms | | | | trust-anchor-cert-cms
| | | +---n certificate-expiration | | | +---n certificate-expiration
| | | +-- expiration-date | | | +-- expiration-date
| | | yang:date-and-time | | | yang:date-and-time
skipping to change at page 50, line 28 skipping to change at page 50, line 24
| +--rw hello-params | +--rw hello-params
| | {tls-client-hello-params-config}? | | {tls-client-hello-params-config}?
| | +--rw tls-versions | | +--rw tls-versions
| | | +--rw tls-version* identityref | | | +--rw tls-version* identityref
| | +--rw cipher-suites | | +--rw cipher-suites
| | +--rw cipher-suite* identityref | | +--rw cipher-suite* identityref
| +--rw keepalives! {tls-client-keepalives}? | +--rw keepalives! {tls-client-keepalives}?
| +--rw max-wait? uint16 | +--rw max-wait? uint16
| +--rw max-attempts? uint8 | +--rw max-attempts? uint8
+--rw http-client-parameters +--rw http-client-parameters
| +--rw protocol-version? enumeration
| +--rw client-identity | +--rw client-identity
| | +--rw (auth-type) | | +--rw (auth-type)
| | +--:(basic) | | +--:(basic)
| | +--rw basic {basic-auth}? | | +--rw basic {basic-auth}?
| | +--rw user-id string | | +--rw user-id string
| | +--rw password string | | +--rw password string
| +--rw proxy-server! {proxy-connect}? | +--rw proxy-server! {proxy-connect}?
| +--rw tcp-client-parameters | +--rw tcp-client-parameters
| | +--rw remote-address inet:host | | +--rw remote-address inet:host
| | +--rw remote-port? inet:port-number | | +--rw remote-port? inet:port-number
skipping to change at page 51, line 8 skipping to change at page 50, line 51
| | +--rw max-probes uint16 | | +--rw max-probes uint16
| | +--rw probe-interval uint16 | | +--rw probe-interval uint16
| +--rw tls-client-parameters | +--rw tls-client-parameters
| | +--rw client-identity | | +--rw client-identity
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-suppo\ | | | | {local-definitions-suppo\
\rted}? \rted}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | asymmetric-key-algo\ | | | | | iasa:asymmetric-alg\
\rithm-t
\orithm-type
| | | | +--rw public-key-format? | | | | +--rw public-key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw public-key | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--rw private-key-format? | | | | +--rw private-key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw (private-key-type) | | | | +--rw (private-key-type)
| | | | | +--:(private-key) | | | | | +--:(private-key)
| | | | | | +--rw private-key? | | | | | | +--rw private-key?
| | | | | | binary | | | | | | binary
skipping to change at page 52, line 22 skipping to change at page 52, line 17
| | | +--:(keystore) | | | +--:(keystore)
| | | {keystore-supported}? | | | {keystore-supported}?
| | | +--rw keystore-reference | | | +--rw keystore-reference
| | | +--rw asymmetric-key? | | | +--rw asymmetric-key?
| | | | ks:asymmetric-key-r\ | | | | ks:asymmetric-key-r\
\ef \ef
| | | +--rw certificate? lea\ | | | +--rw certificate? lea\
\fref \fref
| | +--rw server-authentication | | +--rw server-authentication
| | | +--rw ca-certs! | | | +--rw ca-certs!
| | | | {ts:x509-certificates}?
| | | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-su\ | | | | | {local-definitions-su\
\pported}? \pported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw cert* | | | | | +--rw cert*
| | | | | | trust-anchor-cer\ | | | | | | trust-anchor-cer\
\t-cms \t-cms
| | | | | +---n certificate-expira\ | | | | | +---n certificate-expira\
\tion \tion
| | | | | +-- expiration-date | | | | | +-- expiration-date
| | | | | yang:date-and\ | | | | | yang:date-and\
\-time \-time
| | | | +--:(truststore) | | | | +--:(truststore)
| | | | {truststore-supported\ | | | | {truststore-supported\
\,x509-certificates}? \,x509-certificates}?
| | | | +--rw truststore-reference? | | | | +--rw truststore-reference?
| | | | ts:certificates-ref | | | | ts:certificates-ref
| | | +--rw server-certs! | | | +--rw server-certs!
| | | {ts:x509-certificates}?
| | | +--rw (local-or-truststore) | | | +--rw (local-or-truststore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-su\ | | | | {local-definitions-su\
\pported}? \pported}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw cert* | | | | +--rw cert*
| | | | | trust-anchor-cer\ | | | | | trust-anchor-cer\
\t-cms \t-cms
| | | | +---n certificate-expira\ | | | | +---n certificate-expira\
\tion \tion
| | | | +-- expiration-date | | | | +-- expiration-date
| | | | yang:date-and\ | | | | yang:date-and\
\-time \-time
| | | +--:(truststore) | | | +--:(truststore)
| | | {truststore-supported\ | | | {truststore-supported\
\,x509-certificates}? \,x509-certificates}?
| | | +--rw truststore-reference? | | | +--rw truststore-reference?
| | | ts:certificates-ref | | | ts:certificates-ref
| | +--rw hello-params | | +--rw hello-params
skipping to change at page 54, line 51 skipping to change at page 54, line 44
| | | +--:(external) | | | +--:(external)
| | | {external-client-auth-supporte\ | | | {external-client-auth-supporte\
d}? d}?
| | | +--rw client-auth-defined-elsewhere? | | | +--rw client-auth-defined-elsewhere?
| | | empty | | | empty
| | +--rw restconf-server-parameters | | +--rw restconf-server-parameters
| | +--rw client-identification | | +--rw client-identification
| | +--rw cert-maps | | +--rw cert-maps
| | +--rw cert-to-name* [id] | | +--rw cert-to-name* [id]
| | +--rw id uint32 | | +--rw id uint32
| | +--rw fingerprint | | +--rw fingerprint?
| | | x509c2n:tls-fingerprint | | | x509c2n:tls-fingerprint
| | +--rw map-type identityref | | +--rw map-type identityref
| | +--rw name string | | +--rw name string
| +--:(https) {https-listen}? | +--:(https) {https-listen}?
| +--rw https | +--rw https
| +--rw tcp-server-parameters | +--rw tcp-server-parameters
| | +--rw local-address inet:ip-address | | +--rw local-address inet:ip-address
| | +--rw local-port? inet:port-number | | +--rw local-port? inet:port-number
| | +--rw keepalives! {keepalives-supported}? | | +--rw keepalives! {keepalives-supported}?
| | +--rw idle-time uint16 | | +--rw idle-time uint16
| | +--rw max-probes uint16 | | +--rw max-probes uint16
| | +--rw probe-interval uint16 | | +--rw probe-interval uint16
| +--rw tls-server-parameters | +--rw tls-server-parameters
| | +--rw server-identity | | +--rw server-identity
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-supported}? | | | | {local-definitions-supported}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | asymmetric-key-algorithm-t | | | | | iasa:asymmetric-algorithm\
-type
| | | | +--rw public-key-format? | | | | +--rw public-key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw public-key | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--rw private-key-format? | | | | +--rw private-key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw (private-key-type) | | | | +--rw (private-key-type)
| | | | | +--:(private-key) | | | | | +--:(private-key)
| | | | | | +--rw private-key? | | | | | | +--rw private-key?
| | | | | | binary | | | | | | binary
skipping to change at page 56, line 37 skipping to change at page 56, line 31
| | | | +--:(required) | | | | +--:(required)
| | | | | +--rw required? | | | | | +--rw required?
| | | | | empty | | | | | empty
| | | | +--:(optional) | | | | +--:(optional)
| | | | +--rw optional? | | | | +--rw optional?
| | | | empty | | | | empty
| | | +--rw (local-or-external) | | | +--rw (local-or-external)
| | | +--:(local) | | | +--:(local)
| | | | {local-client-auth-supported}? | | | | {local-client-auth-supported}?
| | | | +--rw ca-certs! | | | | +--rw ca-certs!
| | | | | {ts:x509-certificates}?
| | | | | +--rw (local-or-truststore) | | | | | +--rw (local-or-truststore)
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-definitions-su\ | | | | | | {local-definitions-su\
pported}? pported}?
| | | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | | +--rw cert* | | | | | | +--rw cert*
| | | | | | | trust-anchor-cer\ | | | | | | | trust-anchor-cer\
t-cms t-cms
| | | | | | +---n certificate-expira\ | | | | | | +---n certificate-expira\
tion tion
| | | | | | +-- expiration-date | | | | | | +-- expiration-date
| | | | | | yang:date-and\ | | | | | | yang:date-and\
-time -time
| | | | | +--:(truststore) | | | | | +--:(truststore)
| | | | | {truststore-supported\ | | | | | {truststore-supported\
,x509-certificates}? ,x509-certificates}?
| | | | | +--rw truststore-reference? | | | | | +--rw truststore-reference?
| | | | | ts:certificates-ref | | | | | ts:certificates-ref
| | | | +--rw client-certs! | | | | +--rw client-certs!
| | | | {ts:x509-certificates}?
| | | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definitions-su\ | | | | | {local-definitions-su\
pported}? pported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw cert* | | | | | +--rw cert*
| | | | | | trust-anchor-cer\ | | | | | | trust-anchor-cer\
t-cms t-cms
| | | | | +---n certificate-expira\ | | | | | +---n certificate-expira\
tion tion
skipping to change at page 58, line 30 skipping to change at page 58, line 22
| | +--:(external) | | +--:(external)
| | {external-client-auth-supporte\ | | {external-client-auth-supporte\
d}? d}?
| | +--rw client-auth-defined-elsewhere? | | +--rw client-auth-defined-elsewhere?
| | empty | | empty
| +--rw restconf-server-parameters | +--rw restconf-server-parameters
| +--rw client-identification | +--rw client-identification
| +--rw cert-maps | +--rw cert-maps
| +--rw cert-to-name* [id] | +--rw cert-to-name* [id]
| +--rw id uint32 | +--rw id uint32
| +--rw fingerprint | +--rw fingerprint?
| | x509c2n:tls-fingerprint | | x509c2n:tls-fingerprint
| +--rw map-type identityref | +--rw map-type identityref
| +--rw name string | +--rw name string
+--rw call-home! {https-call-home}? +--rw call-home! {https-call-home}?
+--rw restconf-client* [name] +--rw restconf-client* [name]
+--rw name string +--rw name string
+--rw endpoints +--rw endpoints
| +--rw endpoint* [name] | +--rw endpoint* [name]
| +--rw name string | +--rw name string
| +--rw (transport) | +--rw (transport)
skipping to change at page 59, line 12 skipping to change at page 59, line 4
| | +--rw keepalives! | | +--rw keepalives!
| | {keepalives-supported}? | | {keepalives-supported}?
| | +--rw idle-time uint16 | | +--rw idle-time uint16
| | +--rw max-probes uint16 | | +--rw max-probes uint16
| | +--rw probe-interval uint16 | | +--rw probe-interval uint16
| +--rw tls-server-parameters | +--rw tls-server-parameters
| | +--rw server-identity | | +--rw server-identity
| | | +--rw (local-or-keystore) | | | +--rw (local-or-keystore)
| | | +--:(local) | | | +--:(local)
| | | | {local-definitions-suppo\ | | | | {local-definitions-suppo\
rted}? rted}?
| | | | +--rw local-definition | | | | +--rw local-definition
| | | | +--rw algorithm | | | | +--rw algorithm
| | | | | asymmetric-key-algo\ | | | | | iasa:asymmetric-alg\
rithm-t orithm-type
| | | | +--rw public-key-format? | | | | +--rw public-key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw public-key | | | | +--rw public-key
| | | | | binary | | | | | binary
| | | | +--rw private-key-format? | | | | +--rw private-key-format?
| | | | | identityref | | | | | identityref
| | | | +--rw (private-key-type) | | | | +--rw (private-key-type)
| | | | | +--:(private-key) | | | | | +--:(private-key)
| | | | | | +--rw private-key? | | | | | | +--rw private-key?
| | | | | | binary | | | | | | binary
skipping to change at page 60, line 40 skipping to change at page 60, line 32
| | | | | +--rw required? | | | | | +--rw required?
| | | | | empty | | | | | empty
| | | | +--:(optional) | | | | +--:(optional)
| | | | +--rw optional? | | | | +--rw optional?
| | | | empty | | | | empty
| | | +--rw (local-or-external) | | | +--rw (local-or-external)
| | | +--:(local) | | | +--:(local)
| | | | {local-client-auth-suppo\ | | | | {local-client-auth-suppo\
rted}? rted}?
| | | | +--rw ca-certs! | | | | +--rw ca-certs!
| | | | | {ts:x509-certificates}?
| | | | | +--rw (local-or-truststore) | | | | | +--rw (local-or-truststore)
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-definiti\ | | | | | | {local-definiti\
ons-supported}? ons-supported}?
| | | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | | +--rw cert* | | | | | | +--rw cert*
| | | | | | | trust-anch\ | | | | | | | trust-anch\
or-cert-cms or-cert-cms
| | | | | | +---n certificate-\ | | | | | | +---n certificate-\
expiration expiration
skipping to change at page 61, line 4 skipping to change at page 60, line 43
| | | | | +--:(local) | | | | | +--:(local)
| | | | | | {local-definiti\ | | | | | | {local-definiti\
ons-supported}? ons-supported}?
| | | | | | +--rw local-definition | | | | | | +--rw local-definition
| | | | | | +--rw cert* | | | | | | +--rw cert*
| | | | | | | trust-anch\ | | | | | | | trust-anch\
or-cert-cms or-cert-cms
| | | | | | +---n certificate-\ | | | | | | +---n certificate-\
expiration expiration
| | | | | | +-- expiration-\ | | | | | | +-- expiration-\
date date
| | | | | | yang:da\ | | | | | | yang:da\
te-and-time te-and-time
| | | | | +--:(truststore) | | | | | +--:(truststore)
| | | | | {truststore-sup\ | | | | | {truststore-sup\
ported,x509-certificates}? ported,x509-certificates}?
| | | | | +--rw truststore-refe\ | | | | | +--rw truststore-refe\
rence? rence?
| | | | | ts:certificat\ | | | | | ts:certificat\
es-ref es-ref
| | | | +--rw client-certs! | | | | +--rw client-certs!
| | | | {ts:x509-certificates}?
| | | | +--rw (local-or-truststore) | | | | +--rw (local-or-truststore)
| | | | +--:(local) | | | | +--:(local)
| | | | | {local-definiti\ | | | | | {local-definiti\
ons-supported}? ons-supported}?
| | | | | +--rw local-definition | | | | | +--rw local-definition
| | | | | +--rw cert* | | | | | +--rw cert*
| | | | | | trust-anch\ | | | | | | trust-anch\
or-cert-cms or-cert-cms
| | | | | +---n certificate-\ | | | | | +---n certificate-\
expiration expiration
skipping to change at page 62, line 47 skipping to change at page 62, line 37
| | {external-client-auth-su\ | | {external-client-auth-su\
pported}? pported}?
| | +--rw client-auth-defined-else\ | | +--rw client-auth-defined-else\
where? where?
| | empty | | empty
| +--rw restconf-server-parameters | +--rw restconf-server-parameters
| +--rw client-identification | +--rw client-identification
| +--rw cert-maps | +--rw cert-maps
| +--rw cert-to-name* [id] | +--rw cert-to-name* [id]
| +--rw id uint32 | +--rw id uint32
| +--rw fingerprint | +--rw fingerprint?
| | x509c2n:tls-fingerprint | | x509c2n:tls-fingerprint
| +--rw map-type | +--rw map-type
| | identityref | | identityref
| +--rw name string | +--rw name string
+--rw connection-type +--rw connection-type
| +--rw (connection-type) | +--rw (connection-type)
| +--:(persistent-connection) | +--:(persistent-connection)
| | +--rw persistent! | | +--rw persistent!
| +--:(periodic-connection) | +--:(periodic-connection)
| +--rw periodic! | +--rw periodic!
skipping to change at page 66, line 40 skipping to change at page 66, line 32
o Added missing "or https-listen" clause in a "must" expression. o Added missing "or https-listen" clause in a "must" expression.
o Refactored the client module similar to how the server module was o Refactored the client module similar to how the server module was
refactored in -13. Now the 'restconf-client-grouping' is just the refactored in -13. Now the 'restconf-client-grouping' is just the
RC-specific bits, the 'restconf-client-[initiate|listen]-stack- RC-specific bits, the 'restconf-client-[initiate|listen]-stack-
grouping' is the protocol stack for a single connection, and grouping' is the protocol stack for a single connection, and
'restconf-client-app-grouping' is effectively what was before 'restconf-client-app-grouping' is effectively what was before
(both listen+callhome for many inbound/outbound endpoints). (both listen+callhome for many inbound/outbound endpoints).
B.16. 15 to 16
o Added refinement to make "cert-to-name/fingerprint" be mandatory
false.
o Commented out refinement to "tls-server-grouping/client-
authentication" until a better "must" expression is defined.
o Updated restconf-client example to reflect that http-client-
grouping no longer has a "protocol-version" leaf.
Acknowledgements Acknowledgements
The authors would like to thank for following for lively discussions The authors would like to thank for following for lively discussions
on list and in the halls (ordered by first name): Alan Luchuk, Andy on list and in the halls (ordered by first name): Alan Luchuk, Andy
Bierman, Balazs Kovacs, Benoit Claise, Bert Wijnen David Lamparter, Bierman, Balazs Kovacs, Benoit Claise, Bert Wijnen David Lamparter,
Juergen Schoenwaelder, Ladislav Lhotka, Martin Bjorklund, Mehmet Juergen Schoenwaelder, Ladislav Lhotka, Martin Bjorklund, Mehmet
Ersue, Phil Shafer, Radek Krejci, Ramkumar Dhanapal, Sean Turner, and Ersue, Phil Shafer, Radek Krejci, Ramkumar Dhanapal, Sean Turner, and
Tom Petch. Tom Petch.
Author's Address Author's Address
 End of changes. 60 change blocks. 
71 lines changed or deleted 94 lines changed or added

This html diff was produced by rfcdiff 1.47. The latest version is available from http://tools.ietf.org/tools/rfcdiff/