Merge remote-tracking branch 'origin/main'

Author: gbxyz

lib/rdap-validator.js

@@ -66,7 +66,8 @@ self.testURL = function(url, type, serverType, context) {
 };
 
 /**
- * Invoked when the fetch has completed.
+ * Invoked when the fetch has completed. This tests an HTTP response (ie headers
+ * and body)
  * @param {Response} response
  */
 self.testResponse = function(response) {
@@ -118,6 +119,10 @@ self.testResponse = function(response) {
     );
 };
 
+/**
+ * This is called by testResponse() and validates the JSON body of the response.
+ * @param json
+ */
 self.validateResponse = function(json) {
 
     self.path = ["$"];
@@ -607,8 +612,6 @@ self.validateJCard = function (jcard) {
         self.validateJCardProperty
     );
 
-    self.popPath("[1]");
-
     self.pushSpec("rfc6350");
 
     for (const prop of self.requiredJCardProperties) {
@@ -633,6 +636,8 @@ self.validateJCard = function (jcard) {
         self.popSpec("nro");
     }
 
+    self.popPath("[1]");
+
     self.popSpec("rfc6350");
 };
 
@@ -689,6 +694,12 @@ self.validateJCardPropertyType = function(property) {
         "section-3.3",
     )) return;
 
+    self.add(
+        property[0] === property[0].toLowerCase(),
+        `Property name '${property[0]}' MUST be in lowercase.`,
+        "section-3.3",
+    );
+
     if ("rir" == self.lastTestedServerType) {
         self.pushSpec("nro");
 
@@ -713,11 +724,17 @@ self.validateJCardPropertyType = function(property) {
  * Validate a JCard property parameter object.
  */
 self.validateJCardPropertyParameters = function(property) {
-    self.add(
+    if (self.add(
         self.isObject(property[1]),
         "Item #2 of a jCard property MUST be an object.",
         "section-3.3",
-    );
+    )) {
+        self.add(
+            Object.keys(property[1]).length == Object.keys(property[1]).filter(n => n === n.toLowerCase()).length,
+            "jCard parameter names MUST be lowercase.",
+            "section-3.4"
+        )
+    }
 };
 
 /**
@@ -807,6 +824,31 @@ self.validateJCardPropertyValue = function(property) {
         }
 
         self.popSpec("rfc8605");
+
+    } else if (self.isString(property[0]) && "TEL" === property[0].toUpperCase() && self.isString(property[2]) && "uri" == property[2]) {
+
+        let url, valid;
+        try {
+            url = new URL(property[3]);
+            valid = true;
+
+        } catch (e) {
+            valid = false;
+
+        }
+
+        if (self.add(
+            valid,
+            "Value of a TEL property of the 'uri' type MUST be a valid URL.",
+            "section-2.1",
+        )) {
+            self.add(
+                "tel:" === url.protocol,
+                "URI MUST have the tel: scheme.",
+                "section-2.1",
+            );
+        }
+
     }
 
     self.popSpec("rfc6350");
@@ -1870,6 +1912,18 @@ self.validateGTLDRegistrarDomain = function(domain, name) {
 
     self.pushPath(".entities");
 
+    if (domain.hasOwnProperty("entities") && self.isArray(domain.entities)) {
+        self.iterate(
+            domain.entities,
+            function (e) {
+                ["handle", "roles", "vcardArray"].forEach(p => self.add(
+                    e.hasOwnProperty(p),
+                    `Entity MUST have the '${p}' property.`,
+                ));
+            }
+        );
+    }
+
     const rant = (
         domain.hasOwnProperty("entities") && self.isArray(domain.entities)
         ? domain.entities : []
@@ -2308,7 +2362,7 @@ self.validateGTLDNameserver = function(nameserver, name) {
 };
 
 self.validateGTLDEntity = function(rar) {
-    self.msg("Validating gTLD registrar response...");
+    self.msg("Validating gTLD registrar entity...");
 
     if (rar.hasOwnProperty("roles") && self.isArray(rar.roles)) {
         self.pushPath(".roles");
@@ -2329,25 +2383,26 @@ self.validateGTLDEntity = function(rar) {
         self.pushPath(".vcardArray[1]");
 
         let seen_types = {};
+
         self.iterate(
             rar.vcardArray[1],
             function (p) {
-                if (self.isArray(p) && self.isString(p[1])) {
+                if (self.isArray(p) && self.isString(p[0])) {
                     seen_types[p[0].toUpperCase()] = 1;
 
                     if ("ADR" == p[0].toUpperCase()) {
                         self.pushPath("[1]");
 
                         if (self.isObject(p[1])) {
-                            const keys = Object.keys(p[1]).map((k) => k.toUpperCase());
+                            const keys = Object.keys(p[1]);
                             if (self.add(
-                                keys.includes("CC"),
+                                keys.map((k) => k.toUpperCase()).includes("CC"),
                                 "JCard 'adr' property MUST include a 'cc' parameter."
                             )) {
-                                const k = keys.filter((k) => "CC" == k.toUpperCase()).shift();
+                                const key = keys.filter((key) => "CC" == key.toUpperCase()).shift();
                                 self.add(
-                                    self.countryCodes.includes(p[1][k]),
-                                    "JCard 'adr' 'cc' parameter MUST be a valid ISO-3166-alpha2 code."
+                                    self.countryCodes.includes(p[1][key]),
+                                    "JCard 'adr' 'cc' parameter (value '" + p[1][key] + "') MUST be a valid ISO-3166-alpha2 code."
                                 );
                             }
 
@@ -2435,7 +2490,10 @@ self.validateRIRNameServer = function(nameserver) {
  * Default options for calls to fetch().
  */
 self.fetchOptions = {
-    headers:    {accept: "application/rdap+json, application/json, */*"},
+    headers: {
+        accept: "application/rdap+json, application/json, */*",
+        origin: "null",
+    },
     redirect:   "follow",
 };
 
@@ -2463,7 +2521,9 @@ self.isULabel = function(label) {
 
 /**
  * This stores the JSONPath query that identifies the value in the response that
- * is currently being validated.
+ * is currently being validated. When add() is called, the a JSON Path
+ * expression is generated using this stack, so the specific component of the
+ * JSON response can be associated with the message.
  */
 self.path = [];
 
@@ -2489,7 +2549,9 @@ self.popPath = function(last) {
 
 /**
  * This keeps track of the specification document that the response is being
- * validated against.
+ * validated against. when add() is called, the topmost entry in the stack is
+ * copied into the message, so the message can be associated with a particular
+ * specification (RFC, etc).
  */
 self.specStack = [];