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

Fix protobuf extractor (again) #265

Merged
merged 2 commits into from
Mar 29, 2020
Merged

Fix protobuf extractor (again) #265

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87b0722
Update protobuf extractor to work on latest whatsapp web
tulir Mar 26, 2020
028ed72
Update protobuf definitions
tulir Mar 26, 2020
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
Next Next commit
Update protobuf extractor to work on latest whatsapp web
  • Loading branch information
@tulir
tulir committed Mar 26, 2020
commit 87b0722591c3d0e0a7ab0b38a617333b77b774cf
32 changes: 14 additions & 18 deletions doc/spec/protobuf-extractor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,12 @@ const objectToArray = obj => Object.keys(obj).map(k => [k, obj[k]]);
const indent = (lines, n) => lines.map(l => " ".repeat(n) + l);

async function findAppModules(mods) {
const ua = { headers: { "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:70.0) Gecko/20100101 Firefox/70.0" } }
const ua = { headers: { "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0" } }
const WAWebMain = "https://web.whatsapp.com";
const index = await request.get(WAWebMain, ua);
const progressPath = index.match(/(?<=\<script src=")\/progress\.[0-9a-z]+\.js(?="\>\<\/script\>)/g);
if(progressPath.length === 0)
throw "unable to find path of progress.js script";
const progress = await request.get(WAWebMain + progressPath[0], ua);
const appPathNumber = progress.match(/(\d+):"app"/)[1]
const appPathId = progress.match(new RegExp('[,{]' + appPathNumber + ':"([0-9a-z]{10,})"'))[1]
const appPathId = index.match(/data-app="\/app.([0-9a-z]{10,}).js"/)[1]
const data = await request.get(WAWebMain + "/app." + appPathId + ".js", ua)
const appModules = acorn.parse(data).body[0].expression.arguments[1].properties;
const appModules = acorn.parse(data).body[0].expression.argument.arguments[0].properties;
return appModules.filter(m => mods.indexOf(m.key.name) != -1);
}

Expand Down Expand Up @@ -61,18 +56,19 @@ async function findAppModules(mods) {
}
}
});

const enumAliases = {}
// enums are defined directly, and both enums and messages get a one-letter alias
walk.simple(mod, {
AssignmentExpression(node) {
if (node.left.type === "MemberExpression" && modInfo.identifiers[node.left.property.name]) {
let ident = modInfo.identifiers[node.left.property.name];
ident.alias = node.right.name;
ident.enumValues = enumAliases[ident.alias];
}
},
VariableDeclarator(node) {
if(node.init && node.init.type === "AssignmentExpression" && node.init.left.type === "MemberExpression" && modInfo.identifiers[node.init.left.property.name]) {
let ident = modInfo.identifiers[node.init.left.property.name];
ident.alias = node.id.name;
node = node.init.right;

// enums get their array of values directly
if(node.type === "CallExpression" && node.callee.type === "MemberExpression" && node.arguments.length == 1 && node.arguments[0].type == "ObjectExpression")
ident.enumValues = node.arguments[0].properties.map(p => ({ name: p.key.name, id: p.value.value }));
if(node.init && node.init.type === "CallExpression" && node.init.callee.type === "MemberExpression" && node.init.arguments.length === 1 && node.init.arguments[0].type === "ObjectExpression") {
enumAliases[node.id.name] = node.init.arguments[0].properties.map(p => ({ name: p.key.name, id: p.value.value }));
}
}
});
Expand All @@ -85,7 +81,7 @@ async function findAppModules(mods) {
// message specifications are stored in a "_spec" attribute of the respective identifier alias
walk.simple(mod, {
AssignmentExpression(node) {
if(node.left.type === "MemberExpression" && node.left.property.name === "_spec" && node.right.type === "ObjectExpression") {
if(node.left.type === "MemberExpression" && node.left.property.name === "internalSpec" && node.right.type === "ObjectExpression") {
let targetIdentName = Object.keys(modInfo.identifiers).find(k => modInfo.identifiers[k].alias == node.left.object.name);
if(!targetIdentName) {
console.warn(`found message specification for unknown identifier alias: ${node.left.object.name}`);
Expand Down