@nictool/dns-resource-record 1.6.0 → 1.7.0

package/rr/ptr.js

@@ -1,6 +1,13 @@
 import RR from '../rr.js'
 
 export default class PTR extends RR {
+  static typeName = 'PTR'
+  static typeId = 12
+  static RFCs = [1035]
+  static tinydnsType = '^'
+  static rdataFields = [['dname', 'fqdn']]
+  static tags = ['common']
+
   constructor(opts) {
     super(opts)
   }
@@ -18,22 +25,6 @@ export default class PTR extends RR {
     return 'Pointer'
   }
 
-  getTags() {
-    return ['common']
-  }
-
-  getRdataFields(arg) {
-    return ['dname']
-  }
-
-  getRFCs() {
-    return [1035]
-  }
-
-  getTypeId() {
-    return 12
-  }
-
   getCanonical() {
     return {
       owner: '2.2.0.192.in-addr.arpa.',
@@ -44,39 +35,8 @@ export default class PTR extends RR {
     }
   }
 
-  /******  IMPORTERS   *******/
-  fromTinydns({ tinyline }) {
-    // ^fqdn:p:ttl:timestamp:lo
-    const [fqdn, p, ttl, ts, loc] = tinyline.slice(1).split(':')
-
-    return new PTR({
-      owner: this.fullyQualify(fqdn),
-      ttl: parseInt(ttl, 10),
-      type: 'PTR',
-      dname: this.fullyQualify(p),
-      timestamp: ts,
-      location: loc?.trim() ?? '',
-    })
-  }
-
-  fromBind({ bindline }) {
-    // test.example.com  3600  IN  PTR  dname
-    const [owner, ttl, c, type, dname] = bindline.split(/\s+/)
-    return new PTR({
-      owner,
-      ttl: parseInt(ttl, 10),
-      class: c,
-      type: type,
-      dname: dname,
-    })
-  }
-
   /******  EXPORTERS   *******/
   getWireRdata() {
     return this.wirePackDomain(this.get('dname'))
   }
-
-  toTinydns() {
-    return `^${this.getTinyFQDN('owner')}:${this.getTinyFQDN('dname')}:${this.getTinydnsPostamble()}\n`
-  }
 }

package/rr/rp.js

@@ -3,6 +3,12 @@ import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
 
 export default class RP extends RR {
+  static typeName = 'RP'
+  static rdataFields = [
+    ['mbox', 'fqdn'],
+    ['txt', 'fqdn'],
+  ]
+
   constructor(opts) {
     super(opts)
   }
@@ -27,23 +33,9 @@ export default class RP extends RR {
   getDescription() {
     return 'Responsible Person'
   }
-
-  getTags() {
-    return ['obsolete']
-  }
-
-  getRdataFields(arg) {
-    return ['mbox', 'txt']
-  }
-
-  getRFCs() {
-    return [1183]
-  }
-
-  getTypeId() {
-    return 17
-  }
-
+  static tags = ['obsolete']
+  static RFCs = [1183]
+  static typeId = 17
   getCanonical() {
     return {
       owner: 'example.com.',
@@ -56,19 +48,6 @@ export default class RP extends RR {
   }
 
   /******  IMPORTERS   *******/
-  fromBind({ bindline }) {
-    // test.example.com  3600  IN  RP  mbox txt
-    const [owner, ttl, c, type, mbox, txt] = bindline.split(/\s+/)
-    return new RP({
-      owner,
-      ttl: parseInt(ttl, 10),
-      class: c,
-      type,
-      mbox,
-      txt,
-    })
-  }
-
   fromTinydns({ tinyline }) {
     const [owner, _typeId, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
 
@@ -87,8 +66,14 @@ export default class RP extends RR {
   }
 
   /******  EXPORTERS   *******/
-  toBind(zone_opts) {
-    return `${this.getPrefix(zone_opts)}\t${this.getFQDN('mbox', zone_opts)}\t${this.getFQDN('txt', zone_opts)}\n`
+
+  getWireRdata() {
+    const mbox = this.wirePackDomain(this.get('mbox'))
+    const txt = this.wirePackDomain(this.get('txt'))
+    const result = new Uint8Array(mbox.length + txt.length)
+    result.set(mbox, 0)
+    result.set(txt, mbox.length)
+    return result
   }
 
   toTinydns() {

package/rr/rrsig.js

@@ -1,17 +1,44 @@
 import RR from '../rr.js'
 import * as TINYDNS from '../lib/tinydns.js'
+import * as WIRE from '../lib/binary.js'
+import * as WIRELIB from '../lib/wire.js'
 
 export default class RRSIG extends RR {
+  static typeName = 'RRSIG'
+  static typeId = 46
+  static RFCs = [4034]
+  static rdataFields = [
+    ['type covered', 'u16'],
+    ['algorithm', 'u8'],
+    ['labels', 'u8'],
+    ['original ttl', 'u32'],
+    ['signature expiration', 'u32'],
+    ['signature inception', 'u32'],
+    ['key tag', 'u16'],
+    ['signers name', 'fqdn'],
+    ['signature', 'str'],
+  ]
+  static tags = ['dnssec']
+
   constructor(opts) {
     super(opts)
   }
 
   /****** Resource record specific setters   *******/
   setTypeCovered(val) {
-    // a 2 octet Type Covered field
-    if (!val) this.throwHelp(`RRSIG: 'type covered' is required`)
-    if (val.length > 2) this.throwHelp(`RRSIG: 'type covered' is too long`)
-
+    // a 16-bit Type Covered field (RFC 4034 §3.1.1)
+    if (!val && val !== 0) this.throwHelp(`RRSIG: 'type covered' is required`)
+    if (typeof val === 'string') {
+      const typeNN = val.match(/^TYPE(\d+)$/i)
+      if (typeNN) {
+        val = parseInt(typeNN[1], 10)
+      } else {
+        const id = WIRE.DNS_TYPE_IDS[val.toUpperCase()]
+        if (id === undefined) this.throwHelp(`RRSIG: 'type covered' is not a recognized type name`)
+        val = id
+      }
+    }
+    this.is16bitInt('RRSIG', 'type covered', val)
     this.set('type covered', val)
   }
 
@@ -34,76 +61,10 @@ export default class RRSIG extends RR {
     ])
   }
 
-  setLabels(val) {
-    // a 1 octet Labels field
-    this.is8bitInt('RRSIG', 'labels', val)
-
-    this.set('labels', val)
-  }
-
-  setOriginalTtl(val) {
-    // a 4 octet Original TTL field
-    this.is32bitInt('RRSIG', 'original ttl', val)
-
-    this.set('original ttl', val)
-  }
-
-  setSignatureExpiration(val) {
-    // a 4 octet Signature Expiration field
-    this.set('signature expiration', val)
-  }
-
-  setSignatureInception(val) {
-    // a 4 octet Signature Inception field
-    this.set('signature inception', val)
-  }
-
-  setKeyTag(val) {
-    // a 2 octet Key tag
-    this.set('key tag', val)
-  }
-
-  setSignersName(val) {
-    // the Signer's Name field
-    this.set('signers name', val)
-  }
-
-  setSignature(val) {
-    // the Signature field.
-
-    this.set('signature', val)
-  }
-
   getDescription() {
     return 'Resource Record Signature'
   }
 
-  getTags() {
-    return ['dnssec']
-  }
-
-  getRdataFields(arg) {
-    return [
-      'type covered',
-      'algorithm',
-      'labels',
-      'original ttl',
-      'signature expiration',
-      'signature inception',
-      'key tag',
-      'signers name',
-      'signature',
-    ]
-  }
-
-  getRFCs() {
-    return [4034]
-  }
-
-  getTypeId() {
-    return 46
-  }
-
   getCanonical() {
     return {
       owner: 'example.com.',
@@ -127,12 +88,20 @@ export default class RRSIG extends RR {
   fromBind({ bindline }) {
     // example.com. 3600 IN RRSIG typecovered algorithm labels origttl sigexp siginc keytag signersname ( signature )
     const parts = bindline.trim().split(/\s+/)
+    const typeCoveredStr = parts[4]
+    // type covered may be a type name ('A', 'MX'), TYPEnn (RFC 3597), or a numeric ID
+    const typeNN = typeCoveredStr.match(/^TYPE(\d+)$/i)
+    const typeCovered = /^\d+$/.test(typeCoveredStr)
+      ? parseInt(typeCoveredStr, 10)
+      : typeNN
+        ? parseInt(typeNN[1], 10)
+        : (WIRE.DNS_TYPE_IDS[typeCoveredStr.toUpperCase()] ?? parseInt(typeCoveredStr, 10))
     return new RRSIG({
       owner: parts[0],
       ttl: parseInt(parts[1], 10),
       class: parts[2],
       type: 'RRSIG',
-      'type covered': parseInt(parts[4], 10),
+      'type covered': typeCovered,
       algorithm: parseInt(parts[5], 10),
       labels: parseInt(parts[6], 10),
       'original ttl': parseInt(parts[7], 10),
@@ -152,25 +121,26 @@ export default class RRSIG extends RR {
     const [fqdn, n, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
     if (parseInt(n, 10) !== this.getTypeId()) this.throwHelp('RRSIG fromTinydns, invalid n')
 
-    const bytes = Buffer.from(TINYDNS.octalToChar(rdata), 'binary')
-    const typeCovered = bytes.readUInt16BE(0)
-    const algorithm = bytes.readUInt8(2)
-    const labels = bytes.readUInt8(3)
-    const originalTtl = bytes.readUInt32BE(4)
-    const signatureExpiration = bytes.readUInt32BE(8)
-    const signatureInception = bytes.readUInt32BE(12)
-    const keyTag = bytes.readUInt16BE(16)
+    const bytes = Uint8Array.from(TINYDNS.octalToChar(rdata), (c) => c.charCodeAt(0))
+    const dv = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength)
+    const typeCovered = dv.getUint16(0)
+    const algorithm = bytes[2]
+    const labels = bytes[3]
+    const originalTtl = dv.getUint32(4)
+    const signatureExpiration = dv.getUint32(8)
+    const signatureInception = dv.getUint32(12)
+    const keyTag = dv.getUint16(16)
 
     let pos = 18
     const labelArr = []
     while (pos < bytes.length) {
-      const len = bytes.readUInt8(pos++)
+      const len = bytes[pos++]
       if (len === 0) break
-      labelArr.push(bytes.slice(pos, pos + len).toString())
+      labelArr.push(new TextDecoder().decode(bytes.subarray(pos, pos + len)))
       pos += len
     }
     const signersName = `${labelArr.join('.')}.`
-    const signature = bytes.slice(pos).toString()
+    const signature = new TextDecoder().decode(bytes.subarray(pos))
 
     return new RRSIG({
       owner: this.fullyQualify(fqdn),
@@ -191,9 +161,6 @@ export default class RRSIG extends RR {
   }
 
   /******  EXPORTERS   *******/
-  toBind(zone_opts) {
-    return `${this.getPrefix(zone_opts)}\t${this.get('type covered')}\t${this.get('algorithm')}\t${this.get('labels')}\t${this.get('original ttl')}\t${this.get('signature expiration')}\t${this.get('signature inception')}\t${this.get('key tag')}\t${this.getFQDN('signers name', zone_opts)}\t${this.get('signature')}\n`
-  }
 
   toTinydns() {
     const dataRe = new RegExp(/[\r\n\t:]/, 'g')
@@ -209,4 +176,32 @@ export default class RRSIG extends RR {
         TINYDNS.escapeOctal(dataRe, this.get('signature')),
     )
   }
+
+  getWireRdata() {
+    const signerBytes = WIRELIB.wirePackDomain(this.get('signers name'))
+    const sigBytes = new TextEncoder().encode(this.get('signature'))
+
+    const totalLen = 2 + 1 + 1 + 4 + 4 + 4 + 2 + signerBytes.length + sigBytes.length
+    const bytes = new Uint8Array(totalLen)
+    const dv = new DataView(bytes.buffer, bytes.byteOffset)
+
+    let pos = 0
+    dv.setUint16(pos, this.get('type covered'))
+    pos += 2
+    bytes[pos++] = this.get('algorithm')
+    bytes[pos++] = this.get('labels')
+    dv.setUint32(pos, this.get('original ttl'))
+    pos += 4
+    dv.setUint32(pos, this.get('signature expiration'))
+    pos += 4
+    dv.setUint32(pos, this.get('signature inception'))
+    pos += 4
+    dv.setUint16(pos, this.get('key tag'))
+    pos += 2
+    bytes.set(signerBytes, pos)
+    pos += signerBytes.length
+    bytes.set(sigBytes, pos)
+
+    return bytes
+  }
 }

package/rr/sig.js

@@ -1,8 +1,26 @@
 import RR from '../rr.js'
 
 import * as TINYDNS from '../lib/tinydns.js'
+import * as WIRE from '../lib/binary.js'
+import * as WIRELIB from '../lib/wire.js'
 
 export default class SIG extends RR {
+  static typeName = 'SIG'
+  static typeId = 24
+  static RFCs = [2535, 3755]
+  static rdataFields = [
+    ['type covered', 'u16'],
+    ['algorithm', 'u8'],
+    ['labels', 'u8'],
+    ['original ttl', 'u32'],
+    ['signature expiration', 'u32'],
+    ['signature inception', 'u32'],
+    ['key tag', 'u16'],
+    ['signers name', 'fqdn'],
+    ['signature', 'str'],
+  ]
+  static tags = ['obsolete']
+
   constructor(opts) {
     super(opts)
   }
@@ -68,32 +86,6 @@ export default class SIG extends RR {
     return 'Signature'
   }
 
-  getTags() {
-    return ['obsolete']
-  }
-
-  getRdataFields(arg) {
-    return [
-      'type covered',
-      'algorithm',
-      'labels',
-      'original ttl',
-      'signature expiration',
-      'signature inception',
-      'key tag',
-      'signers name',
-      'signature',
-    ]
-  }
-
-  getRFCs() {
-    return [2535, 3755]
-  }
-
-  getTypeId() {
-    return 24
-  }
-
   getCanonical() {
     return {
       owner: 'example.com.',
@@ -117,13 +109,17 @@ export default class SIG extends RR {
   fromBind({ bindline }) {
     // example.com. 3600 IN SIG TypeCovered Algorithm Labels OrigTTL SigExpiration SigInception KeyTag SignersName ( Signature )
     const parts = bindline.trim().split(/\s+/)
+    const typeCoveredStr = parts[4]
+    const typeCovered = /^\d+$/.test(typeCoveredStr)
+      ? parseInt(typeCoveredStr, 10)
+      : (WIRE.DNS_TYPE_IDS[typeCoveredStr.toUpperCase()] ?? parseInt(typeCoveredStr, 10))
 
     return new SIG({
       owner: parts[0],
       ttl: parseInt(parts[1], 10),
       class: parts[2],
       type: 'SIG',
-      'type covered': parseInt(parts[4], 10),
+      'type covered': typeCovered,
       algorithm: parseInt(parts[5], 10),
       labels: parseInt(parts[6], 10),
       'original ttl': parseInt(parts[7], 10),
@@ -156,36 +152,65 @@ export default class SIG extends RR {
     )
   }
 
+  getWireRdata() {
+    const signerBytes = WIRELIB.wirePackDomain(this.get('signers name'))
+    const sigBytes = new TextEncoder().encode(this.get('signature'))
+
+    const totalLen = 2 + 1 + 1 + 4 + 4 + 4 + 2 + signerBytes.length + sigBytes.length
+    const bytes = new Uint8Array(totalLen)
+    const dv = new DataView(bytes.buffer, bytes.byteOffset)
+
+    let pos = 0
+    dv.setUint16(pos, this.get('type covered'))
+    pos += 2
+    bytes[pos++] = this.get('algorithm')
+    bytes[pos++] = this.get('labels')
+    dv.setUint32(pos, this.get('original ttl'))
+    pos += 4
+    dv.setUint32(pos, this.get('signature expiration'))
+    pos += 4
+    dv.setUint32(pos, this.get('signature inception'))
+    pos += 4
+    dv.setUint16(pos, this.get('key tag'))
+    pos += 2
+    bytes.set(signerBytes, pos)
+    pos += signerBytes.length
+    bytes.set(sigBytes, pos)
+
+    return bytes
+  }
+
   fromTinydns({ tinyline }) {
-    const [fqdn, n, rdata, ttl, ts, loc] = tinyline.substring(1).split(':')
-    if (parseInt(n, 10) !== this.getTypeId()) this.throwHelp('SIG fromTinydns, invalid n')
+    const { owner, typeId, rdata, ttl, timestamp, location } = this.parseTinydnsLine(tinyline)
+    if (parseInt(typeId, 10) !== this.getTypeId()) this.throwHelp('SIG fromTinydns, invalid n')
 
-    const bytes = Buffer.from(TINYDNS.octalToChar(rdata), 'binary')
+    const bytes = TINYDNS.octalRdataToBytes(rdata)
+    const dv = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength)
 
-    const typeCovered = bytes.readUInt16BE(0)
-    const algorithm = bytes.readUInt8(2)
-    const labels = bytes.readUInt8(3)
-    const originalTtl = bytes.readUInt32BE(4)
-    const signatureExpiration = bytes.readUInt32BE(8)
-    const signatureInception = bytes.readUInt32BE(12)
-    const keyTag = bytes.readUInt16BE(16)
+    const typeCovered = dv.getUint16(0)
+    const algorithm = bytes[2]
+    const labels = bytes[3]
+    const originalTtl = dv.getUint32(4)
+    const signatureExpiration = dv.getUint32(8)
+    const signatureInception = dv.getUint32(12)
+    const keyTag = dv.getUint16(16)
 
-    // parse signers name from binary buffer starting at offset 18
+    // parse signers name from binary starting at offset 18
     let pos = 18
     const labelsArr = []
     while (pos < bytes.length) {
-      const len = bytes.readUInt8(pos++)
+      const len = bytes[pos++]
       if (len === 0) break
-      labelsArr.push(bytes.slice(pos, pos + len).toString())
+      labelsArr.push(new TextDecoder().decode(bytes.subarray(pos, pos + len)))
       pos += len
     }
     const signersName = `${labelsArr.join('.')}.`
 
-    const signature = bytes.slice(pos).toString()
+    const signature = new TextDecoder().decode(bytes.subarray(pos))
 
     return new SIG({
-      owner: this.fullyQualify(fqdn),
-      ttl: parseInt(ttl, 10),
+      owner,
+      ttl,
       type: 'SIG',
       'type covered': typeCovered,
       algorithm,
@@ -196,8 +221,8 @@ export default class SIG extends RR {
       'key tag': keyTag,
       'signers name': signersName,
       signature,
-      timestamp: ts,
-      location: loc?.trim() ?? '',
+      timestamp,
+      location,
     })
   }
 

package/rr/smimea.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 SMIMEA extends RR {
+  static typeName = 'SMIMEA'
+  static typeId = 53
+  static RFCs = [8162]
+  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 SMIMEA extends RR {
     return 'S/MIME cert association'
   }
 
-  getTags() {
-    return ['security']
-  }
-
-  getRdataFields(arg) {
-    return ['certificate usage', 'selector', 'matching type', 'certificate association data']
-  }
-
-  getRFCs() {
-    return [8162]
-  }
-
-  getTypeId() {
-    return 53
-  }
-
   getCanonical() {
     return {
       owner: '_443._tcp.www.example.com.',
@@ -87,10 +83,6 @@ export default class SMIMEA extends RR {
     }
   }
 
-  getQuotedFields() {
-    return []
-  }
-
   /******  IMPORTERS   *******/
 
   fromBind({ bindline }) {
@@ -109,31 +101,39 @@ export default class SMIMEA extends RR {
   }
 
   fromTinydns({ tinyline }) {
-    const [owner, _typeId, rdata, ttl, ts, loc] = tinyline.slice(1).split(':')
-    const binaryRdata = Buffer.from(TINYDNS.octalToChar(rdata), 'binary')
+    const { owner, rdata, ttl, timestamp, location } = this.parseTinydnsLine(tinyline)
+    const binaryRdata = TINYDNS.octalRdataToBytes(rdata)
 
     return new SMIMEA({
-      owner: this.fullyQualify(owner),
-      ttl: parseInt(ttl, 10),
+      owner,
+      ttl,
       type: 'SMIMEA',
-      'certificate usage': binaryRdata.readUInt8(0),
-      selector: binaryRdata.readUInt8(1),
-      'matching type': binaryRdata.readUInt8(2),
-      'certificate association data': binaryRdata.slice(3).toString(),
-      timestamp: ts,
-      location: loc?.trim() ?? '',
+      'certificate usage': binaryRdata[0],
+      selector: binaryRdata[1],
+      'matching type': binaryRdata[2],
+      'certificate association data': BINARY.bytesToHex(binaryRdata.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
+  }
 }