LittleChest/Dohna-NS
1
0
Fork 0
mirror of https://github.com/LittleChest/Dohna-NS.git synced 2026-05-06 22:44:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

common: Catch errors when decoding base64

Browse Source
This commit is contained in:
LittleChest 2026-01-29 14:13:56 +08:00
parent 0c3cb5e6aa
commit e8c40e9d7c
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common.js
View File

@ -4,7 +4,7 @@ export default async function handler(
api = "https://dns.google/resolve", api = "https://dns.google/resolve",
ipv4Prefix = 32, ipv4Prefix = 32,
ipv6Prefix = 128, ipv6Prefix = 128,
rawIP rawIP,
) { ) {
const { method, headers, url } = request; const { method, headers, url } = request;
const { search, searchParams, pathname } = new URL(url); const { search, searchParams, pathname } = new URL(url);
@ -39,11 +39,13 @@ export default async function handler(
// GET // GET
if (method === "GET" && searchParams.has("dns")) { if (method === "GET" && searchParams.has("dns")) {
// Decode the base64-encoded DNS query // Decode the base64-encoded DNS query
try {
const decodedQuery = atob(searchParams.get("dns")); const decodedQuery = atob(searchParams.get("dns"));
queryData = new Uint8Array(decodedQuery.length); queryData = new Uint8Array(decodedQuery.length);
for (let i = 0; i < decodedQuery.length; i++) { for (let i = 0; i < decodedQuery.length; i++) {
queryData[i] = decodedQuery.charCodeAt(i); queryData[i] = decodedQuery.charCodeAt(i);
} }
} catch {}
} }
// POST // POST
@ -179,13 +181,13 @@ function createOptRecord(ip, ipv4Prefix, ipv6Prefix) {
let family; let family;
if (isIPv4(ip)) { if (isIPv4(ip)) {
const prefixLength = ipv4Prefix const prefixLength = ipv4Prefix;
// Convert client IP to bytes // Convert client IP to bytes
const ipParts = ip.split(".").map((part) => parseInt(part, 10)); const ipParts = ip.split(".").map((part) => parseInt(part, 10));
family = 1; // IPv4 family = 1; // IPv4
ecsData = [0, 8, 0, 8, 0, family, prefixLength, 0, ...ipParts]; ecsData = [0, 8, 0, 8, 0, family, prefixLength, 0, ...ipParts];
} else if (isIPv6(ip)) { } else if (isIPv6(ip)) {
const prefixLength = ipv6Prefix const prefixLength = ipv6Prefix;
// Convert client IP to bytes // Convert client IP to bytes
const ipParts = ipv6ToBytes(ip); const ipParts = ipv6ToBytes(ip);
family = 2; // IPv6 family = 2; // IPv6
@ -249,7 +251,7 @@ function ipv6ToBytes(ipv6) {
function combineQueryData(headerAndQuestion, optRecord) { function combineQueryData(headerAndQuestion, optRecord) {
// Combine the header and question section with the new OPT record // Combine the header and question section with the new OPT record
const newQueryData = new Uint8Array( const newQueryData = new Uint8Array(
headerAndQuestion.length + optRecord.length headerAndQuestion.length + optRecord.length,
); );
newQueryData.set(headerAndQuestion, 0); newQueryData.set(headerAndQuestion, 0);
newQueryData.set(optRecord, headerAndQuestion.length); newQueryData.set(optRecord, headerAndQuestion.length);