Skip to content

fix: validate parseInt result in getTokenFromUrl #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dajiaohuang wants to merge 8 commits into
base: main
Choose a base branch
from
Open

fix: validate parseInt result in getTokenFromUrl #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf472b7
fix: resolve logic bug and mutable default argument in getUserDataForFid
dajiaohuang Sep 2, 2026
2bfc9dd
fix: resolve mutable default argument in getAddressForFid
dajiaohuang Sep 2, 2026
dac0c6d
fix: resolve mutable default argument in getAddressesForFid
dajiaohuang Sep 2, 2026
0f70607
fix: resolve mutable default argument in validateFrameMessage
dajiaohuang Sep 2, 2026
5852ccc
fix: resolve hubRequestOptions being overwritten in getFrameMessage
dajiaohuang Sep 2, 2026
4dec30e
fix: validate parseInt result in getTokenFromUrl
dajiaohuang Sep 2, 2026
0695957
fix: retain first user data value
dajiaohuang Sep 4, 2026
4a1d651
fix: preserve custom hub API keys
dajiaohuang Sep 4, 2026
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
16 changes: 10 additions & 6 deletions packages/frames.js/src/getAddressForFid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,20 @@ export async function getAddressForFid<
const {
fallbackToCustodyAddress = true,
hubHttpUrl = DEFAULT_HUB_API_URL,
hubRequestOptions = {
headers: {

@vercel vercel Bot Sep 2, 2026 •
edited
Loading

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Default public hub api_key is applied unconditionally and (in three of four files) overwrites a caller's own api_key, breaking authentication against custom/private hubs.

Fix on Vercel

api_key: DEFAULT_HUB_API_KEY,
},
},
hubRequestOptions = {},
} = options;

const requestOptions = {
...hubRequestOptions,
headers: {
...(hubRequestOptions.headers ?? {}),
api_key: DEFAULT_HUB_API_KEY,
},
};

const response = await fetch(
`${hubHttpUrl}/v1/verificationsByFid?fid=${fid}`,
hubRequestOptions
requestOptions
);
const { messages } = (await response
.clone()
Expand Down
16 changes: 10 additions & 6 deletions packages/frames.js/src/getAddressesForFid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,19 @@ export async function getAddressesForFid({
}): Promise<AddressWithType[]> {
const {
hubHttpUrl = DEFAULT_HUB_API_URL,
hubRequestOptions = {
headers: {
api_key: DEFAULT_HUB_API_KEY,
},
},
hubRequestOptions = {},
} = options;

const requestOptions = {
...hubRequestOptions,
headers: {
...(hubRequestOptions.headers ?? {}),
api_key: DEFAULT_HUB_API_KEY,
},
};

const [verificationsResponse, custodyAddress] = await Promise.all([
fetch(`${hubHttpUrl}/v1/verificationsByFid?fid=${fid}`, hubRequestOptions),
fetch(`${hubHttpUrl}/v1/verificationsByFid?fid=${fid}`, requestOptions),
getCustodyAddressForFid(fid),
]);

Expand Down
4 changes: 3 additions & 1 deletion packages/frames.js/src/getFrameMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ export async function getFrameMessage<T extends GetFrameMessageOptions>(
}: T = {} as T
): Promise<FrameMessageReturnType<T>> {
let requestOptions: HubHttpUrlOptions["hubRequestOptions"] =
hubRequestOptions || {};
hubRequestOptions ? { ...hubRequestOptions } : {};

if (hubHttpUrl === DEFAULT_HUB_API_URL) {
// use public api key only if default hub url is used
requestOptions = {
...requestOptions,
headers: {
...(requestOptions.headers ?? {}),
api_key: DEFAULT_HUB_API_KEY,
},
};
Expand Down
8 changes: 7 additions & 1 deletion packages/frames.js/src/getTokenFromUrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,15 @@ export function getTokenFromUrl(url: string): ParsedToken {
throw new Error("Invalid token URL");
}

const parsedChainId = parseInt(chainId);

if (Number.isNaN(parsedChainId)) {
throw new Error("Invalid token URL: chainId is not a valid number");
}

return {
namespace,
chainId: parseInt(chainId),
chainId: parsedChainId,
address,
tokenId: tokenId || undefined,
};
Expand Down
22 changes: 13 additions & 9 deletions packages/frames.js/src/getUserDataForFid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,22 @@ export async function getUserDataForFid<
}): Promise<UserDataReturnType> {
const {
hubHttpUrl = DEFAULT_HUB_API_URL,
hubRequestOptions = {
headers: {
api_key: DEFAULT_HUB_API_KEY,
},
},
hubRequestOptions = {},
} = options;

const requestHeaders = {
api_key: DEFAULT_HUB_API_KEY,
...(hubRequestOptions.headers ?? {}),
};

const requestOptions = {
...hubRequestOptions,
headers: requestHeaders,
};

const userDataResponse = await fetch(
`${hubHttpUrl}/v1/userDataByFid?fid=${fid}`,
hubRequestOptions
requestOptions
);

const { messages } = (await userDataResponse
Expand Down Expand Up @@ -59,9 +65,7 @@ export async function getUserDataForFid<
const { type, value } = message.data.userDataBody;
const foundValue = acc[type];

if (foundValue && foundValue.timestamp < timestamp) {
acc[type] = { value, timestamp };
} else {
if (!foundValue || foundValue.timestamp < timestamp) {
acc[type] = { value, timestamp };
}
} catch (error) {
Expand Down
7 changes: 2 additions & 5 deletions packages/frames.js/src/validateFrameMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ export async function validateFrameMessage(
body: FrameActionPayload,
{
hubHttpUrl = DEFAULT_HUB_API_URL,
hubRequestOptions = {
headers: {
api_key: DEFAULT_HUB_API_KEY,
},
},
hubRequestOptions = {},
}: HubHttpUrlOptions = {}
): Promise<{
isValid: boolean;
Expand All @@ -55,6 +51,7 @@ export async function validateFrameMessage(
headers: {
"Content-Type": "application/octet-stream",
...headers,
api_key: DEFAULT_HUB_API_KEY,
},
body: hexStringToUint8Array(body.trustedData.messageBytes),
...rest,
Expand Down