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
51 changes: 51 additions & 0 deletions packages/channels/weixin/src/api.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { afterEach, describe, expect, it, vi } from 'vitest';
import { uploadToCdn } from './api.js';

describe('uploadToCdn', () => {
afterEach(() => {
vi.unstubAllGlobals();
});

it.each([
'HTTPS://novac2c.cdn.weixin.qq.com/c2c/upload?encrypted_query_param=abc',
'HtTpS://novac2c.cdn.weixin.qq.com/c2c/upload?encrypted_query_param=abc',
])('accepts %s CDN upload URLs', async (uploadUrl) => {
const fetchMock = vi.fn().mockResolvedValue({
ok: true,
status: 200,
headers: {
get: vi.fn((name: string) =>
name.toLowerCase() === 'x-encrypted-param' ? 'cdn-param' : null,
),
},
});
vi.stubGlobal('fetch', fetchMock);

await expect(
uploadToCdn(uploadUrl, 'filekey-123', Buffer.from('encrypted')),
).resolves.toBe('cdn-param');

expect(fetchMock).toHaveBeenCalledWith(
uploadUrl,
expect.objectContaining({
method: 'POST',
body: Buffer.from('encrypted'),
}),
);
});

it('rejects uppercase HTTP CDN upload URLs', async () => {
const fetchMock = vi.fn();
vi.stubGlobal('fetch', fetchMock);

await expect(
uploadToCdn(
'HTTP://novac2c.cdn.weixin.qq.com/c2c/upload?encrypted_query_param=abc',
'filekey-123',
Buffer.from('encrypted'),
),
).rejects.toThrow('CDN upload URL must use HTTPS');

expect(fetchMock).not.toHaveBeenCalled();
});
});
5 changes: 3 additions & 2 deletions packages/channels/weixin/src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -343,13 +343,14 @@ export async function uploadToCdn(
const CDN_HOST = 'novac2c.cdn.weixin.qq.com';

let url: string;
if (urlOrParam.startsWith('https://')) {
const lowerUrlOrParam = urlOrParam.toLowerCase();
if (lowerUrlOrParam.startsWith('https://')) {
const parsed = new URL(urlOrParam);
if (parsed.hostname !== CDN_HOST) {
throw new Error(`CDN upload URL has unexpected host: ${parsed.hostname}`);
}
url = urlOrParam;
} else if (urlOrParam.startsWith('http://')) {
} else if (lowerUrlOrParam.startsWith('http://')) {
throw new Error('CDN upload URL must use HTTPS');
} else {
url = `https://${CDN_HOST}/c2c/upload?encrypted_query_param=${encodeURIComponent(urlOrParam)}&filekey=${encodeURIComponent(filekey)}`;
Expand Down
Loading