mirror of
https://github.com/frida/frida-python.git
synced 2026-11-07 09:35:57 -10:00
Upgrade web client example to match latest dbus-next
Where identifiers are being transformed to match idiomatic JS.
This commit is contained in:
Ole André Vadla Ravnås committed
1 parent
218db36d4c
commit
bbdcdfaca8
2 files changed
+69
-69
No files matched your search
Generated
+56
-56
@@ -1837,27 +1837,27 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/minimatch": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz",
|
||||
"integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==",
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
|
||||
"integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/minimist": {
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
|
||||
"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
|
||||
"integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/node": {
|
||||
"version": "16.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.0.0.tgz",
|
||||
"integrity": "sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg==",
|
||||
"version": "16.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.0.1.tgz",
|
||||
"integrity": "sha512-hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/normalize-package-data": {
|
||||
"version": "2.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
|
||||
"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
|
||||
"version": "2.4.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
|
||||
"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/parse-json": {
|
||||
@@ -1868,21 +1868,21 @@
|
||||
"optional": true
|
||||
},
|
||||
"node_modules/@types/q": {
|
||||
"version": "1.5.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
|
||||
"integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
|
||||
"version": "1.5.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
|
||||
"integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/qs": {
|
||||
"version": "6.9.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz",
|
||||
"integrity": "sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==",
|
||||
"version": "6.9.7",
|
||||
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
|
||||
"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/range-parser": {
|
||||
"version": "1.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
|
||||
"integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==",
|
||||
"version": "1.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
|
||||
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/@types/serve-static": {
|
||||
@@ -3788,9 +3788,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/caniuse-lite": {
|
||||
"version": "1.0.30001242",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001242.tgz",
|
||||
"integrity": "sha512-KvNuZ/duufelMB3w2xtf9gEWCSxJwUgoxOx5b6ScLXC4kPc9xsczUVCPrQU26j5kOsHM4pSUL54tAZt5THQKug==",
|
||||
"version": "1.0.30001243",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz",
|
||||
"integrity": "sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA==",
|
||||
"dev": true,
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
@@ -5114,7 +5114,7 @@
|
||||
},
|
||||
"node_modules/dbus-next": {
|
||||
"version": "0.9.2",
|
||||
"resolved": "git+ssh://[email protected]/frida/node-dbus-next.git#448e4876e65d3f92e50f3b966bf21a7deb1c231b",
|
||||
"resolved": "git+ssh://[email protected]/frida/node-dbus-next.git#0e12559b2298c140916541f57fdf9f83cf0b7975",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@nornagon/put": "0.0.8",
|
||||
@@ -5691,9 +5691,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/electron-to-chromium": {
|
||||
"version": "1.3.768",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.768.tgz",
|
||||
"integrity": "sha512-I4UMZHhVSK2pwt8jOIxTi3GIuc41NkddtKT/hpuxp9GO5UWJgDKTBa4TACppbVAuKtKbMK6BhQZvT5tFF1bcNA==",
|
||||
"version": "1.3.769",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.769.tgz",
|
||||
"integrity": "sha512-B+3hW8D76/uoTPSobWI3D/CFn2S4jPn88dVJ+BkD88Lz6LijQpL+hfdzIFJGTQK4KdE0XwmNbjUQFH1OQVwKdQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/elliptic": {
|
||||
@@ -16762,27 +16762,27 @@
|
||||
"dev": true
|
||||
},
|
||||
"@types/minimatch": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.4.tgz",
|
||||
"integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==",
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
|
||||
"integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
|
||||
"dev": true
|
||||
},
|
||||
"@types/minimist": {
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
|
||||
"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
|
||||
"integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
|
||||
"dev": true
|
||||
},
|
||||
"@types/node": {
|
||||
"version": "16.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.0.0.tgz",
|
||||
"integrity": "sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg==",
|
||||
"version": "16.0.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.0.1.tgz",
|
||||
"integrity": "sha512-hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug==",
|
||||
"dev": true
|
||||
},
|
||||
"@types/normalize-package-data": {
|
||||
"version": "2.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
|
||||
"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
|
||||
"version": "2.4.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
|
||||
"integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
|
||||
"dev": true
|
||||
},
|
||||
"@types/parse-json": {
|
||||
@@ -16793,21 +16793,21 @@
|
||||
"optional": true
|
||||
},
|
||||
"@types/q": {
|
||||
"version": "1.5.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
|
||||
"integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
|
||||
"version": "1.5.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
|
||||
"integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
|
||||
"dev": true
|
||||
},
|
||||
"@types/qs": {
|
||||
"version": "6.9.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz",
|
||||
"integrity": "sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==",
|
||||
"version": "6.9.7",
|
||||
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
|
||||
"integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
|
||||
"dev": true
|
||||
},
|
||||
"@types/range-parser": {
|
||||
"version": "1.2.3",
|
||||
"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
|
||||
"integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==",
|
||||
"version": "1.2.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
|
||||
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
|
||||
"dev": true
|
||||
},
|
||||
"@types/serve-static": {
|
||||
@@ -18384,9 +18384,9 @@
|
||||
}
|
||||
},
|
||||
"caniuse-lite": {
|
||||
"version": "1.0.30001242",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001242.tgz",
|
||||
"integrity": "sha512-KvNuZ/duufelMB3w2xtf9gEWCSxJwUgoxOx5b6ScLXC4kPc9xsczUVCPrQU26j5kOsHM4pSUL54tAZt5THQKug==",
|
||||
"version": "1.0.30001243",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz",
|
||||
"integrity": "sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA==",
|
||||
"dev": true
|
||||
},
|
||||
"case-sensitive-paths-webpack-plugin": {
|
||||
@@ -19458,7 +19458,7 @@
|
||||
}
|
||||
},
|
||||
"dbus-next": {
|
||||
"version": "git+ssh://[email protected]/frida/node-dbus-next.git#448e4876e65d3f92e50f3b966bf21a7deb1c231b",
|
||||
"version": "git+ssh://[email protected]/frida/node-dbus-next.git#0e12559b2298c140916541f57fdf9f83cf0b7975",
|
||||
"from": "dbus-next@frida/node-dbus-next",
|
||||
"requires": {
|
||||
"@nornagon/put": "0.0.8",
|
||||
@@ -19911,9 +19911,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"electron-to-chromium": {
|
||||
"version": "1.3.768",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.768.tgz",
|
||||
"integrity": "sha512-I4UMZHhVSK2pwt8jOIxTi3GIuc41NkddtKT/hpuxp9GO5UWJgDKTBa4TACppbVAuKtKbMK6BhQZvT5tFF1bcNA==",
|
||||
"version": "1.3.769",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.769.tgz",
|
||||
"integrity": "sha512-B+3hW8D76/uoTPSobWI3D/CFn2S4jPn88dVJ+BkD88Lz6LijQpL+hfdzIFJGTQK4KdE0XwmNbjUQFH1OQVwKdQ==",
|
||||
"dev": true
|
||||
},
|
||||
"elliptic": {
|
||||
|
||||
@@ -24,12 +24,12 @@ async function start() {
|
||||
nick: 'SomeoneOnTheWeb',
|
||||
secret: 'knock-knock'
|
||||
});
|
||||
await authService.Authenticate(token);
|
||||
await authService.authenticate(token);
|
||||
|
||||
const hostSessionObj = await bus.getProxyObject('re.frida.HostSession15', '/re/frida/HostSession');
|
||||
const hostSession = hostSessionObj.getInterface('re.frida.HostSession15');
|
||||
|
||||
const processes: HostProcessInfo[] = await hostSession.EnumerateProcesses({});
|
||||
const processes: HostProcessInfo[] = await hostSession.enumerateProcesses({});
|
||||
console.log('Got processes:', processes);
|
||||
|
||||
const target = processes.find(([, name]) => name === 'hello2');
|
||||
@@ -39,7 +39,7 @@ async function start() {
|
||||
const [pid] = target;
|
||||
console.log('Got PID:', pid);
|
||||
|
||||
const sessionId: AgentSessionId = await hostSession.Attach(pid, { persistTimeout: new Variant('u', 300) });
|
||||
const sessionId: AgentSessionId = await hostSession.attach(pid, { 'persist-timeout': new Variant('u', 300) });
|
||||
|
||||
let agentSessionObj = await bus.getProxyObject('re.frida.AgentSession15', '/re/frida/AgentSession/' + sessionId[0]);
|
||||
let agentSession = agentSessionObj.getInterface('re.frida.AgentSession15');
|
||||
@@ -47,7 +47,7 @@ async function start() {
|
||||
const sink = new MessageSink('re.frida.AgentMessageSink15');
|
||||
bus.export('/re/frida/AgentMessageSink/' + sessionId[0], sink);
|
||||
|
||||
const scriptId: AgentScriptId = await agentSession.CreateScript(`
|
||||
const scriptId: AgentScriptId = await agentSession.createScript(`
|
||||
const _puts = new NativeFunction(Module.getExportByName(null, 'puts'), 'int', ['pointer']);
|
||||
|
||||
function puts(s) {
|
||||
@@ -63,18 +63,18 @@ setInterval(() => {
|
||||
n++;
|
||||
}, 1000);
|
||||
`, {});
|
||||
await agentSession.LoadScript(scriptId);
|
||||
await agentSession.loadScript(scriptId);
|
||||
|
||||
await agentSession.BeginMigration();
|
||||
await agentSession.beginMigration();
|
||||
|
||||
const peerConnection = new RTCPeerConnection();
|
||||
|
||||
const pendingLocalCandidates = new IceCandidateQueue();
|
||||
pendingLocalCandidates.on('add', (candidates: RTCIceCandidate[]) => {
|
||||
agentSession.AddCandidates(candidates.map(c => c.candidate));
|
||||
agentSession.addCandidates(candidates.map(c => c.candidate));
|
||||
});
|
||||
pendingLocalCandidates.once('done', () => {
|
||||
agentSession.NotifyCandidateGatheringDone();
|
||||
agentSession.notifyCandidateGatheringDone();
|
||||
});
|
||||
|
||||
const pendingRemoteCandidates = new IceCandidateQueue();
|
||||
@@ -100,7 +100,7 @@ setInterval(() => {
|
||||
peerConnection.onicecandidate = e => {
|
||||
pendingLocalCandidates.add(e.candidate);
|
||||
};
|
||||
agentSession.on('NewCandidates', (sdps: string[]) => {
|
||||
agentSession.on('newCandidates', (sdps: string[]) => {
|
||||
for (const sdp of sdps) {
|
||||
pendingRemoteCandidates.add(new RTCIceCandidate({
|
||||
candidate: sdp,
|
||||
@@ -109,7 +109,7 @@ setInterval(() => {
|
||||
}));
|
||||
}
|
||||
});
|
||||
agentSession.on('CandidateGatheringDone', () => {
|
||||
agentSession.on('candidateGatheringDone', () => {
|
||||
pendingRemoteCandidates.add(null);
|
||||
});
|
||||
|
||||
@@ -126,7 +126,7 @@ setInterval(() => {
|
||||
|
||||
peerBus.export('/re/frida/AgentMessageSink', sink);
|
||||
|
||||
await agentSession.CommitMigration();
|
||||
await agentSession.commitMigration();
|
||||
|
||||
agentSessionObj = peerAgentSessionObj;
|
||||
agentSession = peerAgentSession;
|
||||
@@ -142,7 +142,7 @@ setInterval(() => {
|
||||
const offer = await peerConnection.createOffer();
|
||||
await peerConnection.setLocalDescription(offer);
|
||||
|
||||
const answerSdp = await agentSession.OfferPeerConnection(offer.sdp, {});
|
||||
const answerSdp = await agentSession.offerPeerConnection(offer.sdp, {});
|
||||
const answer = new RTCSessionDescription({ type: "answer", sdp: answerSdp });
|
||||
await peerConnection.setRemoteDescription(answer);
|
||||
|
||||
@@ -162,7 +162,7 @@ enum AgentMessageKind {
|
||||
|
||||
class MessageSink extends Interface {
|
||||
@method({ inSignature: 'a(i(u)sbay)u' })
|
||||
PostMessages(messages: AgentMessage[], batchId: number): void {
|
||||
postMessages(messages: AgentMessage[], batchId: number): void {
|
||||
for (const [kind, scriptId, text, hasData, data] of messages) {
|
||||
if (kind === AgentMessageKind.Script) {
|
||||
const message = JSON.parse(text);
|
||||
|
||||
Reference in new issue
Block a user