@nictool/dns-resource-record 1.2.4 → 1.3.1

package/rr/srv.js

@@ -28,8 +28,7 @@ export default class SRV extends RR {
   setTarget(val) {
     if (!val) this.throwHelp(`SRV: target is required`)
 
-    if (this.isIPv4(val) || this.isIPv6(val))
-      this.throwHelp(`SRV: target must be a FQDN`)
+    if (this.isIPv4(val) || this.isIPv6(val)) this.throwHelp(`SRV: target must be a FQDN`)
 
     this.isFullyQualified('SRV', 'target', val)
     this.isValidHostname('SRV', 'target', val)
@@ -61,9 +60,7 @@ export default class SRV extends RR {
 
     if (str[0] === 'S') {
       // patched tinydns with S records
-      ;[fqdn, addr, port, pri, weight, ttl, ts, loc] = str
-        .substring(1)
-        .split(':')
+      ;[fqdn, addr, port, pri, weight, ttl, ts, loc] = str.substring(1).split(':')
     } else {
       // tinydns generic record format
       ;[fqdn, n, rdata, ttl, ts, loc] = str.substring(1).split(':')
@@ -90,8 +87,7 @@ export default class SRV extends RR {
 
   fromBind(opts) {
     // test.example.com  3600  IN  SRV Priority Weight Port Target
-    const [owner, ttl, c, type, pri, weight, port, target] =
-      opts.bindline.split(/\s+/)
+    const [owner, ttl, c, type, pri, weight, port, target] = opts.bindline.split(/\s+/)
     return new SRV({
       owner: owner,
       ttl: parseInt(ttl, 10),

package/rr/svcb.js

@@ -1,5 +1,7 @@
 import RR from '../rr.js'
 
+import * as TINYDNS from '../lib/tinydns.js'
+
 export default class SVCB extends RR {
   constructor(opts) {
     super(opts)
@@ -61,4 +63,14 @@ export default class SVCB extends RR {
   }
 
   /******  EXPORTERS   *******/
+
+  toTinydns() {
+    const dataRe = new RegExp(/[\r\n\t:\\/]/, 'g')
+
+    return this.getTinydnsGeneric(
+      TINYDNS.UInt16toOctal(this.get('priority')) +
+        TINYDNS.packDomainName(this.get('target name')) +
+        TINYDNS.escapeOctal(dataRe, this.get('params')),
+    )
+  }
 }

package/rr/tlsa.js

@@ -9,8 +9,7 @@ export default class TLSA extends RR {
 
   /****** Resource record specific setters   *******/
   setCertificateUsage(val) {
-    if (!this.getCertificateUsageOptions().has(val))
-      this.throwHelp(`TLSA: certificate usage invalid`)
+    if (!this.getCertificateUsageOptions().has(val)) this.throwHelp(`TLSA: certificate usage invalid`)
 
     this.set('certificate usage', val)
   }
@@ -25,8 +24,7 @@ export default class TLSA extends RR {
   }
 
   setSelector(val) {
-    if (!this.getSelectorOptions().has(val))
-      this.throwHelp(`TLSA: selector invalid`)
+    if (!this.getSelectorOptions().has(val)) this.throwHelp(`TLSA: selector invalid`)
 
     this.set('selector', val)
   }
@@ -39,8 +37,7 @@ export default class TLSA extends RR {
   }
 
   setMatchingType(val) {
-    if (!this.getMatchingTypeOptions().has(val))
-      this.throwHelp(`TLSA: matching type`)
+    if (!this.getMatchingTypeOptions().has(val)) this.throwHelp(`TLSA: matching type`)
 
     this.set('matching type', val)
   }
@@ -62,12 +59,7 @@ export default class TLSA extends RR {
   }
 
   getRdataFields(arg) {
-    return [
-      'certificate usage',
-      'selector',
-      'matching type',
-      'certificate association data',
-    ]
+    return ['certificate usage', 'selector', 'matching type', 'certificate association data']
   }
 
   getRFCs() {
@@ -86,19 +78,17 @@ export default class TLSA extends RR {
 
   fromBind(opts) {
     // test.example.com  3600  IN  TLSA, usage, selector, match, data
-    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+(.*?)$/,
-      )
+    const regex =
+      /^(?<owner>\S+)\s+(?<ttl>\d{1,10})\s+(?<cls>IN)\s+(?<type>TLSA)\s+(?<usage>\d+)\s+(?<selector>\d+)\s+(?<matchtype>\d+)\s+(?<cad>.+)$/i
+    const match = opts.bindline.trim().match(regex)
     if (!match) this.throwHelp(`unable to parse TLSA: ${opts.bindline}`)
-    const [owner, ttl, c, type, usage, selector, matchtype, cad] =
-      match.slice(1)
+    const { owner, ttl, cls, type, usage, selector, matchtype, cad } = match.groups
+
     return new TLSA({
       owner: this.fullyQualify(owner),
       ttl: parseInt(ttl, 10),
-      class: c,
-      type,
+      class: cls.toUpperCase(),
+      type: type.toUpperCase(),
       'certificate usage': parseInt(usage, 10),
       selector: parseInt(selector, 10),
       'matching type': parseInt(matchtype, 10),

package/rr/tsig.js

@@ -13,15 +13,7 @@ export default class TSIG extends RR {
   }
 
   getRdataFields(arg) {
-    return [
-      'algorithm name',
-      'time signed',
-      'fudge',
-      'mac',
-      'original id',
-      'error',
-      'other',
-    ]
+    return ['algorithm name', 'time signed', 'fudge', 'mac', 'original id', 'error', 'other']
   }
 
   getRFCs() {

package/rr/txt.js

@@ -70,17 +70,18 @@ export default class TXT extends RR {
 
   fromBind(opts) {
     // test.example.com  3600  IN  TXT  "..."
-    const match = opts.bindline
-      .trim()
-      .split(/^([\S]{1,255})\s+([0-9]{1,10})\s+(IN)\s+(\w{3})\s+?\s*(.*?)$/i)
+    const regex =
+      /^(?<owner>[\S]{1,255})\s+(?<ttl>\d{1,10})\s+(?<cls>IN)\s+(?<type>\w{3})\s+?\s*(?<rdata>.+?)$/i
+    const match = opts.bindline.trim().match(regex)
     if (!match) this.throwHelp(`unable to parse TXT: ${opts.bindline}`)
-    const [owner, ttl, c, type, rdata] = match.slice(1)
+
+    const { owner, ttl, cls, type, rdata } = match.groups
 
     return new this.constructor({
       owner,
       ttl: parseInt(ttl, 10),
-      class: c,
-      type,
+      class: cls,
+      type: type.toUpperCase(),
       data: rdata
         .match(/"([^"]+?)"/g)
         .map((s) => s.replace(/^"|"$/g, ''))

package/rr/uri.js

@@ -46,8 +46,7 @@ export default class URI extends RR {
 
   fromBind(opts) {
     // test.example.com  3600  IN  URI  priority, weight, target
-    const [owner, ttl, c, type, priority, weight, target] =
-      opts.bindline.split(/\s+/)
+    const [owner, ttl, c, type, priority, weight, target] = opts.bindline.split(/\s+/)
     return new URI({
       class: c,
       type: type,

package/rr/wks.js

@@ -1,19 +1,36 @@
 import RR from '../rr.js'
 
+import * as TINYDNS from '../lib/tinydns.js'
+
 export default class WKS extends RR {
   constructor(opts) {
     super(opts)
-    if (opts === null) return
   }
 
   /****** Resource record specific setters   *******/
+  setAddress(val) {
+    if (!val) this.throwHelp('WKS: address is required')
+    if (!this.isIPv4(val)) this.throwHelp('WKS address must be IPv4')
+    this.set('address', val)
+  }
+
+  setProtocol(val) {
+    if (!val) this.throwHelp('WKS: protocol is required')
+    const upper = typeof val === 'string' ? val.toUpperCase() : val
+    if (!['TCP', 'UDP', 6, 17].includes(upper)) this.throwHelp('WKS protocol must be TCP or UDP')
+    this.set('protocol', upper)
+  }
+
+  setBitMap(val) {
+    this.set('bit map', val ?? '')
+  }
 
   getDescription() {
     return 'Well Known Service'
   }
 
   getRdataFields(arg) {
-    return ['bit map']
+    return ['address', 'protocol', 'bit map']
   }
 
   getRFCs() {
@@ -27,19 +44,31 @@ export default class WKS extends RR {
   /******  IMPORTERS   *******/
 
   fromBind(opts) {
-    // test.example.com  3600  IN  WKS 192.168.1.1 TCP 25
-    const [owner, ttl, c, type, address, protocol, bitmap] =
-      opts.bindline.split(/\s+/)
+    // test.example.com  3600  IN  WKS 192.168.1.1 TCP ftp smtp
+    const parts = opts.bindline.split(/\s+/)
+    const [owner, ttl, c, type, address, protocol] = parts
     return new WKS({
       owner,
       ttl: parseInt(ttl, 10),
       class: c,
       type,
-      address, // 32-bit int
-      protocol, // 8-bit int, 6=TCP, 17=UDP
-      bitmap, // var len bit map, must be multiple of 8
+      address,
+      protocol,
+      'bit map': parts.slice(6).join(' ').trim(),
     })
   }
 
   /******  EXPORTERS   *******/
+
+  toTinydns() {
+    const dataRe = new RegExp(/[\r\n\t:\\/]/, 'g')
+    const protoMap = { TCP: 6, UDP: 17, 6: 6, 17: 17 }
+    const protoNum = protoMap[this.get('protocol')]
+
+    return this.getTinydnsGeneric(
+      TINYDNS.ipv4toOctal(this.get('address')) +
+        TINYDNS.UInt8toOctal(protoNum) +
+        TINYDNS.escapeOctal(dataRe, this.get('bit map')),
+    )
+  }
 }

package/rr.js

@@ -20,8 +20,7 @@ export default class RR extends Map {
 
     for (const f of this.getFields('rdata')) {
       const fnName = `set${this.ucFirst(f)}`
-      if (this[fnName] === undefined)
-        this.throwHelp(`Missing ${fnName} in class ${this.get('type')}`)
+      if (this[fnName] === undefined) this.throwHelp(`Missing ${fnName} in class ${this.get('type')}`)
       this[fnName](opts[f])
     }
 
@@ -77,9 +76,7 @@ export default class RR extends Map {
     if (n === undefined) this.throwHelp(`owner is required`)
 
     if (n.length < 1 || n.length > 255)
-      this.throwHelp(
-        'Domain names must have 1-255 octets (characters): RFC 2181',
-      )
+      this.throwHelp('Domain names must have 1-255 octets (characters): RFC 2181')
 
     this.isFullyQualified(this.constructor.name, 'owner', n)
     this.hasValidLabels(n)
@@ -100,8 +97,7 @@ export default class RR extends Map {
       this.throwHelp('TTL is required, no default available')
     }
 
-    if (typeof t !== 'number')
-      this.throwHelp(`TTL must be numeric (${typeof t})`)
+    if (typeof t !== 'number') this.throwHelp(`TTL must be numeric (${typeof t})`)
 
     // RFC 1035, 2181
     this.is32bitInt(this.get('type'), 'TTL', t)
@@ -209,8 +205,7 @@ export default class RR extends Map {
 
     if (zone_opts.hide?.origin && zone_opts.origin) {
       if (fqdn === zone_opts.origin) return '@'
-      if (fqdn.endsWith(zone_opts.origin))
-        return fqdn.slice(0, fqdn.length - zone_opts.origin.length - 1)
+      if (fqdn.endsWith(zone_opts.origin)) return fqdn.slice(0, fqdn.length - zone_opts.origin.length - 1)
     }
 
     return fqdn
@@ -232,9 +227,7 @@ export default class RR extends Map {
   }
 
   getTinydnsPostamble() {
-    return ['ttl', 'timestamp', 'location']
-      .map((f) => this.getEmpty(f))
-      .join(':')
+    return ['ttl', 'timestamp', 'location'].map((f) => this.getEmpty(f)).join(':')
   }
 
   hasValidLabels(hostname) {
@@ -258,9 +251,7 @@ export default class RR extends Map {
     )
       return true
 
-    this.throwHelp(
-      `${type} ${field} must be a 8-bit integer (in the range 0-255)`,
-    )
+    this.throwHelp(`${type} ${field} must be a 8-bit integer (in the range 0-255)`)
   }
 
   is16bitInt(type, field, value) {
@@ -272,9 +263,7 @@ export default class RR extends Map {
     )
       return true
 
-    this.throwHelp(
-      `${type} ${field} must be a 16-bit integer (in the range 0-65535)`,
-    )
+    this.throwHelp(`${type} ${field} must be a 16-bit integer (in the range 0-65535)`)
   }
 
   is32bitInt(type, field, value) {
@@ -286,9 +275,7 @@ export default class RR extends Map {
     )
       return true
 
-    this.throwHelp(
-      `${type} ${field} must be a 32-bit integer (in the range 0-2147483647)`,
-    )
+    this.throwHelp(`${type} ${field} must be a 32-bit integer (in the range 0-2147483647)`)
   }
 
   isQuoted(val) {
@@ -306,9 +293,7 @@ export default class RR extends Map {
     if (!allowed.test(hostname)) return true
 
     const matches = allowed.exec(hostname)
-    this.throwHelp(
-      `${type}, ${field} has invalid hostname character (${matches[0]})`,
-    )
+    this.throwHelp(`${type}, ${field} has invalid hostname character (${matches[0]})`)
   }
 
   isIPv4(string) {
@@ -330,10 +315,9 @@ export default class RR extends Map {
 
   toMaraDNS() {
     const type = this.get('type')
-    const supportedTypes =
-      'A PTR MX AAAA SRV NAPTR NS SOA TXT SPF RAW FQDN4 FQDN6 CNAME HINFO WKS LOC'.split(
-        /\s+/g,
-      )
+    const supportedTypes = 'A PTR MX AAAA SRV NAPTR NS SOA TXT SPF RAW FQDN4 FQDN6 CNAME HINFO WKS LOC'.split(
+      /\s+/g,
+    )
     if (!supportedTypes.includes(type)) return this.toMaraGeneric()
     return `${this.get('owner')}\t+${this.get('ttl')}\t${type}\t${this.getRdataFields()
       .map((f) => this.getQuoted(f))