Skip to content
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

Jump to bottom

feat: core replay protection #3621

Open
wants to merge 8 commits into
base: v2.0
Choose a base branch
from
Open

feat: core replay protection #3621

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b914127
add replay protection to core encode/decode
pedrouid Sep 9, 2023
1190008
delete topic from jsonrpc payload
pedrouid Sep 9, 2023
4ca2e20
fix: sets topic after handling for `type-1` payloads is done
Sep 11, 2023
4d1724f
fix: topic comparisons
Sep 11, 2023
f5602b7
Merge branch 'v2.0' into feat/core-replay-protection
ganchoradkov Sep 11, 2023
65f351a
Merge branch 'v2.0' into feat/core-replay-protection
ganchoradkov Sep 14, 2023
fa8f7c3
Merge branch 'v2.0' into feat/core-replay-protection
ganchoradkov Sep 18, 2023
9d06918
Merge branch 'v2.0' into feat/core-replay-protection
ganchoradkov Sep 27, 2023
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: 8 additions & 1 deletion packages/core/src/controllers/crypto.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ export class Crypto implements ICrypto {
public encode: ICrypto["encode"] = async (topic, payload, opts) => {
this.isInitialized();
const params = validateEncoding(opts);
const message = safeJsonStringify(payload);
const protectedPayload = { topic, ...payload };
const message = safeJsonStringify(protectedPayload);
if (isTypeOneEnvelope(params)) {
const selfPublicKey = params.senderPublicKey;
const peerPublicKey = params.receiverPublicKey;
Expand All @@ -130,6 +131,12 @@ export class Crypto implements ICrypto {
const symKey = this.getSymKey(topic);
const message = decrypt({ symKey, encoded });
const payload = safeJsonParse(message);
if (typeof payload.topic !== "undefined" && payload.topic !== topic) {
ganchoradkov marked this conversation as resolved.
Show resolved Hide resolved
if (payload.topic !== topic) {
throw new Error("Mismatched topic decoded from message");
}
delete payload.topic;
}
return payload;
} catch (error) {
this.logger.error(
Expand Down
Loading