@nictool/dns-resource-record 1.6.1 → 1.7.0

package/rr/soa.js

@@ -1,6 +1,21 @@
 import RR from '../rr.js'
 
 export default class SOA extends RR {
+  static typeName = 'SOA'
+  static typeId = 6
+  static RFCs = [1035, 2308]
+  static tinydnsType = 'Z'
+  static rdataFields = [
+    ['mname', 'fqdn'],
+    ['rname', 'fqdn'],
+    ['serial', 'u32'],
+    ['refresh', 'u32'],
+    ['retry', 'u32'],
+    ['expire', 'u32'],
+    ['minimum', 'u32'],
+  ]
+  static tags = ['common']
+
   constructor(opts) {
     super(opts)
   }
@@ -71,18 +86,6 @@ export default class SOA extends RR {
     return 'Start Of Authority'
   }
 
-  getRdataFields(arg) {
-    return ['mname', 'rname', 'serial', 'refresh', 'retry', 'expire', 'minimum']
-  }
-
-  getRFCs() {
-    return [1035, 2308]
-  }
-
-  getTypeId() {
-    return 6
-  }
-
   getCanonical() {
     return {
       owner: 'example.com.',
@@ -100,26 +103,6 @@ export default class SOA extends RR {
   }
 
   /******  IMPORTERS   *******/
-  fromBind({ bindline }) {
-    // example.com TTL IN  SOA mname rname serial refresh retry expire minimum
-    const [owner, ttl, c, type, mname, rname, serial, refresh, retry, expire, minimum] =
-      bindline.split(/[\s+]/)
-
-    return new SOA({
-      owner,
-      ttl: parseInt(ttl) || parseInt(minimum),
-      class: c,
-      type,
-      mname,
-      rname,
-      serial: parseInt(serial, 10),
-      refresh: parseInt(refresh, 10),
-      retry: parseInt(retry, 10),
-      expire: parseInt(expire, 10),
-      minimum: parseInt(minimum, 10),
-    })
-  }
-
   fromTinydns({ tinyline }) {
     // Zfqdn:mname:rname:ser:ref:ret:exp:min:ttl:time:lo
     const [fqdn, mname, rname, ser, ref, ret, exp, min, ttl, ts, loc] = tinyline.slice(1).split(':')
@@ -141,29 +124,28 @@ export default class SOA extends RR {
   }
 
   /******  EXPORTERS   *******/
-  toBind(zone_opts) {
-    const numFields = ['serial', 'refresh', 'retry', 'expire', 'minimum']
-    return `${this.getFQDN('owner', zone_opts)}\t${this.get('ttl')}\t${this.get('class')}\tSOA\t${this.getFQDN('mname', zone_opts)}\t${this.getFQDN('rname', zone_opts)}${numFields.map((f) => '\t' + this.get(f)).join('')}\n`
-  }
-
   toMaraDNS() {
-    return `${this.get('owner')}\t SOA\t${this.getRdataFields()
+    return `${this.get('owner')}\t SOA\t${this.getFields('rdata')
       .map((f) => this.getQuoted(f))
       .join('\t')} ~\n`
   }
 
   getWireRdata() {
-    const nums = Buffer.alloc(20)
-    nums.writeUInt32BE(this.get('serial'), 0)
-    nums.writeUInt32BE(this.get('refresh'), 4)
-    nums.writeUInt32BE(this.get('retry'), 8)
-    nums.writeUInt32BE(this.get('expire'), 12)
-    nums.writeUInt32BE(this.get('minimum'), 16)
-    return Buffer.concat([
-      this.wirePackDomain(this.get('mname')),
-      this.wirePackDomain(this.get('rname')),
-      nums,
-    ])
+    const mname = this.wirePackDomain(this.get('mname'))
+    const rname = this.wirePackDomain(this.get('rname'))
+    const result = new Uint8Array(mname.length + rname.length + 20)
+    let offset = 0
+    result.set(mname, offset)
+    offset += mname.length
+    result.set(rname, offset)
+    offset += rname.length
+    const view = new DataView(result.buffer, offset)
+    view.setUint32(0, this.get('serial'))
+    view.setUint32(4, this.get('refresh'))
+    view.setUint32(8, this.get('retry'))
+    view.setUint32(12, this.get('expire'))
+    view.setUint32(16, this.get('minimum'))
+    return result
   }
 
   toTinydns() {

package/rr/spf.js

@@ -5,6 +5,12 @@ import TXT from './txt.js'
 import * as TINYDNS from '../lib/tinydns.js'
 
 export default class SPF extends TXT {
+  static typeName = 'SPF'
+  static typeId = 99
+  static RFCs = [4408, 7208]
+  static rdataFields = [['data', 'charstrs']]
+  static tags = ['obsolete']
+
   constructor(opts) {
     super(opts)
   }
@@ -17,23 +23,6 @@ export default class SPF extends TXT {
   getDescription() {
     return 'Sender Policy Framework'
   }
-
-  getTags() {
-    return ['deprecated']
-  }
-
-  getRdataFields(arg) {
-    return ['data']
-  }
-
-  getRFCs() {
-    return [4408, 7208]
-  }
-
-  getTypeId() {
-    return 99
-  }
-
   getCanonical() {
     return {
       owner: 'example.com.',
@@ -61,6 +50,10 @@ export default class SPF extends TXT {
   }
 
   /******  EXPORTERS   *******/
+  getWireRdata() {
+    return super.getWireRdata()
+  }
+
   toTinydns() {
     const rdata = TINYDNS.escapeOctal(new RegExp(/[\r\n\t:\\/]/, 'g'), this.get('data'))
     return this.getTinydnsGeneric(rdata)

package/rr/srv.js

@@ -2,61 +2,25 @@ import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
 
 export default class SRV extends RR {
+  static typeName = 'SRV'
+  static typeId = 33
+  static RFCs = [2782]
+  static rdataFields = [
+    ['priority', 'u16'],
+    ['weight', 'u16'],
+    ['port', 'u16'],
+    ['target', 'fqdn'],
+  ]
+  static tags = ['common']
+
   constructor(opts) {
     super(opts)
   }
 
-  /****** Resource record specific setters   *******/
-  setPriority(val) {
-    this.is16bitInt('SRV', 'priority', val)
-
-    this.set('priority', val)
-  }
-
-  setPort(val) {
-    this.is16bitInt('SRV', 'port', val)
-
-    this.set('port', val)
-  }
-
-  setWeight(val) {
-    this.is16bitInt('SRV', 'weight', val)
-
-    this.set('weight', val)
-  }
-
-  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`)
-
-    this.isFullyQualified('SRV', 'target', val)
-    this.isValidHostname('SRV', 'target', val)
-
-    // RFC 4034: letters in the DNS names are lower cased
-    this.set('target', val.toLowerCase())
-  }
-
   getDescription() {
     return 'Service'
   }
 
-  getTags() {
-    return ['common']
-  }
-
-  getRdataFields(arg) {
-    return ['priority', 'weight', 'port', 'target']
-  }
-
-  getRFCs() {
-    return [2782]
-  }
-
-  getTypeId() {
-    return 33
-  }
-
   getCanonical() {
     return {
       owner: '_imaps._tcp.example.com.',
@@ -102,23 +66,19 @@ export default class SRV extends RR {
     })
   }
 
-  fromBind({ bindline }) {
-    // test.example.com  3600  IN  SRV Priority Weight Port Target
-    const [owner, ttl, c, type, pri, weight, port, target] = bindline.split(/\s+/)
-    return new SRV({
-      owner: owner,
-      ttl: parseInt(ttl, 10),
-      class: c,
-      type: type,
-      priority: parseInt(pri, 10),
-      weight: parseInt(weight, 10),
-      port: parseInt(port, 10),
-      target: target,
-    })
-  }
-
   /******  EXPORTERS   *******/
 
+  getWireRdata() {
+    const target = this.wirePackDomain(this.get('target'))
+    const result = new Uint8Array(6 + target.length)
+    const dv = new DataView(result.buffer)
+    dv.setUint16(0, this.get('priority'))
+    dv.setUint16(2, this.get('weight'))
+    dv.setUint16(4, this.get('port'))
+    result.set(target, 6)
+    return result
+  }
+
   toTinydns() {
     let rdata = ''
 

package/rr/sshfp.js

@@ -1,18 +1,22 @@
 import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
+import * as BINARY from '../lib/binary.js'
 
 export default class SSHFP extends RR {
+  static typeName = 'SSHFP'
+  static typeId = 44
+  static RFCs = [4255, 7479, 8709]
+  static rdataFields = [
+    ['algorithm', 'u8'],
+    ['fptype', 'u8'],
+    ['fingerprint', 'hex'],
+  ]
+  static tags = ['security']
+
   constructor(opts) {
     super(opts)
   }
 
-  /****** Resource record specific setters   *******/
-  setAlgorithm(val) {
-    this.is8bitInt('SSHFP', 'algorithm', val)
-
-    this.set('algorithm', val)
-  }
-
   getAlgorithmOptions() {
     return new Map([
       [0, 'reserved'],
@@ -24,12 +28,6 @@ export default class SSHFP extends RR {
     ])
   }
 
-  setFptype(val) {
-    this.is8bitInt('SSHFP', 'fptype', val)
-
-    this.set('fptype', val)
-  }
-
   getFptypeOptions() {
     return new Map([
       [0, 'reserved'],
@@ -38,30 +36,10 @@ export default class SSHFP extends RR {
     ])
   }
 
-  setFingerprint(val) {
-    this.set('fingerprint', val)
-  }
-
   getDescription() {
     return 'Secure Shell Key Fingerprints'
   }
 
-  getTags() {
-    return ['security']
-  }
-
-  getRdataFields() {
-    return ['algorithm', 'fptype', 'fingerprint']
-  }
-
-  getRFCs() {
-    return [4255, 7479, 8709]
-  }
-
-  getTypeId() {
-    return 44
-  }
-
   getCanonical() {
     return {
       owner: 'mail.example.com.',
@@ -77,32 +55,18 @@ export default class SSHFP extends RR {
   /******  IMPORTERS   *******/
   fromTinydns({ tinyline }) {
     // SSHFP via generic, :fqdn:n:rdata:ttl:timestamp:lo
-    const [fqdn, n, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
-    if (n != 44) this.throwHelp('SSHFP fromTinydns, invalid n')
+    const { owner, typeId, rdata, ttl, timestamp, location } = this.parseTinydnsLine(tinyline)
+    if (typeId != this.getTypeId()) this.throwHelp('SSHFP fromTinydns, invalid n')
 
     return new SSHFP({
-      owner: this.fullyQualify(fqdn),
-      ttl: parseInt(ttl, 10),
+      owner,
+      ttl,
       type: 'SSHFP',
       algorithm: TINYDNS.octalToUInt8(rdata.slice(0, 4)),
       fptype: TINYDNS.octalToUInt8(rdata.slice(4, 8)),
       fingerprint: TINYDNS.octalToHex(rdata.slice(8)),
-      timestamp: ts,
-      location: loc?.trim() ?? '',
-    })
-  }
-
-  fromBind({ bindline }) {
-    // test.example.com  3600  IN  SSHFP  algo fptype fp
-    const [owner, ttl, c, type, algo, fptype, fp] = bindline.split(/\s+/)
-    return new SSHFP({
-      owner,
-      ttl: parseInt(ttl, 10),
-      class: c,
-      type: type,
-      algorithm: parseInt(algo, 10),
-      fptype: parseInt(fptype, 10),
-      fingerprint: fp,
+      timestamp,
+      location,
     })
   }
 
@@ -115,4 +79,12 @@ export default class SSHFP extends RR {
         TINYDNS.packHex(this.get('fingerprint')),
     )
   }
+
+  getWireRdata() {
+    const bytes = new Uint8Array(2 + BINARY.hexToBytes(this.get('fingerprint')).length)
+    bytes[0] = this.get('algorithm')
+    bytes[1] = this.get('fptype')
+    bytes.set(BINARY.hexToBytes(this.get('fingerprint')), 2)
+    return bytes
+  }
 }

package/rr/svcb.js

@@ -1,8 +1,18 @@
 import RR from '../rr.js'
 
 import * as TINYDNS from '../lib/tinydns.js'
+import * as WIRE from '../lib/wire.js'
 
 export default class SVCB extends RR {
+  static typeName = 'SVCB'
+  static typeId = 64
+  static RFCs = [9460]
+  static rdataFields = [
+    ['priority', 'u16'],
+    ['target name', 'fqdn'],
+    ['params', 'svcparams'],
+  ]
+
   constructor(opts) {
     super(opts)
   }
@@ -32,18 +42,6 @@ export default class SVCB extends RR {
     return 'Service Binding'
   }
 
-  getRdataFields(arg) {
-    return ['priority', 'target name', 'params']
-  }
-
-  getRFCs() {
-    return [9460]
-  }
-
-  getTypeId() {
-    return 64
-  }
-
   getCanonical() {
     return {
       owner: '_8443._foo.api.example.com.',
@@ -75,40 +73,19 @@ export default class SVCB extends RR {
   }
 
   fromTinydns({ tinyline }) {
-    const [owner, _typeId, rd, ttl, ts, loc] = tinyline.slice(1).split(':')
-
-    if (rd.length < 6) {
-      this.throwHelp(`SVCB: RDATA too short: ${rd}`)
-    }
-
-    // Convert escaped octal RDATA into a binary buffer for reliable parsing
-    const binary = Buffer.from(TINYDNS.octalToChar(rd), 'binary')
-
-    const priority = binary.readUInt16BE(0)
-
-    // parse domain name from binary starting at offset 2
-    let pos = 2
-    const labels = []
-    while (true) {
-      const len = binary.readUInt8(pos)
-      pos += 1
-      if (len === 0) break
-      labels.push(binary.slice(pos, pos + len).toString())
-      pos += len
-    }
-    const targetName = `${labels.join('.')}.`
-    // remaining params are ASCII text after the domain
-    const params = binary.slice(pos).toString()
+    const { owner, typeId, rdata, ttl, timestamp, location } = this.parseTinydnsLine(tinyline)
+    if (typeId != this.getTypeId()) this.throwHelp('SVCB fromTinydns, invalid n')
+    const { priority, targetName, params } = TINYDNS.parseSvcbLikeRdata(rdata, 'SVCB')
 
     return new SVCB({
-      owner: this.fullyQualify(owner),
-      ttl: parseInt(ttl, 10),
+      owner,
+      ttl,
       type: 'SVCB',
       priority: priority,
       'target name': targetName,
       params: params,
-      timestamp: ts,
-      location: loc?.trim() ?? '',
+      timestamp,
+      location,
     })
   }
 
@@ -123,4 +100,14 @@ export default class SVCB extends RR {
         TINYDNS.escapeOctal(dataRe, this.get('params')),
     )
   }
+
+  getWireRdata() {
+    const targetBytes = this.wirePackDomain(this.get('target name'))
+    const paramsBytes = WIRE.svcParamsToWire(this.get('params'))
+    const result = new Uint8Array(2 + targetBytes.length + paramsBytes.length)
+    new DataView(result.buffer).setUint16(0, this.get('priority'))
+    result.set(targetBytes, 2)
+    result.set(paramsBytes, 2 + targetBytes.length)
+    return result
+  }
 }

package/rr/tlsa.js

@@ -1,8 +1,20 @@
 import RR from '../rr.js'
 
 import * as TINYDNS from '../lib/tinydns.js'
+import * as BINARY from '../lib/binary.js'
 
 export default class TLSA extends RR {
+  static typeName = 'TLSA'
+  static typeId = 52
+  static RFCs = [6698, 7671]
+  static rdataFields = [
+    ['certificate usage', 'u8'],
+    ['selector', 'u8'],
+    ['matching type', 'u8'],
+    ['certificate association data', 'hex'],
+  ]
+  static tags = ['security']
+
   constructor(opts) {
     super(opts)
   }
@@ -58,22 +70,6 @@ export default class TLSA extends RR {
     return 'TLSA certificate association'
   }
 
-  getTags() {
-    return ['security']
-  }
-
-  getRdataFields(arg) {
-    return ['certificate usage', 'selector', 'matching type', 'certificate association data']
-  }
-
-  getRFCs() {
-    return [6698, 7671]
-  }
-
-  getTypeId() {
-    return 52
-  }
-
   getCanonical() {
     return {
       owner: '_443._tcp.www.example.com.',
@@ -87,10 +83,6 @@ export default class TLSA extends RR {
     }
   }
 
-  getQuotedFields() {
-    return []
-  }
-
   /******  IMPORTERS   *******/
 
   fromBind({ bindline }) {
@@ -114,33 +106,41 @@ export default class TLSA extends RR {
   }
 
   fromTinydns({ tinyline }) {
-    const [fqdn, n, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
-    if (n != 52) this.throwHelp('TLSA fromTinydns, invalid n')
+    const { owner, typeId, rdata, ttl, timestamp, location } = this.parseTinydnsLine(tinyline)
+    if (typeId != this.getTypeId()) this.throwHelp('TLSA fromTinydns, invalid n')
 
-    const bytes = Buffer.from(TINYDNS.octalToChar(rdata), 'binary')
+    const bytes = TINYDNS.octalRdataToBytes(rdata)
 
     return new TLSA({
-      owner: this.fullyQualify(fqdn),
-      ttl: parseInt(ttl, 10),
+      owner,
+      ttl,
       type: 'TLSA',
-      'certificate usage': bytes.readUInt8(0),
-      selector: bytes.readUInt8(1),
-      'matching type': bytes.readUInt8(2),
-      'certificate association data': bytes.slice(3).toString(),
-      timestamp: ts,
-      location: loc?.trim() ?? '',
+      'certificate usage': bytes[0],
+      selector: bytes[1],
+      'matching type': bytes[2],
+      'certificate association data': BINARY.bytesToHex(bytes.subarray(3)),
+      timestamp,
+      location,
     })
   }
 
   /******  EXPORTERS   *******/
   toTinydns() {
-    const dataRe = new RegExp(/[\r\n\t:\\/]/, 'g')
-
     return this.getTinydnsGeneric(
       TINYDNS.UInt8toOctal(this.get('certificate usage')) +
         TINYDNS.UInt8toOctal(this.get('selector')) +
         TINYDNS.UInt8toOctal(this.get('matching type')) +
-        TINYDNS.escapeOctal(dataRe, this.get('certificate association data')),
+        TINYDNS.packHex(this.get('certificate association data').replace(/[\s()]/g, '')),
     )
   }
+
+  getWireRdata() {
+    const cadBytes = BINARY.hexToBytes(this.get('certificate association data').replace(/[\s()]/g, ''))
+    const bytes = new Uint8Array(3 + cadBytes.length)
+    bytes[0] = this.get('certificate usage')
+    bytes[1] = this.get('selector')
+    bytes[2] = this.get('matching type')
+    bytes.set(cadBytes, 3)
+    return bytes
+  }
 }