Skip to content

Update low-level RPC API for Python3 #16

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

Merged
ivg merged 1 commit into from
Nov 18, 2020
Merged

Update low-level RPC API for Python3 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Installation section).

```python
>>> import bap
>>> print '\n'.join(insn.asm for insn in bap.disasm("\x48\x83\xec\x08"))
>>> print '\n'.join(insn.asm for insn in bap.disasm(b"\x48\x83\xec\x08"))
decl %eax
subl $0x8, %esp
```
Expand Down
19 changes: 9 additions & 10 deletions src/bap/rpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def load_symbols(self):

def get_symbol(self, name, d=None):
try:
return (s for s in self.symbols if s.name == name).next()
return next(s for s in self.symbols if s.name == name)
except StopIteration:
return d

Expand Down Expand Up @@ -214,8 +214,8 @@ def __init__(self, mem, parent):

def load_data(self):
try:
url = (urlparse(url) for url in self.links
if urlparse(url).scheme == 'mmap').next()
url = next(urlparse(url) for url in self.links
if urlparse(url).scheme == 'mmap')
qs = parse_qs(url.query)
offset = int(qs['offset'][0])
with open(url.path, "rw+b") as f:
Expand Down Expand Up @@ -266,8 +266,8 @@ def __init__(self, server={}):
self.last_id = 0
for attempt in range(RETRIES):
try:
self.capabilities = self.call({'init' : {
'version' : '0.1'}}).next()['capabilities']
self.capabilities = next(self.call({'init' : {
'version' : '0.1'}}))['capabilities']
break
except Exception:
if attempt + 1 == RETRIES:
Expand All @@ -278,7 +278,7 @@ def __init__(self, server={}):
if not "capabilities" in self.__dict__:
raise RuntimeError("Failed to connect to BAP server")
self.data = {}
self.temp = NamedTemporaryFile('rw+b', prefix="bap-")
self.temp = NamedTemporaryFile('w+b', prefix="bap-")

def insns(self, src, **kwargs):
req = {'resource' : src}
Expand All @@ -300,7 +300,7 @@ def load_file(self, name):
'url' : 'file://' + name}})

def get_resource(self, name):
return self.call({'get_resource' : name}).next()
return next(self.call({'get_resource' : name}))

def load_chunk(self, data, **kwargs):
kwargs.setdefault('url', self.mmap(data))
Expand Down Expand Up @@ -341,14 +341,13 @@ def mmap(self, data):
return url

def _load_resource(self, res):
rep = self.call(res).next()
rep = next(self.call(res))
if 'error' in rep:
raise ServerError(rep)
return Id(rep['resource'])


def jsons(r, p=0):
dec = json.JSONDecoder(encoding='utf-8')
dec = json.JSONDecoder()
while True:
obj,p = dec.scan_once(r.text,p)
yield obj
Expand Down
13 changes: 13 additions & 0 deletions tests/test_low_level_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import unittest
import bap

class TestLowLevelInterface(unittest.TestCase):

def test_low_level_interface(self):
asm_str = '\n'.join(insn.asm for insn in bap.disasm(b"\x48\x83\xec\x08"))
self.assertIsNotNone(asm_str)
self.assertIn("\tdecl\t%eax", asm_str)
self.assertIn("\tsubl\t$0x8, %esp", asm_str)

if __name__ == "__main__":
unittest.main()