Skip to content

Commit 60f2511

Browse files
committed
fix: improve action type handling
- Added a new function to correct spelling errors in action types. - Updated the event listener to utilize the new function for better action validation.
1 parent 1f5c349 commit 60f2511

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

src/contents/extension.ts

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ const storage = new Storage({
1414

1515
const ACTIONS_NOT_NEED_TRUST_DOMAIN = ['MULTIPOST_EXTENSION_REQUEST_TRUST_DOMAIN'];
1616

17+
function getRightAction(action: string) {
18+
if (action.startsWith('MUTLIPOST')) {
19+
return action.replace(/^MUTLIPOST/, 'MULTIPOST');
20+
}
21+
return action;
22+
}
23+
1724
async function isOriginTrusted(origin: string, action: string): Promise<boolean> {
1825
if (ACTIONS_NOT_NEED_TRUST_DOMAIN.includes(action)) {
1926
return true;
@@ -36,14 +43,9 @@ window.addEventListener('message', async (event) => {
3643
if (request.type !== 'request') {
3744
return;
3845
}
39-
40-
// 修正action中的拼写错误
41-
if (request.action.startsWith('MUTLIPOST')) {
42-
request.action = request.action.replace(/^MUTLIPOST/, 'MULTIPOST');
43-
}
44-
46+
4547
// 验证来源是否可信
46-
const isTrusted = await isOriginTrusted(new URL(event.origin).hostname, request.action);
48+
const isTrusted = await isOriginTrusted(new URL(event.origin).hostname, getRightAction(request.action));
4749
if (!isTrusted) {
4850
event.source.postMessage({
4951
type: 'response',
@@ -60,7 +62,12 @@ window.addEventListener('message', async (event) => {
6062
});
6163

6264
function defaultHandler<T>(request: ExtensionExternalRequest<T>, event: MessageEvent) {
63-
chrome.runtime.sendMessage(request).then((response) => {
65+
const newRequest = {
66+
...request,
67+
action: getRightAction(request.action),
68+
};
69+
70+
chrome.runtime.sendMessage(newRequest).then((response) => {
6471
event.source.postMessage(successResponse(request, response));
6572
});
6673
}

0 commit comments

Comments
 (0)