mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2025-01-22 18:21:39 +01:00
Code Issues Projects Releases Wiki Activity

Refactor SendMacStage

Browse Source 
- Convert property to argument
- Remove unnecessary olm type
- Use Channel.getEvent
- Fix ILogItem import
This commit is contained in:
RMidhunSuresh 2023-03-14 22:58:05 +05:30
parent ec66e88180
commit 2cde9b2f33
No known key found for this signature in database
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/matrix/verification/SAS/stages/SendMacStage.ts
View File

@ -14,34 +14,24 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import {BaseSASVerificationStage} from "./BaseSASVerificationStage"; import {BaseSASVerificationStage} from "./BaseSASVerificationStage";
import {ILogItem} from "../../../../lib"; import {ILogItem} from "../../../../logging/types";
import {VerificationEventTypes} from "../channel/types"; import {VerificationEventTypes} from "../channel/types";
import type * as OlmNamespace from "@matrix-org/olm";
import {createCalculateMAC} from "../mac"; import {createCalculateMAC} from "../mac";
import {VerifyMacStage} from "./VerifyMacStage"; import {VerifyMacStage} from "./VerifyMacStage";
type Olm = typeof OlmNamespace;
export class SendMacStage extends BaseSASVerificationStage { export class SendMacStage extends BaseSASVerificationStage {
private calculateMAC: (input: string, info: string) => string;
async completeStage() { async completeStage() {
await this.log.wrap("SendMacStage.completeStage", async (log) => { await this.log.wrap("SendMacStage.completeStage", async (log) => {
let acceptMessage; const acceptMessage = this.channel.getEvent(VerificationEventTypes.Accept).content;
if (this.channel.initiatedByUs) {
acceptMessage = this.channel.receivedMessages.get(VerificationEventTypes.Accept).content;
}
else {
acceptMessage = this.channel.sentMessages.get(VerificationEventTypes.Accept).content;
}
const macMethod = acceptMessage.message_authentication_code; const macMethod = acceptMessage.message_authentication_code;
this.calculateMAC = createCalculateMAC(this.olmSAS, macMethod); const calculateMAC = createCalculateMAC(this.olmSAS, macMethod);
await this.sendMAC(log); await this.sendMAC(calculateMAC, log);
await this.channel.waitForEvent(VerificationEventTypes.Mac); await this.channel.waitForEvent(VerificationEventTypes.Mac);
this.setNextStage(new VerifyMacStage(this.options)); this.setNextStage(new VerifyMacStage(this.options));
}); });
} }
private async sendMAC(log: ILogItem): Promise<void> { private async sendMAC(calculateMAC: (input: string, info: string) => string, log: ILogItem): Promise<void> {
const mac: Record<string, string> = {}; const mac: Record<string, string> = {};
const keyList: string[] = []; const keyList: string[] = [];
const baseInfo = const baseInfo =
@ -54,19 +44,17 @@ export class SendMacStage extends BaseSASVerificationStage {
const deviceKeyId = `ed25519:${this.ourUserDeviceId}`; const deviceKeyId = `ed25519:${this.ourUserDeviceId}`;
const deviceKeys = this.e2eeAccount.getDeviceKeysToSignWithCrossSigning(); const deviceKeys = this.e2eeAccount.getDeviceKeysToSignWithCrossSigning();
mac[deviceKeyId] = this.calculateMAC(deviceKeys.keys[deviceKeyId], baseInfo + deviceKeyId); mac[deviceKeyId] = calculateMAC(deviceKeys.keys[deviceKeyId], baseInfo + deviceKeyId);
keyList.push(deviceKeyId); keyList.push(deviceKeyId);
const {masterKey: crossSigningKey} = await this.deviceTracker.getCrossSigningKeysForUser(this.ourUserId, this.hsApi, log); const {masterKey: crossSigningKey} = await this.deviceTracker.getCrossSigningKeysForUser(this.ourUserId, this.hsApi, log);
console.log("masterKey", crossSigningKey);
if (crossSigningKey) { if (crossSigningKey) {
const crossSigningKeyId = `ed25519:${crossSigningKey}`; const crossSigningKeyId = `ed25519:${crossSigningKey}`;
mac[crossSigningKeyId] = this.calculateMAC(crossSigningKey, baseInfo + crossSigningKeyId); mac[crossSigningKeyId] = calculateMAC(crossSigningKey, baseInfo + crossSigningKeyId);
keyList.push(crossSigningKeyId); keyList.push(crossSigningKeyId);
} }
const keys = this.calculateMAC(keyList.sort().join(","), baseInfo + "KEY_IDS"); const keys = calculateMAC(keyList.sort().join(","), baseInfo + "KEY_IDS");
console.log("result", mac, keys);
await this.channel.send(VerificationEventTypes.Mac, { mac, keys }, log); await this.channel.send(VerificationEventTypes.Mac, { mac, keys }, log);
} }
} }