Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { OpenAttestationDNSTextRecord, OpenAttestationDNSTextRecordT } from "./r
import { OpenAttestationDnsDidRecord, OpenAttestationDnsDidRecordT } from "./records/dnsDid";
import { getLogger } from "./util/logger";
import { CodedError, DnsproveStatusCode } from "./common/error";
import { aliDnsResolver, cloudflareDnsResolver, googleDnsResolver } from "./util/dns-resolvers";
import { aliDnsResolver, cloudflareDnsResolver, googleDnsResolver, proxyDnsResolver } from "./util/dns-resolvers";

const { trace } = getLogger("index");

Expand All @@ -24,7 +24,12 @@ interface GenericObject {

export type CustomDnsResolver = (domain: string) => Promise<IDNSQueryResponse>;

export const defaultDnsResolvers: CustomDnsResolver[] = [googleDnsResolver, cloudflareDnsResolver, aliDnsResolver];
export const defaultDnsResolvers: CustomDnsResolver[] = [
googleDnsResolver,
cloudflareDnsResolver,
proxyDnsResolver,
aliDnsResolver,
];

/**
* Returns true for strings that are openattestation records
Expand Down
35 changes: 35 additions & 0 deletions src/util/dns-resolvers/dns-resolvers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { http, HttpResponse } from "msw";
import { aliDnsResolver } from "./ali-dns-resolver";
import { cloudflareDnsResolver } from "./cloudflare-dns-resolver";
import { googleDnsResolver } from "./google-dns-resolver";
import { proxyDnsResolver } from "./proxy-dns-resolver";

const emptyDnsJson = {
Status: 0,
Expand Down Expand Up @@ -118,3 +119,37 @@ describe("aliDnsResolver", () => {
await expect(aliDnsResolver("")).rejects.toThrow("Domain is required");
});
});

describe("proxyDnsResolver", () => {
let server: SetupServerApi | undefined;

afterEach(() => {
server?.close();
});

test("requests proxy DNS JSON with name, TXT type, and encoded query", async () => {
server = setupServer(
http.get("https://dns.opencerts.io/resolve", ({ request }) => {
const url = new URL(request.url);
expect(url.searchParams.get("name")).toBe("oc example.test");
expect(url.searchParams.get("type")).toBe("TXT");
return HttpResponse.json(emptyDnsJson);
})
);
server.listen();

const out = await proxyDnsResolver("oc example.test");
expect(out).toMatchObject({ Status: 0, Answer: [] });
});

test("throws when proxy DNS returns non-2xx", async () => {
server = setupServer(http.get("https://dns.opencerts.io/resolve", () => new HttpResponse(null, { status: 502 })));
server.listen();

await expect(proxyDnsResolver("oc.example.test")).rejects.toThrow(/HTTP 502/);
});

test("throws when domain is empty", async () => {
await expect(proxyDnsResolver("")).rejects.toThrow("Domain is required");
});
});
1 change: 1 addition & 0 deletions src/util/dns-resolvers/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from "./google-dns-resolver";
export * from "./cloudflare-dns-resolver";
export * from "./ali-dns-resolver";
export * from "./proxy-dns-resolver";
28 changes: 28 additions & 0 deletions src/util/dns-resolvers/proxy-dns-resolver.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import type { CustomDnsResolver, IDNSQueryResponse } from "../..";

/** Server-side DoH proxy that forwards to Google/Cloudflare upstream — reachable from regions where direct access to those endpoints is blocked. */
export const proxyDnsResolver: CustomDnsResolver = async (domain) => {
const url = new URL("https://dns.opencerts.io/resolve");

if (!domain) {
throw new Error("Domain is required");
}
Comment thread
rongquan1 marked this conversation as resolved.

url.searchParams.set("name", domain);
url.searchParams.set("type", "TXT");

const res = await fetch(url);

if (!res.ok) {
throw new Error(`Proxy DNS request failed: HTTP ${res.status}`);
}
Comment thread
rongquan1 marked this conversation as resolved.

let data;
try {
data = await res.json();
} catch {
throw new Error("Failed to parse DNS response JSON");
}

return data as IDNSQueryResponse;
};
Loading