@push.rocks/smartdns 6.1.1 → 6.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts_server/classes.dnssec.d.ts +31 -0
- package/dist_ts_server/classes.dnssec.js +139 -0
- package/dist_ts_server/classes.dnsserver.d.ts +22 -2
- package/dist_ts_server/classes.dnsserver.js +241 -8
- package/dist_ts_server/plugins.d.ts +1 -1
- package/dist_ts_server/plugins.js +2 -2
- package/npmextra.json +7 -4
- package/package.json +8 -5
- package/readme.md +265 -5
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
interface DnssecZone {
|
|
2
|
+
zone: string;
|
|
3
|
+
algorithm: 'ECDSA' | 'ED25519' | 'RSA';
|
|
4
|
+
keySize: number;
|
|
5
|
+
days: number;
|
|
6
|
+
}
|
|
7
|
+
interface DnssecKeyPair {
|
|
8
|
+
privateKey: string;
|
|
9
|
+
publicKey: string;
|
|
10
|
+
}
|
|
11
|
+
export declare class DnsSec {
|
|
12
|
+
private zone;
|
|
13
|
+
private keyPair;
|
|
14
|
+
private ec?;
|
|
15
|
+
private eddsa?;
|
|
16
|
+
constructor(zone: DnssecZone);
|
|
17
|
+
private generateKeyPair;
|
|
18
|
+
getAlgorithmNumber(): number;
|
|
19
|
+
signData(data: Buffer): Buffer;
|
|
20
|
+
private generateDNSKEY;
|
|
21
|
+
private computeKeyTag;
|
|
22
|
+
private getDNSKEYRecord;
|
|
23
|
+
getDSRecord(): string;
|
|
24
|
+
getKeyPair(): DnssecKeyPair;
|
|
25
|
+
getDsAndKeyPair(): {
|
|
26
|
+
keyPair: DnssecKeyPair;
|
|
27
|
+
dsRecord: string;
|
|
28
|
+
dnskeyRecord: string;
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
export {};
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
// Import necessary plugins from plugins.ts
|
|
2
|
+
import * as plugins from './plugins.js';
|
|
3
|
+
export class DnsSec {
|
|
4
|
+
constructor(zone) {
|
|
5
|
+
this.zone = zone;
|
|
6
|
+
// Initialize the appropriate cryptographic instance based on the algorithm
|
|
7
|
+
switch (this.zone.algorithm) {
|
|
8
|
+
case 'ECDSA':
|
|
9
|
+
this.ec = new plugins.elliptic.ec('p256'); // Use P-256 curve for ECDSA
|
|
10
|
+
break;
|
|
11
|
+
case 'ED25519':
|
|
12
|
+
this.eddsa = new plugins.elliptic.eddsa('ed25519');
|
|
13
|
+
break;
|
|
14
|
+
case 'RSA':
|
|
15
|
+
// RSA implementation would go here
|
|
16
|
+
throw new Error('RSA algorithm is not yet implemented.');
|
|
17
|
+
default:
|
|
18
|
+
throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
|
|
19
|
+
}
|
|
20
|
+
// Generate the key pair
|
|
21
|
+
this.keyPair = this.generateKeyPair();
|
|
22
|
+
}
|
|
23
|
+
generateKeyPair() {
|
|
24
|
+
let privateKey;
|
|
25
|
+
let publicKey;
|
|
26
|
+
switch (this.zone.algorithm) {
|
|
27
|
+
case 'ECDSA':
|
|
28
|
+
if (!this.ec)
|
|
29
|
+
throw new Error('EC instance is not initialized.');
|
|
30
|
+
const ecKeyPair = this.ec.genKeyPair();
|
|
31
|
+
privateKey = ecKeyPair.getPrivate('hex');
|
|
32
|
+
publicKey = ecKeyPair.getPublic(false, 'hex'); // Uncompressed format
|
|
33
|
+
break;
|
|
34
|
+
case 'ED25519':
|
|
35
|
+
if (!this.eddsa)
|
|
36
|
+
throw new Error('EdDSA instance is not initialized.');
|
|
37
|
+
const secret = plugins.crypto.randomBytes(32);
|
|
38
|
+
const edKeyPair = this.eddsa.keyFromSecret(secret);
|
|
39
|
+
privateKey = edKeyPair.getSecret('hex');
|
|
40
|
+
publicKey = edKeyPair.getPublic('hex');
|
|
41
|
+
break;
|
|
42
|
+
case 'RSA':
|
|
43
|
+
// RSA key generation would be implemented here
|
|
44
|
+
throw new Error('RSA key generation is not yet implemented.');
|
|
45
|
+
default:
|
|
46
|
+
throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
|
|
47
|
+
}
|
|
48
|
+
return { privateKey, publicKey };
|
|
49
|
+
}
|
|
50
|
+
getAlgorithmNumber() {
|
|
51
|
+
switch (this.zone.algorithm) {
|
|
52
|
+
case 'ECDSA':
|
|
53
|
+
return 13; // ECDSAP256SHA256
|
|
54
|
+
case 'ED25519':
|
|
55
|
+
return 15;
|
|
56
|
+
case 'RSA':
|
|
57
|
+
return 8; // RSASHA256
|
|
58
|
+
default:
|
|
59
|
+
throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
signData(data) {
|
|
63
|
+
// Sign the data using the private key
|
|
64
|
+
const keyPair = this.ec.keyFromPrivate(this.keyPair.privateKey, 'hex');
|
|
65
|
+
const signature = keyPair.sign(plugins.crypto.createHash('sha256').update(data).digest());
|
|
66
|
+
return Buffer.from(signature.toDER());
|
|
67
|
+
}
|
|
68
|
+
generateDNSKEY() {
|
|
69
|
+
const flags = 256; // 256 indicates a Zone Signing Key (ZSK)
|
|
70
|
+
const protocol = 3; // Must be 3 according to RFC
|
|
71
|
+
const algorithm = this.getAlgorithmNumber();
|
|
72
|
+
let publicKeyData;
|
|
73
|
+
switch (this.zone.algorithm) {
|
|
74
|
+
case 'ECDSA':
|
|
75
|
+
if (!this.ec)
|
|
76
|
+
throw new Error('EC instance is not initialized.');
|
|
77
|
+
const ecPublicKey = this.ec.keyFromPublic(this.keyPair.publicKey, 'hex').getPublic();
|
|
78
|
+
const x = ecPublicKey.getX().toArrayLike(Buffer, 'be', 32);
|
|
79
|
+
const y = ecPublicKey.getY().toArrayLike(Buffer, 'be', 32);
|
|
80
|
+
publicKeyData = Buffer.concat([x, y]);
|
|
81
|
+
break;
|
|
82
|
+
case 'ED25519':
|
|
83
|
+
publicKeyData = Buffer.from(this.keyPair.publicKey, 'hex');
|
|
84
|
+
break;
|
|
85
|
+
case 'RSA':
|
|
86
|
+
// RSA public key extraction would go here
|
|
87
|
+
throw new Error('RSA public key extraction is not yet implemented.');
|
|
88
|
+
default:
|
|
89
|
+
throw new Error(`Unsupported algorithm: ${this.zone.algorithm}`);
|
|
90
|
+
}
|
|
91
|
+
// Construct the DNSKEY RDATA
|
|
92
|
+
const dnskeyRdata = Buffer.concat([
|
|
93
|
+
Buffer.from([flags >> 8, flags & 0xff]), // Flags (2 bytes)
|
|
94
|
+
Buffer.from([protocol]), // Protocol (1 byte)
|
|
95
|
+
Buffer.from([algorithm]), // Algorithm (1 byte)
|
|
96
|
+
publicKeyData, // Public Key
|
|
97
|
+
]);
|
|
98
|
+
return dnskeyRdata;
|
|
99
|
+
}
|
|
100
|
+
computeKeyTag(dnskeyRdata) {
|
|
101
|
+
// Key Tag calculation as per RFC 4034, Appendix B
|
|
102
|
+
let acc = 0;
|
|
103
|
+
for (let i = 0; i < dnskeyRdata.length; i++) {
|
|
104
|
+
acc += i & 1 ? dnskeyRdata[i] : dnskeyRdata[i] << 8;
|
|
105
|
+
}
|
|
106
|
+
acc += (acc >> 16) & 0xffff;
|
|
107
|
+
return acc & 0xffff;
|
|
108
|
+
}
|
|
109
|
+
getDNSKEYRecord() {
|
|
110
|
+
const dnskeyRdata = this.generateDNSKEY();
|
|
111
|
+
const flags = 256;
|
|
112
|
+
const protocol = 3;
|
|
113
|
+
const algorithm = this.getAlgorithmNumber();
|
|
114
|
+
const publicKeyData = dnskeyRdata.slice(4); // Skip flags, protocol, algorithm bytes
|
|
115
|
+
const publicKeyBase64 = publicKeyData.toString('base64');
|
|
116
|
+
return `${this.zone.zone}. IN DNSKEY ${flags} ${protocol} ${algorithm} ${publicKeyBase64}`;
|
|
117
|
+
}
|
|
118
|
+
getDSRecord() {
|
|
119
|
+
const dnskeyRdata = this.generateDNSKEY();
|
|
120
|
+
const keyTag = this.computeKeyTag(dnskeyRdata);
|
|
121
|
+
const algorithm = this.getAlgorithmNumber();
|
|
122
|
+
const digestType = 2; // SHA-256
|
|
123
|
+
const digest = plugins.crypto
|
|
124
|
+
.createHash('sha256')
|
|
125
|
+
.update(dnskeyRdata)
|
|
126
|
+
.digest('hex')
|
|
127
|
+
.toUpperCase();
|
|
128
|
+
return `${this.zone.zone}. IN DS ${keyTag} ${algorithm} ${digestType} ${digest}`;
|
|
129
|
+
}
|
|
130
|
+
getKeyPair() {
|
|
131
|
+
return this.keyPair;
|
|
132
|
+
}
|
|
133
|
+
getDsAndKeyPair() {
|
|
134
|
+
const dsRecord = this.getDSRecord();
|
|
135
|
+
const dnskeyRecord = this.getDNSKEYRecord();
|
|
136
|
+
return { keyPair: this.keyPair, dsRecord, dnskeyRecord };
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kbnNzZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90c19zZXJ2ZXIvY2xhc3Nlcy5kbnNzZWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsMkNBQTJDO0FBQzNDLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBY3hDLE1BQU0sT0FBTyxNQUFNO0lBTWpCLFlBQVksSUFBZ0I7UUFDMUIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7UUFFakIsMkVBQTJFO1FBQzNFLFFBQVEsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUM1QixLQUFLLE9BQU87Z0JBQ1YsSUFBSSxDQUFDLEVBQUUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsNEJBQTRCO2dCQUN2RSxNQUFNO1lBQ1IsS0FBSyxTQUFTO2dCQUNaLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztnQkFDbkQsTUFBTTtZQUNSLEtBQUssS0FBSztnQkFDUixtQ0FBbUM7Z0JBQ25DLE1BQU0sSUFBSSxLQUFLLENBQUMsdUNBQXVDLENBQUMsQ0FBQztZQUMzRDtnQkFDRSxNQUFNLElBQUksS0FBSyxDQUFDLDBCQUEwQixJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7UUFDckUsQ0FBQztRQUVELHdCQUF3QjtRQUN4QixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztJQUN4QyxDQUFDO0lBRU8sZUFBZTtRQUNyQixJQUFJLFVBQWtCLENBQUM7UUFDdkIsSUFBSSxTQUFpQixDQUFDO1FBRXRCLFFBQVEsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUM1QixLQUFLLE9BQU87Z0JBQ1YsSUFBSSxDQUFDLElBQUksQ0FB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
|
|
@@ -1,20 +1,40 @@
|
|
|
1
|
-
import * as
|
|
1
|
+
import * as dnsPacket from 'dns-packet';
|
|
2
2
|
interface IDnsServerOptions {
|
|
3
3
|
httpsKey: string;
|
|
4
4
|
httpsCert: string;
|
|
5
5
|
httpsPort: number;
|
|
6
6
|
udpPort: number;
|
|
7
|
+
dnssecZone: string;
|
|
8
|
+
}
|
|
9
|
+
interface DnsAnswer {
|
|
10
|
+
name: string;
|
|
11
|
+
type: string;
|
|
12
|
+
class: string | number;
|
|
13
|
+
ttl: number;
|
|
14
|
+
data: any;
|
|
7
15
|
}
|
|
8
16
|
export declare class DnsServer {
|
|
9
17
|
private options;
|
|
10
18
|
private udpServer;
|
|
11
19
|
private httpsServer;
|
|
12
20
|
private handlers;
|
|
21
|
+
private dnsSec;
|
|
22
|
+
private dnskeyRecord;
|
|
23
|
+
private keyTag;
|
|
13
24
|
constructor(options: IDnsServerOptions);
|
|
14
|
-
registerHandler(domainPattern: string, recordTypes: string[], handler: (question:
|
|
25
|
+
registerHandler(domainPattern: string, recordTypes: string[], handler: (question: dnsPacket.Question) => DnsAnswer | null): void;
|
|
15
26
|
private processDnsRequest;
|
|
27
|
+
private isDnssecRequested;
|
|
28
|
+
private generateRRSIG;
|
|
29
|
+
private serializeRRset;
|
|
30
|
+
private serializeRData;
|
|
31
|
+
private parseDNSKEYRecord;
|
|
32
|
+
private computeKeyTag;
|
|
16
33
|
private handleHttpsRequest;
|
|
17
34
|
start(): Promise<void>;
|
|
18
35
|
stop(): Promise<void>;
|
|
36
|
+
private qtypeToNumber;
|
|
37
|
+
private classToNumber;
|
|
38
|
+
private nameToBuffer;
|
|
19
39
|
}
|
|
20
40
|
export {};
|
|
@@ -1,8 +1,22 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
import { DnsSec } from './classes.dnssec.js';
|
|
3
|
+
import * as dnsPacket from 'dns-packet';
|
|
2
4
|
export class DnsServer {
|
|
3
5
|
constructor(options) {
|
|
4
6
|
this.options = options;
|
|
5
7
|
this.handlers = [];
|
|
8
|
+
// Initialize DNSSEC
|
|
9
|
+
this.dnsSec = new DnsSec({
|
|
10
|
+
zone: options.dnssecZone,
|
|
11
|
+
algorithm: 'ECDSA', // You can change this based on your needs
|
|
12
|
+
keySize: 256,
|
|
13
|
+
days: 365,
|
|
14
|
+
});
|
|
15
|
+
// Generate DNSKEY and DS records
|
|
16
|
+
const { dsRecord, dnskeyRecord } = this.dnsSec.getDsAndKeyPair();
|
|
17
|
+
// Parse DNSKEY record into dns-packet format
|
|
18
|
+
this.dnskeyRecord = this.parseDNSKEYRecord(dnskeyRecord);
|
|
19
|
+
this.keyTag = this.computeKeyTag(this.dnskeyRecord);
|
|
6
20
|
}
|
|
7
21
|
registerHandler(domainPattern, recordTypes, handler) {
|
|
8
22
|
this.handlers.push({ domainPattern, recordTypes, handler });
|
|
@@ -11,19 +25,50 @@ export class DnsServer {
|
|
|
11
25
|
const response = {
|
|
12
26
|
type: 'response',
|
|
13
27
|
id: request.id,
|
|
14
|
-
flags:
|
|
28
|
+
flags: dnsPacket.AUTHORITATIVE_ANSWER |
|
|
29
|
+
dnsPacket.RECURSION_AVAILABLE |
|
|
30
|
+
(request.flags & dnsPacket.RECURSION_DESIRED ? dnsPacket.RECURSION_DESIRED : 0),
|
|
15
31
|
questions: request.questions,
|
|
16
32
|
answers: [],
|
|
33
|
+
additionals: [],
|
|
17
34
|
};
|
|
35
|
+
const dnssecRequested = this.isDnssecRequested(request);
|
|
18
36
|
for (const question of request.questions) {
|
|
19
37
|
console.log(`Query for ${question.name} of type ${question.type}`);
|
|
20
38
|
let answered = false;
|
|
39
|
+
// Handle DNSKEY queries if DNSSEC is requested
|
|
40
|
+
if (dnssecRequested && question.type === 'DNSKEY' && question.name === this.options.dnssecZone) {
|
|
41
|
+
const dnskeyAnswer = {
|
|
42
|
+
name: question.name,
|
|
43
|
+
type: 'DNSKEY',
|
|
44
|
+
class: 'IN',
|
|
45
|
+
ttl: 3600,
|
|
46
|
+
data: this.dnskeyRecord,
|
|
47
|
+
};
|
|
48
|
+
response.answers.push(dnskeyAnswer);
|
|
49
|
+
// Sign the DNSKEY RRset
|
|
50
|
+
const rrsig = this.generateRRSIG('DNSKEY', [dnskeyAnswer], question.name);
|
|
51
|
+
response.answers.push(rrsig);
|
|
52
|
+
answered = true;
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
21
55
|
for (const handlerEntry of this.handlers) {
|
|
22
56
|
if (plugins.minimatch.minimatch(question.name, handlerEntry.domainPattern) &&
|
|
23
57
|
handlerEntry.recordTypes.includes(question.type)) {
|
|
24
58
|
const answer = handlerEntry.handler(question);
|
|
25
59
|
if (answer) {
|
|
26
|
-
|
|
60
|
+
// Ensure the answer has ttl and class
|
|
61
|
+
const dnsAnswer = {
|
|
62
|
+
...answer,
|
|
63
|
+
ttl: answer.ttl || 300,
|
|
64
|
+
class: answer.class || 'IN',
|
|
65
|
+
};
|
|
66
|
+
response.answers.push(dnsAnswer);
|
|
67
|
+
if (dnssecRequested) {
|
|
68
|
+
// Sign the answer RRset
|
|
69
|
+
const rrsig = this.generateRRSIG(question.type, [dnsAnswer], question.name);
|
|
70
|
+
response.answers.push(rrsig);
|
|
71
|
+
}
|
|
27
72
|
answered = true;
|
|
28
73
|
break;
|
|
29
74
|
}
|
|
@@ -31,20 +76,167 @@ export class DnsServer {
|
|
|
31
76
|
}
|
|
32
77
|
if (!answered) {
|
|
33
78
|
console.log(`No handler found for ${question.name} of type ${question.type}`);
|
|
79
|
+
response.flags |= dnsPacket.AUTHORITATIVE_ANSWER;
|
|
80
|
+
const soaAnswer = {
|
|
81
|
+
name: question.name,
|
|
82
|
+
type: 'SOA',
|
|
83
|
+
class: 'IN',
|
|
84
|
+
ttl: 3600,
|
|
85
|
+
data: {
|
|
86
|
+
mname: `ns1.${this.options.dnssecZone}`,
|
|
87
|
+
rname: `hostmaster.${this.options.dnssecZone}`,
|
|
88
|
+
serial: Math.floor(Date.now() / 1000),
|
|
89
|
+
refresh: 3600,
|
|
90
|
+
retry: 600,
|
|
91
|
+
expire: 604800,
|
|
92
|
+
minimum: 86400,
|
|
93
|
+
},
|
|
94
|
+
};
|
|
95
|
+
response.answers.push(soaAnswer);
|
|
34
96
|
}
|
|
35
97
|
}
|
|
36
98
|
return response;
|
|
37
99
|
}
|
|
100
|
+
isDnssecRequested(request) {
|
|
101
|
+
if (!request.additionals)
|
|
102
|
+
return false;
|
|
103
|
+
for (const additional of request.additionals) {
|
|
104
|
+
if (additional.type === 'OPT' && typeof additional.flags === 'number') {
|
|
105
|
+
// The DO bit is the 15th bit (0x8000)
|
|
106
|
+
if (additional.flags & 0x8000) {
|
|
107
|
+
return true;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
return false;
|
|
112
|
+
}
|
|
113
|
+
generateRRSIG(type, rrset, name) {
|
|
114
|
+
// Prepare RRSIG data
|
|
115
|
+
const algorithm = this.dnsSec.getAlgorithmNumber();
|
|
116
|
+
const keyTag = this.keyTag;
|
|
117
|
+
const signerName = this.options.dnssecZone.endsWith('.') ? this.options.dnssecZone : `${this.options.dnssecZone}.`;
|
|
118
|
+
const inception = Math.floor(Date.now() / 1000) - 3600; // 1 hour ago
|
|
119
|
+
const expiration = inception + 86400; // Valid for 1 day
|
|
120
|
+
const ttl = rrset[0].ttl || 300;
|
|
121
|
+
// Serialize the RRset in canonical form
|
|
122
|
+
const rrsetBuffer = this.serializeRRset(rrset);
|
|
123
|
+
// Sign the RRset
|
|
124
|
+
const signature = this.dnsSec.signData(rrsetBuffer);
|
|
125
|
+
// Construct the RRSIG record
|
|
126
|
+
const rrsig = {
|
|
127
|
+
name,
|
|
128
|
+
type: 'RRSIG',
|
|
129
|
+
class: 'IN',
|
|
130
|
+
ttl,
|
|
131
|
+
data: {
|
|
132
|
+
typeCovered: type, // Changed to type string
|
|
133
|
+
algorithm,
|
|
134
|
+
labels: name.split('.').length - 1,
|
|
135
|
+
originalTTL: ttl,
|
|
136
|
+
expiration,
|
|
137
|
+
inception,
|
|
138
|
+
keyTag,
|
|
139
|
+
signerName,
|
|
140
|
+
signature: signature,
|
|
141
|
+
},
|
|
142
|
+
};
|
|
143
|
+
return rrsig;
|
|
144
|
+
}
|
|
145
|
+
serializeRRset(rrset) {
|
|
146
|
+
// Implement canonical DNS RRset serialization as per RFC 4034 Section 6
|
|
147
|
+
const buffers = [];
|
|
148
|
+
for (const rr of rrset) {
|
|
149
|
+
if (rr.type === 'OPT') {
|
|
150
|
+
continue; // Skip OPT records
|
|
151
|
+
}
|
|
152
|
+
const name = rr.name.endsWith('.') ? rr.name : rr.name + '.';
|
|
153
|
+
const nameBuffer = this.nameToBuffer(name.toLowerCase());
|
|
154
|
+
const typeValue = this.qtypeToNumber(rr.type);
|
|
155
|
+
const typeBuffer = Buffer.alloc(2);
|
|
156
|
+
typeBuffer.writeUInt16BE(typeValue, 0);
|
|
157
|
+
const classValue = this.classToNumber(rr.class);
|
|
158
|
+
const classBuffer = Buffer.alloc(2);
|
|
159
|
+
classBuffer.writeUInt16BE(classValue, 0);
|
|
160
|
+
const ttlValue = rr.ttl || 300;
|
|
161
|
+
const ttlBuffer = Buffer.alloc(4);
|
|
162
|
+
ttlBuffer.writeUInt32BE(ttlValue, 0);
|
|
163
|
+
// Serialize the data based on the record type
|
|
164
|
+
const dataBuffer = this.serializeRData(rr.type, rr.data);
|
|
165
|
+
const rdLengthBuffer = Buffer.alloc(2);
|
|
166
|
+
rdLengthBuffer.writeUInt16BE(dataBuffer.length, 0);
|
|
167
|
+
buffers.push(Buffer.concat([nameBuffer, typeBuffer, classBuffer, ttlBuffer, rdLengthBuffer, dataBuffer]));
|
|
168
|
+
}
|
|
169
|
+
return Buffer.concat(buffers);
|
|
170
|
+
}
|
|
171
|
+
serializeRData(type, data) {
|
|
172
|
+
// Implement serialization for each record type you support
|
|
173
|
+
switch (type) {
|
|
174
|
+
case 'A':
|
|
175
|
+
return Buffer.from(data.split('.').map((octet) => parseInt(octet, 10)));
|
|
176
|
+
case 'AAAA':
|
|
177
|
+
// Handle IPv6 addresses
|
|
178
|
+
return Buffer.from(data.split(':').flatMap((segment) => {
|
|
179
|
+
const num = parseInt(segment, 16);
|
|
180
|
+
return [num >> 8, num & 0xff];
|
|
181
|
+
}));
|
|
182
|
+
case 'DNSKEY':
|
|
183
|
+
const dnskeyData = data;
|
|
184
|
+
return Buffer.concat([
|
|
185
|
+
Buffer.from([dnskeyData.flags >> 8, dnskeyData.flags & 0xff]),
|
|
186
|
+
Buffer.from([3]), // Protocol field, always 3
|
|
187
|
+
Buffer.from([dnskeyData.algorithm]),
|
|
188
|
+
dnskeyData.key,
|
|
189
|
+
]);
|
|
190
|
+
case 'SOA':
|
|
191
|
+
// Implement SOA record serialization if needed
|
|
192
|
+
// For now, return an empty buffer or handle as needed
|
|
193
|
+
return Buffer.alloc(0);
|
|
194
|
+
// Add cases for other record types as needed
|
|
195
|
+
default:
|
|
196
|
+
throw new Error(`Serialization for record type ${type} is not implemented.`);
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
parseDNSKEYRecord(dnskeyRecord) {
|
|
200
|
+
// Parse the DNSKEY record string into dns-packet format
|
|
201
|
+
const parts = dnskeyRecord.trim().split(/\s+/);
|
|
202
|
+
const flags = parseInt(parts[3], 10);
|
|
203
|
+
const algorithm = parseInt(parts[5], 10);
|
|
204
|
+
const publicKeyBase64 = parts.slice(6).join('');
|
|
205
|
+
const key = Buffer.from(publicKeyBase64, 'base64');
|
|
206
|
+
return {
|
|
207
|
+
flags,
|
|
208
|
+
algorithm,
|
|
209
|
+
key,
|
|
210
|
+
};
|
|
211
|
+
}
|
|
212
|
+
computeKeyTag(dnskeyRecord) {
|
|
213
|
+
// Compute key tag as per RFC 4034 Appendix B
|
|
214
|
+
const flags = dnskeyRecord.flags;
|
|
215
|
+
const algorithm = dnskeyRecord.algorithm;
|
|
216
|
+
const key = dnskeyRecord.key;
|
|
217
|
+
const dnskeyRdata = Buffer.concat([
|
|
218
|
+
Buffer.from([flags >> 8, flags & 0xff]),
|
|
219
|
+
Buffer.from([3]), // Protocol field, always 3
|
|
220
|
+
Buffer.from([algorithm]),
|
|
221
|
+
key,
|
|
222
|
+
]);
|
|
223
|
+
let acc = 0;
|
|
224
|
+
for (let i = 0; i < dnskeyRdata.length; i++) {
|
|
225
|
+
acc += (i & 1) ? dnskeyRdata[i] : dnskeyRdata[i] << 8;
|
|
226
|
+
}
|
|
227
|
+
acc += (acc >> 16) & 0xffff;
|
|
228
|
+
return acc & 0xffff;
|
|
229
|
+
}
|
|
38
230
|
handleHttpsRequest(req, res) {
|
|
39
231
|
if (req.method === 'POST' && req.url === '/dns-query') {
|
|
40
232
|
let body = [];
|
|
41
|
-
req.on('data', chunk => {
|
|
233
|
+
req.on('data', (chunk) => {
|
|
42
234
|
body.push(chunk);
|
|
43
235
|
}).on('end', () => {
|
|
44
236
|
const msg = Buffer.concat(body);
|
|
45
|
-
const request =
|
|
237
|
+
const request = dnsPacket.decode(msg);
|
|
46
238
|
const response = this.processDnsRequest(request);
|
|
47
|
-
const responseData =
|
|
239
|
+
const responseData = dnsPacket.encode(response);
|
|
48
240
|
res.writeHead(200, { 'Content-Type': 'application/dns-message' });
|
|
49
241
|
res.end(responseData);
|
|
50
242
|
});
|
|
@@ -61,9 +253,9 @@ export class DnsServer {
|
|
|
61
253
|
}, this.handleHttpsRequest.bind(this));
|
|
62
254
|
this.udpServer = plugins.dgram.createSocket('udp4');
|
|
63
255
|
this.udpServer.on('message', (msg, rinfo) => {
|
|
64
|
-
const request =
|
|
256
|
+
const request = dnsPacket.decode(msg);
|
|
65
257
|
const response = this.processDnsRequest(request);
|
|
66
|
-
const responseData =
|
|
258
|
+
const responseData = dnsPacket.encode(response);
|
|
67
259
|
this.udpServer.send(responseData, rinfo.port, rinfo.address);
|
|
68
260
|
});
|
|
69
261
|
this.udpServer.on('error', (err) => {
|
|
@@ -105,5 +297,46 @@ export class DnsServer {
|
|
|
105
297
|
});
|
|
106
298
|
await Promise.all([doneUdp.promise, doneHttps.promise]);
|
|
107
299
|
}
|
|
300
|
+
// Helper methods
|
|
301
|
+
qtypeToNumber(type) {
|
|
302
|
+
const QTYPE_NUMBERS = {
|
|
303
|
+
'A': 1,
|
|
304
|
+
'NS': 2,
|
|
305
|
+
'CNAME': 5,
|
|
306
|
+
'SOA': 6,
|
|
307
|
+
'PTR': 12,
|
|
308
|
+
'MX': 15,
|
|
309
|
+
'TXT': 16,
|
|
310
|
+
'AAAA': 28,
|
|
311
|
+
'SRV': 33,
|
|
312
|
+
'DNSKEY': 48,
|
|
313
|
+
'RRSIG': 46,
|
|
314
|
+
// Add more as needed
|
|
315
|
+
};
|
|
316
|
+
return QTYPE_NUMBERS[type.toUpperCase()] || 0;
|
|
317
|
+
}
|
|
318
|
+
classToNumber(cls) {
|
|
319
|
+
const CLASS_NUMBERS = {
|
|
320
|
+
'IN': 1,
|
|
321
|
+
'CH': 3,
|
|
322
|
+
'HS': 4,
|
|
323
|
+
// Add more as needed
|
|
324
|
+
};
|
|
325
|
+
if (typeof cls === 'number') {
|
|
326
|
+
return cls;
|
|
327
|
+
}
|
|
328
|
+
return CLASS_NUMBERS[cls.toUpperCase()] || 1;
|
|
329
|
+
}
|
|
330
|
+
nameToBuffer(name) {
|
|
331
|
+
const labels = name.split('.');
|
|
332
|
+
const buffers = labels.map(label => {
|
|
333
|
+
const len = Buffer.byteLength(label, 'utf8');
|
|
334
|
+
const buf = Buffer.alloc(1 + len);
|
|
335
|
+
buf.writeUInt8(len, 0);
|
|
336
|
+
buf.write(label, 1);
|
|
337
|
+
return buf;
|
|
338
|
+
});
|
|
339
|
+
return Buffer.concat([...buffers, Buffer.from([0])]); // Add root label
|
|
340
|
+
}
|
|
108
341
|
}
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kbnNzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90c19zZXJ2ZXIvY2xhc3Nlcy5kbnNzZXJ2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFleEMsTUFBTSxPQUFPLFNBQVM7SUFLcEIsWUFBb0IsT0FBMEI7UUFBMUIsWUFBTyxHQUFQLE9BQU8sQ0FBbUI7UUFGdEMsYUFBUSxHQUFrQixFQUFFLENBQUM7SUFFWSxDQUFDO0lBRTNDLGVBQWUsQ0FDcEIsYUFBcUIsRUFDckIsV0FBcUIsRUFDckIsT0FBa0Y7UUFFbEYsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxhQUFhLEVBQUUsV0FBVyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFDOUQsQ0FBQztJQUVPLGlCQUFpQixDQUFDLE9BQWlDO1FBQ3pELE1BQU0sUUFBUSxHQUE2QjtZQUN6QyxJQUFJLEVBQUUsVUFBVTtZQUNoQixFQUFFLEVBQUUsT0FBTyxDQUFDLEVBQUU7WUFDZCxLQUFLLEVBQUUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxpQkFBaUIsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLG1CQUFtQjtZQUNsRixTQUFTLEVBQUUsT0FBTyxDQUFDLFNBQVM7WUFDNUIsT0FBTyxFQUFFLEVBQUU7U0FDWixDQUFDO1FBRUYsS0FBSyxNQUFNLFFBQVEsSUFBSSxPQUFPLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDekMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLFFBQVEsQ0FBQyxJQUFJLFlBQVksUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7WUFFbkUsSUFBSSxRQUFRLEdBQUcsS0FBSyxDQUFDO1lBRXJCLEtBQUssTUFBTSxZQUFZLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO2dCQUN6QyxJQUNFLE9BQU8sQ0FBQyxTQUFTLENBQUMsU0FBUyxDQUFDLFFBQVEs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
|
|
342
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dnsserver.js","sourceRoot":"","sources":["../ts_server/classes.dnsserver.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import dgram from 'dgram';
|
|
|
6
6
|
export { crypto, fs, http, https, dgram, };
|
|
7
7
|
import * as smartpromise from '@push.rocks/smartpromise';
|
|
8
8
|
export { smartpromise, };
|
|
9
|
-
import
|
|
9
|
+
import elliptic from 'elliptic';
|
|
10
10
|
import * as dnsPacket from 'dns-packet';
|
|
11
11
|
import * as minimatch from 'minimatch';
|
|
12
12
|
export { dnsPacket, elliptic, minimatch, };
|
|
@@ -9,8 +9,8 @@ export { crypto, fs, http, https, dgram, };
|
|
|
9
9
|
import * as smartpromise from '@push.rocks/smartpromise';
|
|
10
10
|
export { smartpromise, };
|
|
11
11
|
// third party
|
|
12
|
-
import
|
|
12
|
+
import elliptic from 'elliptic';
|
|
13
13
|
import * as dnsPacket from 'dns-packet';
|
|
14
14
|
import * as minimatch from 'minimatch';
|
|
15
15
|
export { dnsPacket, elliptic, minimatch, };
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX3NlcnZlci9wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWM7QUFDZCxPQUFPLE1BQU0sTUFBTSxRQUFRLENBQUM7QUFDNUIsT0FBTyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3BCLE9BQU8sSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUN4QixPQUFPLEtBQUssTUFBTSxPQUFPLENBQUM7QUFDMUIsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBRTFCLE9BQU8sRUFDTCxNQUFNLEVBQ04sRUFBRSxFQUNGLElBQUksRUFDSixLQUFLLEVBQ0wsS0FBSyxHQUNOLENBQUE7QUFFRCxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUV6RCxPQUFPLEVBQ0wsWUFBWSxHQUNiLENBQUE7QUFFRCxjQUFjO0FBQ2QsT0FBTyxRQUFRLE1BQU0sVUFBVSxDQUFDO0FBQ2hDLE9BQU8sS0FBSyxTQUFTLE1BQU0sWUFBWSxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxTQUFTLE1BQU0sV0FBVyxDQUFDO0FBRXZDLE9BQU8sRUFDTCxTQUFTLEVBQ1QsUUFBUSxFQUNSLFNBQVMsR0FDVixDQUFBIn0=
|
package/npmextra.json
CHANGED
|
@@ -9,14 +9,17 @@
|
|
|
9
9
|
"npmPackagename": "@push.rocks/smartdns",
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"keywords": [
|
|
12
|
-
"DNS",
|
|
13
12
|
"TypeScript",
|
|
13
|
+
"DNS",
|
|
14
|
+
"DNS records",
|
|
15
|
+
"DNS resolution",
|
|
16
|
+
"DNS management",
|
|
17
|
+
"DNSSEC",
|
|
14
18
|
"Node.js",
|
|
15
19
|
"Google DNS",
|
|
16
20
|
"Cloudflare",
|
|
17
|
-
"DNS
|
|
18
|
-
"DNS
|
|
19
|
-
"DNSSEC"
|
|
21
|
+
"UDP DNS",
|
|
22
|
+
"HTTPS DNS"
|
|
20
23
|
]
|
|
21
24
|
}
|
|
22
25
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/smartdns",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.1",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A TypeScript library for smart DNS methods, supporting various DNS records and providers.",
|
|
6
6
|
"exports": {
|
|
@@ -13,14 +13,17 @@
|
|
|
13
13
|
"url": "https://code.foss.global/push.rocks/smartdns.git"
|
|
14
14
|
},
|
|
15
15
|
"keywords": [
|
|
16
|
-
"DNS",
|
|
17
16
|
"TypeScript",
|
|
17
|
+
"DNS",
|
|
18
|
+
"DNS records",
|
|
19
|
+
"DNS resolution",
|
|
20
|
+
"DNS management",
|
|
21
|
+
"DNSSEC",
|
|
18
22
|
"Node.js",
|
|
19
23
|
"Google DNS",
|
|
20
24
|
"Cloudflare",
|
|
21
|
-
"DNS
|
|
22
|
-
"DNS
|
|
23
|
-
"DNSSEC"
|
|
25
|
+
"UDP DNS",
|
|
26
|
+
"HTTPS DNS"
|
|
24
27
|
],
|
|
25
28
|
"author": "Lossless GmbH",
|
|
26
29
|
"license": "MIT",
|
package/readme.md
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
# @push.rocks/smartdns
|
|
2
|
-
|
|
3
|
-
smart dns methods written in TypeScript
|
|
2
|
+
A TypeScript library for smart DNS methods, supporting various DNS records and providers.
|
|
4
3
|
|
|
5
4
|
## Install
|
|
6
5
|
|
|
@@ -16,7 +15,7 @@ Or with `yarn`:
|
|
|
16
15
|
yarn add @push.rocks/smartdns
|
|
17
16
|
```
|
|
18
17
|
|
|
19
|
-
Make sure you have a TypeScript environment
|
|
18
|
+
Make sure you have a TypeScript environment set up to utilize the library effectively.
|
|
20
19
|
|
|
21
20
|
## Usage
|
|
22
21
|
|
|
@@ -39,6 +38,8 @@ Often, the need arises to fetch various DNS records for a domain. `@push.rocks/s
|
|
|
39
38
|
To fetch an "A" record for a domain:
|
|
40
39
|
|
|
41
40
|
```typescript
|
|
41
|
+
import { Smartdns } from '@push.rocks/smartdns';
|
|
42
|
+
|
|
42
43
|
const dnsManager = new Smartdns({});
|
|
43
44
|
const aRecords = await dnsManager.getRecordsA('example.com');
|
|
44
45
|
console.log(aRecords);
|
|
@@ -53,6 +54,15 @@ const aaaaRecords = await dnsManager.getRecordsAAAA('example.com');
|
|
|
53
54
|
console.log(aaaaRecords);
|
|
54
55
|
```
|
|
55
56
|
|
|
57
|
+
#### Fetching TXT Records
|
|
58
|
+
|
|
59
|
+
For "TXT" records:
|
|
60
|
+
|
|
61
|
+
```typescript
|
|
62
|
+
const txtRecords = await dnsManager.getRecordsTxt('example.com');
|
|
63
|
+
console.log(txtRecords);
|
|
64
|
+
```
|
|
65
|
+
|
|
56
66
|
### Advanced DNS Management
|
|
57
67
|
|
|
58
68
|
Beyond simple queries, `@push.rocks/smartdns` offers functionalities suitable for more complex DNS management scenarios.
|
|
@@ -94,6 +104,258 @@ if (featureFlags['NewFeature']) {
|
|
|
94
104
|
}
|
|
95
105
|
```
|
|
96
106
|
|
|
107
|
+
### DNS Server Implementation
|
|
108
|
+
|
|
109
|
+
To implement a DNS server, `@push.rocks/smartdns` includes classes and methods to set up a UDP and HTTPS DNS server supporting DNSSEC.
|
|
110
|
+
|
|
111
|
+
#### Basic DNS Server Example
|
|
112
|
+
|
|
113
|
+
Here's a basic example of a UDP/HTTPS DNS server:
|
|
114
|
+
|
|
115
|
+
```typescript
|
|
116
|
+
import { DnsServer } from '@push.rocks/smartdns';
|
|
117
|
+
|
|
118
|
+
const dnsServer = new DnsServer({
|
|
119
|
+
httpsKey: 'path/to/key.pem',
|
|
120
|
+
httpsCert: 'path/to/cert.pem',
|
|
121
|
+
httpsPort: 443,
|
|
122
|
+
udpPort: 53,
|
|
123
|
+
dnssecZone: 'example.com',
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
dnsServer.registerHandler('*.example.com', ['A'], (question) => ({
|
|
127
|
+
name: question.name,
|
|
128
|
+
type: 'A',
|
|
129
|
+
class: 'IN',
|
|
130
|
+
ttl: 300,
|
|
131
|
+
data: '127.0.0.1',
|
|
132
|
+
}));
|
|
133
|
+
|
|
134
|
+
dnsServer.start().then(() => console.log('DNS Server started'));
|
|
135
|
+
```
|
|
136
|
+
|
|
137
|
+
### DNSSEC Support
|
|
138
|
+
|
|
139
|
+
`@push.rocks/smartdns` provides support for DNSSEC, including the generation, signing, and validation of DNS records.
|
|
140
|
+
|
|
141
|
+
#### DNSSEC Configuration
|
|
142
|
+
|
|
143
|
+
To configure DNSSEC for your DNS server:
|
|
144
|
+
|
|
145
|
+
```typescript
|
|
146
|
+
import { DnsServer } from '@push.rocks/smartdns';
|
|
147
|
+
|
|
148
|
+
const dnsServer = new DnsServer({
|
|
149
|
+
httpsKey: 'path/to/key.pem',
|
|
150
|
+
httpsCert: 'path/to/cert.pem',
|
|
151
|
+
httpsPort: 443,
|
|
152
|
+
udpPort: 53,
|
|
153
|
+
dnssecZone: 'example.com',
|
|
154
|
+
});
|
|
155
|
+
|
|
156
|
+
dnsServer.registerHandler('*.example.com', ['A'], (question) => ({
|
|
157
|
+
name: question.name,
|
|
158
|
+
type: 'A',
|
|
159
|
+
class: 'IN',
|
|
160
|
+
ttl: 300,
|
|
161
|
+
data: '127.0.0.1',
|
|
162
|
+
}));
|
|
163
|
+
|
|
164
|
+
dnsServer.start().then(() => console.log('DNS Server with DNSSEC started'));
|
|
165
|
+
```
|
|
166
|
+
|
|
167
|
+
This setup ensures that DNS records are signed and can be verified for authenticity.
|
|
168
|
+
|
|
169
|
+
### Handling DNS Queries Over Different Protocols
|
|
170
|
+
|
|
171
|
+
The library supports handling DNS queries over UDP and HTTPS.
|
|
172
|
+
|
|
173
|
+
#### Handling UDP Queries
|
|
174
|
+
|
|
175
|
+
UDP is the traditional means of DNS query transport.
|
|
176
|
+
|
|
177
|
+
```typescript
|
|
178
|
+
import { DnsServer } from '@push.rocks/smartdns';
|
|
179
|
+
import dgram from 'dgram';
|
|
180
|
+
|
|
181
|
+
dnsServer.registerHandler('*.example.com', ['A'], (question) => ({
|
|
182
|
+
name: question.name,
|
|
183
|
+
type: 'A',
|
|
184
|
+
class: 'IN',
|
|
185
|
+
ttl: 300,
|
|
186
|
+
data: '127.0.0.1',
|
|
187
|
+
}));
|
|
188
|
+
|
|
189
|
+
dnsServer.start().then(() => {
|
|
190
|
+
console.log('UDP DNS Server started on port', dnsServer.getOptions().udpPort);
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
const client = dgram.createSocket('udp4');
|
|
194
|
+
|
|
195
|
+
client.on('message', (msg, rinfo) => {
|
|
196
|
+
console.log(`Received ${msg} from ${rinfo.address}:${rinfo.port}`);
|
|
197
|
+
});
|
|
198
|
+
|
|
199
|
+
client.send(Buffer.from('example DNS query'), dnsServer.getOptions().udpPort, 'localhost');
|
|
200
|
+
```
|
|
201
|
+
|
|
202
|
+
#### Handling HTTPS Queries
|
|
203
|
+
|
|
204
|
+
DNS over HTTPS (DoH) is increasingly adopted for privacy and security.
|
|
205
|
+
|
|
206
|
+
```typescript
|
|
207
|
+
import { DnsServer } from '@push.rocks/smartdns';
|
|
208
|
+
import https from 'https';
|
|
209
|
+
import fs from 'fs';
|
|
210
|
+
|
|
211
|
+
const dnsServer = new DnsServer({
|
|
212
|
+
httpsKey: fs.readFileSync('path/to/key.pem'),
|
|
213
|
+
httpsCert: fs.readFileSync('path/to/cert.pem'),
|
|
214
|
+
httpsPort: 443,
|
|
215
|
+
udpPort: 53,
|
|
216
|
+
dnssecZone: 'example.com',
|
|
217
|
+
});
|
|
218
|
+
|
|
219
|
+
dnsServer.registerHandler('*.example.com', ['A'], (question) => ({
|
|
220
|
+
name: question.name,
|
|
221
|
+
type: 'A',
|
|
222
|
+
class: 'IN',
|
|
223
|
+
ttl: 300,
|
|
224
|
+
data: '127.0.0.1',
|
|
225
|
+
}));
|
|
226
|
+
|
|
227
|
+
dnsServer.start().then(() => console.log('HTTPS DNS Server started'));
|
|
228
|
+
|
|
229
|
+
const client = https.request({
|
|
230
|
+
hostname: 'localhost',
|
|
231
|
+
port: 443,
|
|
232
|
+
path: '/dns-query',
|
|
233
|
+
method: 'POST',
|
|
234
|
+
headers: {
|
|
235
|
+
'Content-Type': 'application/dns-message'
|
|
236
|
+
}
|
|
237
|
+
}, (res) => {
|
|
238
|
+
res.on('data', (d) => {
|
|
239
|
+
process.stdout.write(d);
|
|
240
|
+
});
|
|
241
|
+
});
|
|
242
|
+
|
|
243
|
+
client.on('error', (e) => {
|
|
244
|
+
console.error(e);
|
|
245
|
+
});
|
|
246
|
+
|
|
247
|
+
client.write(Buffer.from('example DNS query'));
|
|
248
|
+
client.end();
|
|
249
|
+
```
|
|
250
|
+
|
|
251
|
+
### Testing
|
|
252
|
+
|
|
253
|
+
To ensure that the DNS server behaves as expected, it is important to write tests for various scenarios.
|
|
254
|
+
|
|
255
|
+
#### DNS Server Tests
|
|
256
|
+
|
|
257
|
+
Here is an example of how to test the DNS server with TAP:
|
|
258
|
+
|
|
259
|
+
```typescript
|
|
260
|
+
import { expect, tap } from '@push.rocks/tapbundle';
|
|
261
|
+
|
|
262
|
+
import { DnsServer } from '@push.rocks/smartdns';
|
|
263
|
+
|
|
264
|
+
let dnsServer: DnsServer;
|
|
265
|
+
|
|
266
|
+
tap.test('should create an instance of DnsServer', async () => {
|
|
267
|
+
dnsServer = new DnsServer({
|
|
268
|
+
httpsKey: 'path/to/key.pem',
|
|
269
|
+
httpsCert: 'path/to/cert.pem',
|
|
270
|
+
httpsPort: 443,
|
|
271
|
+
udpPort: 53,
|
|
272
|
+
dnssecZone: 'example.com',
|
|
273
|
+
});
|
|
274
|
+
expect(dnsServer).toBeInstanceOf(DnsServer);
|
|
275
|
+
});
|
|
276
|
+
|
|
277
|
+
tap.test('should start the server', async () => {
|
|
278
|
+
await dnsServer.start();
|
|
279
|
+
expect(dnsServer.isRunning()).toBeTrue();
|
|
280
|
+
});
|
|
281
|
+
|
|
282
|
+
tap.test('should add a DNS handler', async () => {
|
|
283
|
+
dnsServer.registerHandler('*.example.com', ['A'], (question) => ({
|
|
284
|
+
name: question.name,
|
|
285
|
+
type: 'A',
|
|
286
|
+
class: 'IN',
|
|
287
|
+
ttl: 300,
|
|
288
|
+
data: '127.0.0.1',
|
|
289
|
+
}));
|
|
290
|
+
|
|
291
|
+
const response = dnsServer.processDnsRequest({
|
|
292
|
+
type: 'query',
|
|
293
|
+
id: 1,
|
|
294
|
+
flags: 0,
|
|
295
|
+
questions: [
|
|
296
|
+
{
|
|
297
|
+
name: 'test.example.com',
|
|
298
|
+
type: 'A',
|
|
299
|
+
class: 'IN',
|
|
300
|
+
},
|
|
301
|
+
],
|
|
302
|
+
answers: [],
|
|
303
|
+
});
|
|
304
|
+
|
|
305
|
+
expect(response.answers[0]).toEqual({
|
|
306
|
+
name: 'test.example.com',
|
|
307
|
+
type: 'A',
|
|
308
|
+
class: 'IN',
|
|
309
|
+
ttl: 300,
|
|
310
|
+
data: '127.0.0.1',
|
|
311
|
+
});
|
|
312
|
+
});
|
|
313
|
+
|
|
314
|
+
tap.test('should query the server over HTTP', async () => {
|
|
315
|
+
// Assuming fetch or any HTTP client is available
|
|
316
|
+
const query = dnsPacket.encode({
|
|
317
|
+
type: 'query',
|
|
318
|
+
id: 2,
|
|
319
|
+
flags: dnsPacket.RECURSION_DESIRED,
|
|
320
|
+
questions: [
|
|
321
|
+
{
|
|
322
|
+
name: 'test.example.com',
|
|
323
|
+
type: 'A',
|
|
324
|
+
class: 'IN',
|
|
325
|
+
},
|
|
326
|
+
],
|
|
327
|
+
});
|
|
328
|
+
|
|
329
|
+
const response = await fetch('https://localhost:443/dns-query', {
|
|
330
|
+
method: 'POST',
|
|
331
|
+
body: query,
|
|
332
|
+
headers: {
|
|
333
|
+
'Content-Type': 'application/dns-message',
|
|
334
|
+
}
|
|
335
|
+
});
|
|
336
|
+
|
|
337
|
+
expect(response.status).toEqual(200);
|
|
338
|
+
|
|
339
|
+
const responseData = await response.arrayBuffer();
|
|
340
|
+
const dnsResponse = dnsPacket.decode(Buffer.from(responseData));
|
|
341
|
+
|
|
342
|
+
expect(dnsResponse.answers[0]).toEqual({
|
|
343
|
+
name: 'test.example.com',
|
|
344
|
+
type: 'A',
|
|
345
|
+
class: 'IN',
|
|
346
|
+
ttl: 300,
|
|
347
|
+
data: '127.0.0.1',
|
|
348
|
+
});
|
|
349
|
+
});
|
|
350
|
+
|
|
351
|
+
tap.test('should stop the server', async () => {
|
|
352
|
+
await dnsServer.stop();
|
|
353
|
+
expect(dnsServer.isRunning()).toBeFalse();
|
|
354
|
+
});
|
|
355
|
+
|
|
356
|
+
await tap.start();
|
|
357
|
+
```
|
|
358
|
+
|
|
97
359
|
### Conclusion
|
|
98
360
|
|
|
99
361
|
`@push.rocks/smartdns` offers a versatile set of tools for DNS querying and management, tailored for applications at any scale. The examples provided illustrate the library's potential use cases, highlighting its applicability in various scenarios from basic lookups to facilitating complex application features through DNS.
|
|
@@ -102,8 +364,6 @@ For the full spectrum of functionalities, including detailed method documentatio
|
|
|
102
364
|
|
|
103
365
|
Remember, DNS changes might take time to propagate worldwide, and the utility methods provided by `@push.rocks/smartdns` for checking record availability will be invaluable in managing these changes seamlessly.
|
|
104
366
|
|
|
105
|
-
|
|
106
|
-
|
|
107
367
|
## License and Legal Information
|
|
108
368
|
|
|
109
369
|
This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository.
|