From 1bab52d3152ad9f578cdc23b53242892cc695001 Mon Sep 17 00:00:00 2001 From: AaronK Date: Tue, 27 Apr 2021 12:08:10 +0200 Subject: [PATCH 1/9] Update README.md trivial addition --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 1b086e2..da0dfeb 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,7 @@ Users and Use-cases * [CIRCL](https://www.circl.lu/services/passive-dns/) * [D4 Project Passive DNS](https://www.d4-project.org/2019/05/28/passive-dns-tutorial.html) * [balboa](https://github.com/DCSO/balboa) - * 360CN? - * ... + * ... add yours please. Create a pull request to this file please. From 6e41fa0f34b6fcd94af2295feb8b92e681963940 Mon Sep 17 00:00:00 2001 From: AaronK Date: Tue, 27 Apr 2021 12:22:59 +0200 Subject: [PATCH 2/9] Update pdns-qof.xml be a bit more specific on what JSON data type rrname field is. --- i-d/pdns-qof.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i-d/pdns-qof.xml b/i-d/pdns-qof.xml index 3c20fb3..d4e47f7 100644 --- a/i-d/pdns-qof.xml +++ b/i-d/pdns-qof.xml @@ -203,7 +203,7 @@ ws = *( Implementation MUST support all the mandatory fields. Uniqueness property: the tuple (rrname,rrtype,rdata) will always be unique within one answer per server. While rrname and rrtype are always individual JSON primitive types (strings, numbers, booleans or null), rdata MAY return multiple resource records or a single record. When multiple resource records are returned, rdata MUST be a JSON array. In the case of a single resource record is returned, rdata MUST be a JSON string or a JSON array containing one JSON string. Senders SHOULD send an array for rdata, but receivers MUST be able to accept a single-string result for rdata.
- This field returns the name of the queried resource. + This field returns the name of the queried resource. JSON string.
This field returns the resource record type as seen by the passive DNS. The key is rrtype and the value is in the interpreted record type represented as a JSON string. If the value cannot be interpreted, the decimal value is returned following the principle of transparency as described in RFC 3597. Then the decimal value is represented as a JSON number. From 2ab5a65790d398a2825c5dd70477e9670c7566be Mon Sep 17 00:00:00 2001 From: AaronK Date: Tue, 27 Apr 2021 12:25:57 +0200 Subject: [PATCH 3/9] Update pdns-qof.xml Update Aaron's contact infos. Not with CERT.at anymore --- i-d/pdns-qof.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/i-d/pdns-qof.xml b/i-d/pdns-qof.xml index d4e47f7..ac53c2d 100644 --- a/i-d/pdns-qof.xml +++ b/i-d/pdns-qof.xml @@ -81,18 +81,19 @@ - CERT.at +
- Karlsplatz 1/2/9 + + Vienna - A-1010 + A-1170 Austria - +43 1 5056416 78 - kaplan@cert.at - http://www.cert.at/ + + aaron@lo-res.org +
From a39e2712c9127a72261825d1a831a05b5e53e63e Mon Sep 17 00:00:00 2001 From: AaronK Date: Tue, 27 Apr 2021 12:08:10 +0200 Subject: [PATCH 4/9] Update README.md trivial addition --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 1b086e2..da0dfeb 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,7 @@ Users and Use-cases * [CIRCL](https://www.circl.lu/services/passive-dns/) * [D4 Project Passive DNS](https://www.d4-project.org/2019/05/28/passive-dns-tutorial.html) * [balboa](https://github.com/DCSO/balboa) - * 360CN? - * ... + * ... add yours please. Create a pull request to this file please. From c8571d26289bc102d20714ee53cf63df682eaccd Mon Sep 17 00:00:00 2001 From: AaronK Date: Tue, 27 Apr 2021 12:22:59 +0200 Subject: [PATCH 5/9] Update pdns-qof.xml be a bit more specific on what JSON data type rrname field is. --- i-d/pdns-qof.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i-d/pdns-qof.xml b/i-d/pdns-qof.xml index 3c20fb3..d4e47f7 100644 --- a/i-d/pdns-qof.xml +++ b/i-d/pdns-qof.xml @@ -203,7 +203,7 @@ ws = *( Implementation MUST support all the mandatory fields. Uniqueness property: the tuple (rrname,rrtype,rdata) will always be unique within one answer per server. While rrname and rrtype are always individual JSON primitive types (strings, numbers, booleans or null), rdata MAY return multiple resource records or a single record. When multiple resource records are returned, rdata MUST be a JSON array. In the case of a single resource record is returned, rdata MUST be a JSON string or a JSON array containing one JSON string. Senders SHOULD send an array for rdata, but receivers MUST be able to accept a single-string result for rdata.
- This field returns the name of the queried resource. + This field returns the name of the queried resource. JSON string.
This field returns the resource record type as seen by the passive DNS. The key is rrtype and the value is in the interpreted record type represented as a JSON string. If the value cannot be interpreted, the decimal value is returned following the principle of transparency as described in RFC 3597. Then the decimal value is represented as a JSON number. From b9eb2af3d24bc8ac8c780ff864bee335763df337 Mon Sep 17 00:00:00 2001 From: AaronK Date: Tue, 27 Apr 2021 12:25:57 +0200 Subject: [PATCH 6/9] Update pdns-qof.xml Update Aaron's contact infos. Not with CERT.at anymore --- i-d/pdns-qof.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/i-d/pdns-qof.xml b/i-d/pdns-qof.xml index d4e47f7..ac53c2d 100644 --- a/i-d/pdns-qof.xml +++ b/i-d/pdns-qof.xml @@ -81,18 +81,19 @@ - CERT.at +
- Karlsplatz 1/2/9 + + Vienna - A-1010 + A-1170 Austria - +43 1 5056416 78 - kaplan@cert.at - http://www.cert.at/ + + aaron@lo-res.org +
From 1bc8df26846d7de99ff0de6a5cd538a982485802 Mon Sep 17 00:00:00 2001 From: aaronkaplan Date: Tue, 27 Apr 2021 12:54:36 +0200 Subject: [PATCH 7/9] Add changelog file --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..0385b71 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,6 @@ +# Version 0.8 + + * Started tracking in a CHANGELOG file + * Change Aaron's Address + * Address and find a compromise for issue #17 + From 1bd7a80adeffffead8861145c3eb23a54705a09d Mon Sep 17 00:00:00 2001 From: aaronkaplan Date: Tue, 27 Apr 2021 13:32:18 +0200 Subject: [PATCH 8/9] xml2rfc --html should also work --- i-d/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i-d/Makefile b/i-d/Makefile index 9462162..9f2503b 100644 --- a/i-d/Makefile +++ b/i-d/Makefile @@ -2,7 +2,7 @@ all: pdns-qof.xml xml2rfc pdns-qof.xml html: pdns-qof.xml - xml2html pdns-qof.xml + xml2rfc --html pdns-qof.xml clean: rm -f pdns-qof.txt From ceaee596ea8624895b8db918edd60310e0c90b53 Mon Sep 17 00:00:00 2001 From: aaronkaplan Date: Tue, 27 Apr 2021 13:32:51 +0200 Subject: [PATCH 9/9] Add section on solving issue #17. I think this can be closed now. Not elegant, but works and makes the fsio output compatible. --- i-d/pdns-qof.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/i-d/pdns-qof.xml b/i-d/pdns-qof.xml index ac53c2d..d79971f 100644 --- a/i-d/pdns-qof.xml +++ b/i-d/pdns-qof.xml @@ -50,7 +50,7 @@ - +