Browse Source

only allow signed messages

feature/dockerfile-arm
Evan Feenstra 5 years ago
parent
commit
1411ffb424
  1. 2
      api/grpc/index.ts
  2. 10
      api/helpers.ts
  3. 2
      dist/api/grpc/index.js
  4. 2
      dist/api/grpc/index.js.map
  5. 7
      dist/api/helpers.js
  6. 2
      dist/api/helpers.js.map

2
api/grpc/index.ts

@ -16,8 +16,6 @@ async function parseAndVerifyPayload(data){
try { try {
payload = JSON.parse(msg) payload = JSON.parse(msg)
if(payload) { if(payload) {
if(!sig) return payload // REMOVE THIS LINE (here for backward compat)
// also remove pub_key from the newmsg and newkeyexchangemsg of helpers.ts
const v = await verifyAscii(msg, sig) const v = await verifyAscii(msg, sig)
if(v && v.valid && v.pubkey) { if(v && v.valid && v.pubkey) {
payload.sender = payload.sender||{} payload.sender = payload.sender||{}

10
api/helpers.ts

@ -229,10 +229,10 @@ function newmsg(type, chat, sender, message){
...chat.members && { members: chat.members }, ...chat.members && { members: chat.members },
}, },
message: message, message: message,
sender: { // sender: {
pub_key: sender.publicKey, // pub_key: sender.publicKey,
// ...sender.contactKey && {contact_key: sender.contactKey} // // ...sender.contactKey && {contact_key: sender.contactKey}
} // }
} }
} }
@ -240,7 +240,7 @@ function newkeyexchangemsg(type, sender){
return { return {
type: type, type: type,
sender: { sender: {
pub_key: sender.publicKey, // pub_key: sender.publicKey,
contact_key: sender.contactKey, contact_key: sender.contactKey,
...sender.alias && {alias: sender.alias}, ...sender.alias && {alias: sender.alias},
// ...sender.photoUrl && {photoUrl: sender.photoUrl} // ...sender.photoUrl && {photoUrl: sender.photoUrl}

2
dist/api/grpc/index.js

@ -26,8 +26,6 @@ function parseAndVerifyPayload(data) {
try { try {
payload = JSON.parse(msg); payload = JSON.parse(msg);
if (payload) { if (payload) {
if (!sig)
return payload; // REMOVE THIS LINE (here for backward compat)
const v = yield lightning_1.verifyAscii(msg, sig); const v = yield lightning_1.verifyAscii(msg, sig);
if (v && v.valid && v.pubkey) { if (v && v.valid && v.pubkey) {
payload.sender = payload.sender || {}; payload.sender = payload.sender || {};

2
dist/api/grpc/index.js.map

File diff suppressed because one or more lines are too long

7
dist/api/helpers.js

@ -227,15 +227,14 @@ function newmsg(type, chat, sender, message) {
type: type, type: type,
chat: Object.assign(Object.assign(Object.assign({ uuid: chat.uuid }, chat.name && { name: chat.name }), chat.type && { type: chat.type }), chat.members && { members: chat.members }), chat: Object.assign(Object.assign(Object.assign({ uuid: chat.uuid }, chat.name && { name: chat.name }), chat.type && { type: chat.type }), chat.members && { members: chat.members }),
message: message, message: message,
sender: {
pub_key: sender.publicKey,
}
}; };
} }
function newkeyexchangemsg(type, sender) { function newkeyexchangemsg(type, sender) {
return { return {
type: type, type: type,
sender: Object.assign({ pub_key: sender.publicKey, contact_key: sender.contactKey }, sender.alias && { alias: sender.alias }) sender: Object.assign({
// pub_key: sender.publicKey,
contact_key: sender.contactKey }, sender.alias && { alias: sender.alias })
}; };
} }
//# sourceMappingURL=helpers.js.map //# sourceMappingURL=helpers.js.map

2
dist/api/helpers.js.map

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save