Gallopsled / pwntools / 1

coverage: 19.336% (-54.2%) from 73.494%
1

push

github

web-flow 
Handle `context.newline` correctly in `tube.interactive()` (#2129)

* Handle `context.newline` correctly in `tube.interactive()`

The `context.newline` or `self.newline` variable isn't obeyed when typing in interactive mode. It is used when sending and receiving lines through `tube.sendline` though, causing a mismatch.

The receiving end of the `tube.interactive()` already has handling of newlines, but the sending side does not.

Example:
```python
from pwn import *
io = process('cat')
io.newline = b'\r\n'
io.sendline(b'auto')
io.interactive()
```

```
$ python testinteractive.py DEBUG
[x] Starting local process '/usr/bin/cat' argv=[b'cat']
[+] Starting local process '/usr/bin/cat' argv=[b'cat'] : pid 19060
[DEBUG] Sent 0x6 bytes:
    b'auto\r\n'
[*] Switching to interactive mode
[DEBUG] Received 0x6 bytes:
    b'auto\r\n'
auto
$ test
[DEBUG] Sent 0x5 bytes:
    b'test\n'
[DEBUG] Received 0x5 bytes:
    b'test\n'
test
```

The expected outcome would be to send `b'test\r\n'.

The same problem arises in non-term mode (`PWNLIB_NOTERM=1`), where stdin is read in binary mode causing the OS line seperators to come through. Correctly replacing them with the `context.newline` setting allows to use the interactive input on windows hosts as well, without constantly sending `\r\n`.

* Update CHANGELOG.md

* Only replace newlines in TTYs

Don't mess with the line endings when piping data through.

* Always send bytes immediately on receive

Only replace newlines in a tty if NOTERM wasn't explicitly set or
the `newline` setting was set.

* Don't return a newline after term.readline lines

The builtin `input()` doesn't include the newline.

* Remove bogous newline from CHANGELOG

189 of 5940 branches covered (3.18%)

1 of 20 new or added lines in 2 files covered. (5.0%)

9283 existing lines in 112 files now uncovered.

3286 of 16994 relevant lines covered (19.34%)

0.39 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0
/pwnlib/commandline/elfpatch.py
1 
#!/usr/bin/env python2
UNCOV
2 
from __future__ import absolute_import
×
UNCOV
3 
from __future__ import division
×
4 










UNCOV

5



import sys




×







6













UNCOV

7



import pwnlib.args




×








UNCOV

8



pwnlib.args.free_form = False




×







9













UNCOV

10



from pwn import *




×








UNCOV

11



from pwnlib.commandline import common




×







12













UNCOV

13



p = common.parser_commands.add_parser(




×







14



    'elfpatch',










15



    help = 'Patch an ELF file',










16



    description = 'Patch an ELF file'










17



)










18













UNCOV

19



p.add_argument('elf',help="File to patch")




×








UNCOV

20



p.add_argument('offset',help="Offset to patch in virtual address (hex encoded)")




×








UNCOV

21



p.add_argument('bytes',help='Bytes to patch (hex encoded)')




×







22












23













UNCOV

24



def main(a):




×







25



    if not a.offset.startswith('0x'):





×







26



        a.offset = '0x' + a.offset




×







27












28



    offset = int(a.offset, 16)




×







29



    bytes  = unhex(a.bytes)




×







30












31



    with context.silent:




×







32



        elf    = ELF(a.elf)




×







33












34



    elf.write(offset, bytes)




×







35



    getattr(sys.stdout, 'buffer', sys.stdout).write(elf.get_data())




×







36













UNCOV

37



if __name__ == '__main__':





×







38



    pwnlib.commandline.common.main(__file__)




×





















    

  • 

    •