blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-05-01 08:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(frontend): fix parsing and validation of msgs

Browse source
This commit is contained in:
oxalica 2024-09-19 05:11:25 -04:00
parent 023da5ecb2
commit ab756f78ab
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test-frontend/main.js
View file

@ -144,11 +144,12 @@ async function showChatMsg(chat) {
try { try {
const sortKeys = (obj) => const sortKeys = (obj) =>
Object.fromEntries(Object.entries(obj).sort((lhs, rhs) => lhs[0] > rhs[0])); Object.fromEntries(Object.entries(obj).sort((lhs, rhs) => lhs[0] > rhs[0]));
const canonicalJson = chat.signee let canonicalJson = chat.signee
// Just for simplicity. Only this struct is unsorted due to serde implementation. // Just for simplicity.
canonicalJson.payload = sortKeys(canonicalJson.payload) canonicalJson.payload = sortKeys(canonicalJson.payload);
canonicalJson = sortKeys(canonicalJson);
const signeeBytes = (new TextEncoder()).encode(JSON.stringify(canonicalJson)); const signeeBytes = (new TextEncoder()).encode(JSON.stringify(canonicalJson));
const rawkey = hexToBuf(chat.signee.user); const rawkey = hexToBuf(chat.signee.act_key);
const senderKey = await crypto.subtle.importKey('raw', rawkey, { name: 'Ed25519' }, true, ['verify']); const senderKey = await crypto.subtle.importKey('raw', rawkey, { name: 'Ed25519' }, true, ['verify']);
const success = await crypto.subtle.verify('Ed25519', senderKey, hexToBuf(chat.sig), signeeBytes); const success = await crypto.subtle.verify('Ed25519', senderKey, hexToBuf(chat.sig), signeeBytes);
verifyRet = success ? '✔️' : '✖️'; verifyRet = success ? '✔️' : '✖️';
@ -157,7 +158,8 @@ async function showChatMsg(chat) {
verifyRet = `✖️ ${e}`; verifyRet = `✖️ ${e}`;
} }
const shortUser = chat.signee.user.replace(/^(.{4}).*(.{4})$/, '$1…$2'); // TODO: The relationship of id_key and act_key is not verified.
const shortUser = chat.signee.id_key.replace(/^(.{4}).*(.{4})$/, '$1…$2');
const time = new Date(chat.signee.timestamp * 1000).toISOString(); const time = new Date(chat.signee.timestamp * 1000).toISOString();
const el = document.createElement('div', {}); const el = document.createElement('div', {});
@ -280,9 +282,9 @@ async function connectServer(newServerUrl) {
ws.onmessage = async (e) => { ws.onmessage = async (e) => {
console.log('ws event', e.data); console.log('ws event', e.data);
const msg = JSON.parse(e.data); const msg = JSON.parse(e.data);
if (msg.chat !== undefined) { if (msg.msg !== undefined) {
if (msg.chat.signee.payload.room === curRoom) { if (msg.msg.signee.payload.room === curRoom) {
await showChatMsg(msg.chat); await showChatMsg(msg.msg);
} else { } else {
console.log('ignore background room msg'); console.log('ignore background room msg');
} }
@ -346,7 +348,7 @@ async function joinRoom(rid) {
permission: 1, // POST_CHAT permission: 1, // POST_CHAT
room: rid, room: rid,
typ: 'add_member', typ: 'add_member',
user: await getActPubkey(), user: await getIdPubkey(),
}); });
log('joined room'); log('joined room');
await loadRoomList(false) await loadRoomList(false)