@nictool/dns-resource-record 1.2.1 → 1.2.3

package/CHANGELOG.md

@@ -4,6 +4,20 @@ Notable changes to this project are documented in this file.
 
 #### Unreleased
 
+### [1.2.3] - 2025-04-14
+
+- test(\*): fully qualify node modules
+- feat(rr.isIPv?): added regexes to validate format
+- dep(node:{net|util): remove, for browser compatiblity
+- doc(CONTRIBUTORS.md): added
+- ci: disable codeql schedule (#45)
+
+### [1.2.2] - 2024-11-17
+
+- dep(eslint): update to v9 & config
+- chore: tighten up fromBind regex
+- packaging tweaks (#43)
+
 ### [1.2.1] - 2024-03-10
 
 - fix(nsec3param): fixed setHash fname typo
@@ -294,4 +308,8 @@ Notable changes to this project are documented in this file.
 [1.1.5]: https://github.com/NicTool/dns-resource-record/releases/tag/1.1.5
 [1.1.6]: https://github.com/NicTool/dns-resource-record/releases/tag/1.1.6
 [1.1.8]: https://github.com/NicTool/dns-resource-record/releases/tag/1.1.8
-[1.2.1]: https://github.com/NicTool/dns-resource-record/releases/tag/1.2.1
+[1.1.7]: https://github.com/NicTool/dns-resource-record/releases/tag/1.1.7
+[1.2.0]: https://github.com/NicTool/dns-resource-record/releases/tag/1.2.0
+[1.2.1]: https://github.com/NicTool/dns-resource-record/releases/tag/v1.2.1
+[1.2.2]: https://github.com/NicTool/dns-resource-record/releases/tag/1.2.2
+[1.2.3]: https://github.com/NicTool/dns-resource-record/releases/tag/v1.2.3

package/README.md

@@ -20,7 +20,7 @@ This module is used to:
 |                       **MaraDNS**                        |                    | :white_check_mark: |
 |                          **JS**                          | :white_check_mark: | :white_check_mark: |
 
-This package intends to import and export RFC compliant DNS resource records. Please [raise an issue](https://github.com/NicTool/dns-resource-record/issues) if you a valid resource record fails to pass or an invalid resource record passes.
+This package intends to import and export RFC compliant DNS resource records. Please [raise an issue](https://github.com/NicTool/dns-resource-record/issues) if a valid resource record fails to pass or an invalid resource record passes.
 
 This package is for working with _individual_ Resource Records. For working with zones of RRs, use [dns-zone](https://github.com/NicTool/dns-zone).
 
@@ -239,6 +239,8 @@ PRs are welcome, especially PRs with tests.
 
 - [Dictionary of DNS terms](https://nictool.github.io/web/Dictionary)
 - [Wikipedia, List of DNS Record Types](https://en.wikipedia.org/wiki/List_of_DNS_record_types)
+- @nictool/[dns-zone](https://www.npmjs.com/package/@nictool/dns-zone)
+- @nictool/[dns-nameserver](https://www.npmjs.com/package/@nictool/dns-nameserver)
 
 ## TODO
 

package/package.json

@@ -1,8 +1,14 @@
 {
   "name": "@nictool/dns-resource-record",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "DNS Resource Records",
   "main": "index.js",
+  "files": [
+    "lib",
+    "rr",
+    "CHANGELOG.md",
+    "rr.js"
+  ],
   "type": "module",
   "scripts": {
     "format:check": "npm run prettier; npm run lint",
@@ -39,6 +45,14 @@
   },
   "homepage": "https://github.com/NicTool/dns-resource-record#readme",
   "devDependencies": {
-    "mocha": "^10.3.0"
+    "@eslint/js": "^10.0.0",
+    "eslint": "^9.15.0",
+    "globals": "^16.0.0",
+    "mocha": "^11.2.2"
+  },
+  "prettier": {
+    "semi": false,
+    "singleQuote": true,
+    "trailingComma": "all"
   }
 }

package/rr/a.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 
 export default class A extends RR {
@@ -10,7 +8,7 @@ export default class A extends RR {
   /****** Resource record specific setters   *******/
   setAddress(val) {
     if (!val) this.throwHelp('A: address is required')
-    if (!net.isIPv4(val)) this.throwHelp('A address must be IPv4')
+    if (!this.isIPv4(val)) this.throwHelp('A address must be IPv4')
     this.set('address', val)
   }
 

package/rr/aaaa.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
 
@@ -11,7 +9,7 @@ export default class AAAA extends RR {
   /****** Resource record specific setters   *******/
   setAddress(val) {
     if (!val) this.throwHelp('AAAA: address is required')
-    if (!net.isIPv6(val)) this.throwHelp(`AAAA: address must be IPv6 (${val})`)
+    if (!this.isIPv6(val)) this.throwHelp(`AAAA: address must be IPv6 (${val})`)
 
     this.set('address', this.expand(val.toLowerCase())) // lower case: RFC 5952
   }

package/rr/caa.js

@@ -108,9 +108,11 @@ export default class CAA extends RR {
 
   fromBind(opts) {
     // test.example.com  3600  IN  CAA flags, tags, value
-    const fields = opts.bindline.match(
-      /^([^\s]+)\s+([0-9]+)\s+(\w+)\s+(\w+)\s+([0-9]+)\s+(\w+)\s+("[^"]+"|[^\s]+?)\s*$/i,
-    )
+    const fields = opts.bindline
+      .trim()
+      .match(
+        /^([\S]+)\s+([0-9]{1,10})\s+(IN)\s+(CAA)\s+([0-9]+)\s+(\w+)\s+("[^"]+"|[\S]+?)$/i,
+      )
     if (!fields) this.throwHelp(`unable to parse: ${opts.bindline}`)
 
     const [owner, ttl, c, type, flags, tag, value] = fields.slice(1)

package/rr/cname.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 
 export default class CNAME extends RR {
@@ -14,7 +12,7 @@ export default class CNAME extends RR {
 
     if (!val) this.throwHelp('CNAME: cname is required')
 
-    if (net.isIPv4(val) || net.isIPv6(val))
+    if (this.isIPv4(val) || this.isIPv6(val))
       this.throwHelp(`CNAME: cname must be a FQDN: RFC 2181`)
 
     if (!this.isFullyQualified('CNAME', 'cname', val)) return

package/rr/dname.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
 
@@ -12,7 +10,7 @@ export default class DNAME extends RR {
   setTarget(val) {
     if (!val) this.throwHelp('DNAME: target is required')
 
-    if (net.isIPv4(val) || net.isIPv6(val))
+    if (this.isIPv4(val) || this.isIPv6(val))
       this.throwHelp(`DNAME: target must be a domain name`)
 
     this.isFullyQualified('DNAME', 'target', val)

package/rr/hinfo.js

@@ -41,9 +41,11 @@ export default class HINFO extends RR {
   /******  IMPORTERS   *******/
   fromBind(opts) {
     // test.example.com  3600  IN  HINFO   DEC-2060 TOPS20
-    const match = opts.bindline.match(
-      /([^\s]+)\s+([0-9]+)\s+(IN)\s+(HINFO)\s+("[^"]+"|[^\s]+)\s+("[^"]+"|[^\s]+)/i,
-    )
+    const match = opts.bindline
+      .trim()
+      .match(
+        /^([\S]+)\s+([0-9]{1,10})\s+(IN)\s+(HINFO)\s+("[^"]+"|[\S]+)\s+("[^"]+"|[\S]+)/i,
+      )
     if (!match) this.throwHelp(`unable to parse HINFO: ${opts.bindline}`)
     const [owner, ttl, c, type, cpu, os] = match.slice(1)
 

package/rr/ipseckey.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 
 import * as TINYDNS from '../lib/tinydns.js'
@@ -39,10 +37,10 @@ export default class IPSECKEY extends RR {
         if (val !== '.') throw gwErr
         break
       case 1:
-        if (!net.isIPv4(val)) throw gwErr
+        if (!this.isIPv4(val)) throw gwErr
         break
       case 2:
-        if (!net.isIPv6(val)) throw gwErr
+        if (!this.isIPv6(val)) throw gwErr
         break
     }
 

package/rr/mx.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 
 export default class MX extends RR {
@@ -18,7 +16,7 @@ export default class MX extends RR {
   setExchange(val) {
     if (!val) this.throwHelp('MX: exchange is required')
 
-    if (net.isIPv4(val) || net.isIPv6(val))
+    if (this.isIPv4(val) || this.isIPv6(val))
       this.throwHelp(`MX: exchange must be a FQDN`)
 
     this.isFullyQualified('MX', 'exchange', val)

package/rr/openpgpkey.js

@@ -30,9 +30,9 @@ export default class OPENPGPKEY extends RR {
   fromBind(obj) {
     // test.example.com  3600  IN  OPENPGPKEY  <base64 public key>
     // eslint-disable-next-line no-unused-vars
-    const [ignore, owner, ttl, c, type, publickey] = obj.bindline.match(
-      /^([\S]+)\s+(\d+)\s+(\w+)\s+(\w+)\s+([\W\w]*)$/,
-    )
+    const [ignore, owner, ttl, c, type, publickey] = obj.bindline
+      .trim()
+      .match(/^([\S]+)\s+(\d{1,10})\s+(IN)\s+(OPENPGPKEY)\s+([\W\w]*)$/)
 
     return new OPENPGPKEY({
       owner,

package/rr/srv.js

@@ -1,5 +1,3 @@
-import net from 'node:net'
-
 import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
 
@@ -30,7 +28,7 @@ export default class SRV extends RR {
   setTarget(val) {
     if (!val) this.throwHelp(`SRV: target is required`)
 
-    if (net.isIPv4(val) || net.isIPv6(val))
+    if (this.isIPv4(val) || this.isIPv6(val))
       this.throwHelp(`SRV: target must be a FQDN`)
 
     this.isFullyQualified('SRV', 'target', val)

package/rr/tlsa.js

@@ -60,9 +60,11 @@ export default class TLSA extends RR {
 
   fromBind(opts) {
     // test.example.com  3600  IN  TLSA, usage, selector, match, data
-    const match = opts.bindline.split(
-      /^([^\s]+)\s+([0-9]+)\s+(\w+)\s+(\w+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+(.*?)\s*$/,
-    )
+    const match = opts.bindline
+      .trim()
+      .split(
+        /^([^\s]+)\s+([0-9]{1,10})\s+(IN)\s+(TLSA)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+(.*?)$/,
+      )
     if (!match) this.throwHelp(`unable to parse TLSA: ${opts.bindline}`)
     const [owner, ttl, c, type, usage, selector, matchtype, cad] =
       match.slice(1)

package/rr/txt.js

@@ -70,9 +70,9 @@ export default class TXT extends RR {
 
   fromBind(opts) {
     // test.example.com  3600  IN  TXT  "..."
-    const match = opts.bindline.split(
-      /^([^\s]+)\s+([0-9]+)\s+(\w+)\s+(\w+)\s+?\s*(.*?)\s*$/,
-    )
+    const match = opts.bindline
+      .trim()
+      .split(/^([\S]{1,255})\s+([0-9]{1,10})\s+(IN)\s+(\w{3})\s+?\s*(.*?)$/i)
     if (!match) this.throwHelp(`unable to parse TXT: ${opts.bindline}`)
     const [owner, ttl, c, type, rdata] = match.slice(1)
 

package/rr.js

@@ -1,5 +1,3 @@
-import util from 'node:util'
-
 export default class RR extends Map {
   constructor(opts) {
     super()
@@ -128,7 +126,7 @@ export default class RR extends Map {
     if (this.constructor.name === 'RR') throw new Error(e)
 
     const example = this.getCanonical
-      ? `Example ${this.constructor.name}:\n${util.inspect(this.getCanonical(), { depth: null })}\n\n`
+      ? `Example ${this.constructor.name}:\n${this.getCanonical()}\n\n`
       : `${this.constructor.name} records have the fields: ${this.getFields().join(', ')}\n\n`
 
     throw new Error(`${e}\n\n${example}${this.citeRFC()}\n`)
@@ -313,6 +311,17 @@ export default class RR extends Map {
     )
   }
 
+  isIPv4(string) {
+    // https://stackoverflow.com/questions/5284147/validating-ipv4-addresses-with-regexp
+    return /^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$/.test(string)
+  }
+
+  isIPv6(string) {
+    return /^(?:(?:[a-fA-F\d]{1,4}:){7}(?:[a-fA-F\d]{1,4}|:)|(?:[a-fA-F\d]{1,4}:){6}(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|:[a-fA-F\d]{1,4}|:)|(?:[a-fA-F\d]{1,4}:){5}(?::(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,2}|:)|(?:[a-fA-F\d]{1,4}:){4}(?:(?::[a-fA-F\d]{1,4}){0,1}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,3}|:)|(?:[a-fA-F\d]{1,4}:){3}(?:(?::[a-fA-F\d]{1,4}){0,2}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,4}|:)|(?:[a-fA-F\d]{1,4}:){2}(?:(?::[a-fA-F\d]{1,4}){0,3}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,5}|:)|(?:[a-fA-F\d]{1,4}:){1}(?:(?::[a-fA-F\d]{1,4}){0,4}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,6}|:)|(?::(?:(?::[a-fA-F\d]{1,4}){0,5}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,7}|:)))(?:%[0-9a-zA-Z]{1,})?$/gm.test(
+      string,
+    )
+  }
+
   toBind(zone_opts) {
     return `${this.getPrefix(zone_opts)}\t${this.getRdataFields()
       .map((f) => this.getQuoted(f))