From 355038bc44ff6a9dbbc5a09739fba3fe4b073b32 Mon Sep 17 00:00:00 2001
From: Eugene Crosser <crosser@average.org>
Date: Tue, 15 Apr 2014 12:05:29 +0400
Subject: [PATCH] proper parsing of TLS and DS attrs
---
NmcDom.hs | 42 ++++++++++++++++++++++++++++--
SPEC.md | 78 ++++++++++++++++++++++++++++++++++---------------------
2 files changed, 89 insertions(+), 31 deletions(-)
diff --git a/NmcDom.hs b/NmcDom.hs
index 7eb4ee6..11b77ac 100644
--- a/NmcDom.hs
+++ b/NmcDom.hs
@@ -95,6 +95,44 @@ instance FromJSON NmcRRI2p where
instance Mergeable NmcRRI2p where
merge _ b = b
+data NmcRRTls = NmcRRTls
+ { tlsMatchType :: Int -- 0:exact 1:sha256 2:sha512
+ , tlsMatchValue :: String
+ , tlsIncSubdoms :: Int -- 1:enforce on subdoms 0:no
+ } deriving (Show, Eq)
+
+instance FromJSON NmcRRTls where
+ parseJSON (Array a) =
+ if length a == 3 then NmcRRTls
+ <$> parseJSON (a ! 0)
+ <*> parseJSON (a ! 1)
+ <*> parseJSON (a ! 2)
+ else empty
+ parseJSON _ = empty
+
+instance Mergeable NmcRRTls where
+ merge _ b = b
+
+data NmcRRDs = NmcRRDs
+ { dsKeyTag :: Int
+ , dsAlgo :: Int
+ , dsHashType :: Int
+ , dsHashValue :: String
+ } deriving (Show, Eq)
+
+instance FromJSON NmcRRDs where
+ parseJSON (Array a) =
+ if length a == 4 then NmcRRDs
+ <$> parseJSON (a ! 0)
+ <*> parseJSON (a ! 1)
+ <*> parseJSON (a ! 2)
+ <*> parseJSON (a ! 3)
+ else empty
+ parseJSON _ = empty
+
+instance Mergeable NmcRRDs where
+ merge _ b = b
+
data NmcDom = NmcDom { domService :: Maybe [NmcRRService]
, domIp :: Maybe [String]
, domIp6 :: Maybe [String]
@@ -112,8 +150,8 @@ data NmcDom = NmcDom { domService :: Maybe [NmcRRService]
, domMap :: Maybe (Map String NmcDom)
, domFingerprint :: Maybe [String]
, domTls :: Maybe (Map String
- (Map String [[String]]))
- , domDs :: Maybe [[String]]
+ (Map String [NmcRRTls]))
+ , domDs :: Maybe [NmcRRDs]
, domMx :: Maybe [String] -- Synthetic
} deriving (Show, Eq)
diff --git a/SPEC.md b/SPEC.md
index 379840f..22b236e 100644
--- a/SPEC.md
+++ b/SPEC.md
@@ -5,30 +5,32 @@
`DomObj` is a JSON object, specifically a `Map` (not an `Array`), or a
`String` containing a dotted quad (see Note below).
-### `DomObj` Attributes
-
-| Key | Type | Comment |
-|-------------|----------------------|---------------------------------|
-| service | Array(SrvObj) | Located two levels above pos. |
-| ip | Array(String) | Dotted quad "1.2.3.4" |
-| ip6 | Array(String) | Semicolon format "DEAD::BEEF" |
-| tor | String | Onion name |
-| i2p | I2pObj | |
-| freenet | String | |
-| alias | String | Nullifies other attributes |
-| translate | String | Nullifies other attributes |
-| email | String | Used in `SOA` |
-| loc | String | Format suitable for `LOC` |
-| info | JsonObj | Currently unspecified |
-| ns | Array(String) | Domain names as in `NS` |
-| delegate | String | Nullifies other attributes |
-| import | String | "Deep" merges into current obj. |
-| map | Map(String:DomObj) | Tree of subdomain objects |
-| fingerprint | Array(String) | |
-| tls | *TlsMap* | See note below |
-| ds | Array(Array(String)) | |
-
-### Notes:
+### `DomObj` Object
+
+`DomObj` is a JSON `Map`, with the following attributes, all optional:
+
+| Key | Type | Comment |
+|-------------|---------------------------------------|---------------------------------|
+| service | Array(SrvObj) | Located two levels above pos. |
+| ip | Array(String) | Dotted quad "1.2.3.4" |
+| ip6 | Array(String) | Semicolon format "DEAD::BEEF" |
+| tor | String | Onion name |
+| i2p | I2pObj | |
+| freenet | String | |
+| alias | String | Nullifies other attributes |
+| translate | String | Nullifies other attributes |
+| email | String | Used in `SOA` |
+| loc | String | Format suitable for `LOC` |
+| info | JsonObj | Currently unspecified |
+| ns | Array(String) | Domain names as in `NS` |
+| delegate | String | Replaces current object |
+| import | String | "Deep" merges into current obj. |
+| map | Map(String:DomObj) | Tree of subdomain objects |
+| fingerprint | Array(String) | |
+| tls | Map(String:Map(String:Array(TlsObj))) | |
+| ds | Array(DsObj) | |
+
+#### Notes:
* Any attribute specified as `Array(String)` may be present in the
JSON document as `String`, which is interpreted the same way as
@@ -38,11 +40,8 @@
is interpreted the same way as the object `"{\"ip\":\"1.2.3.4\"}"`
Such "shorthand" DomObj can be present at the top level or as a value
in the `"map"` attribute.
-* *TlsMap* is `Map(String:Map(String:Array(TlsObj)))`, where `TlsObj` is
- a heterogenous Array of 3 elements: `[Int, String, Int]`. It is not
- used by the DNS bridge.
-### SrvObj format
+### `SrvObj` Object
`SrvObj` is a heterogenous Array of fixed size containing 6 elements:
@@ -55,7 +54,7 @@
| 4 | Int | Port |
| 5 | String | Hostname |
-### Notes
+#### Notes
* `Service` and `Protocol` are two elements of the domain name, without
the undescore '_'.
@@ -66,6 +65,27 @@
fetched, and in this object, `SrvObj`s for the Service `"serv"` and
Protocol `"proto"` selected from it.
+### `TlsObj` Object
+
+`TlsObj` is a heterogenous Array of fixed size containing 3 elements:
+
+| N | Type | Meaning |
+|---|--------|-------------------------------------------------------|
+| 0 | Int | Match type - 0:Exact, 1:SHA-256, 2:SHA-512 |
+| 1 | String | Match value - certificate or hash of it as hex string |
+| 2 | Int | Include subdomains - 0:No, 1:Yes |
+
+### `DsObj` Object
+
+`DsObj` is a heterogenous Array of fixed size containing 4 elements:
+
+| N | Type | Meaning |
+|---|--------|--------------------------|
+| 0 | Int | Key Tag |
+| 1 | Int | Key Algorithm |
+| 2 | Int | Hash Type |
+| 3 | String | Hash Value as hex string |
+
## Data Interpretation
Assuming a query for a subdomain of a basedomain in the `.bit` TLD
--
2.43.0