Commit Graph

747 Commits

Author SHA1 Message Date
Caleb Stewart d01bdcba49
Merge pull request #142 from calebstewart/fix-readline-regression
Re-added readline import after regression
2021-06-18 18:36:07 -04:00
Caleb Stewart b680c1f276 Added changelog entry 2021-06-18 18:33:21 -04:00
Caleb Stewart 6c26df12c1 Re-added readline import after regression 2021-06-18 18:30:57 -04:00
Caleb Stewart 5ec4e35bb1
Merge pull request #141 from calebstewart/issue-140-linux-file-writer-close
- Removed `C-d` loop in `LinuxWriter.close`
- Added double `C-d` routine based on last character written to `LinuxWriter.close`
- Changed upload success message to match size calculations from `rich.progress`.
- Added better file IO test cases (small text, large text, small binary, large binary)
2021-06-18 18:18:05 -04:00
Caleb Stewart 650231f30a Removed unused import 2021-06-18 15:38:45 -04:00
Caleb Stewart fedf2c617e Fixed exception handler in connect command 2021-06-18 15:38:01 -04:00
Caleb Stewart ccc83215df Fixed back command exception 2021-06-18 15:03:16 -04:00
Caleb Stewart d6bf81e473 Fixed invalid escape sequence in docstring 2021-06-18 14:46:53 -04:00
Caleb Stewart a33b9ebb56 Improved create_session documentation, removed try-except 2021-06-18 14:44:18 -04:00
Caleb Stewart a900282219 Merge remote-tracking branch 'mitul16/issue-133-uncaught-channelerror' into issue-133-uncaught-channelerror 2021-06-18 14:37:59 -04:00
Caleb Stewart b8f53001d2 Fixed exception handler in get_host_hash 2021-06-18 14:31:45 -04:00
Caleb Stewart 521550dc82 Added CHANGELOG entries for PR141 2021-06-18 14:12:47 -04:00
Caleb Stewart 5544954852 Added better file io tests which pass 2021-06-18 14:10:56 -04:00
Mitul16 231c76fcda Added a comment about the fix
This change was not committed, possibly due to the use of testing directory
2021-06-18 18:12:28 +05:30
Mitul16 ffd7f80e0d Fixed flake8 warning, one unused import 2021-06-18 16:24:31 +05:30
Mitul16 6b8a956c54 Fixed ChannelError constructor calls
There is a missing argument to the ChannelError constructor - ch (channel). Because of this, many explicitly passed error messages are simply rejected. There is a minor typo correction as well, 'writiers' -> 'writers'.
2021-06-18 16:17:53 +05:30
Caleb Stewart 89ad889977 Changed ChannelError to ChannelClosed in Socket
Socket-based channels now raise ChannelClosed if no connection is active
and a recv/send method is called. Also, the close method no longer
raises an exception if the channel is not active. It is silently ignored
as a NOOP.
2021-06-17 18:08:50 -04:00
Caleb Stewart a59857a2fc Added bare except around entire interactive loop 2021-06-17 17:58:30 -04:00
Caleb Stewart a1499f1a38 Added permission checks when opening files
Also fixed a tangential problem which arose regarding the group
enumerations which caused a recursive call the enumerate groups
from within the group enumeration.
2021-06-17 17:47:07 -04:00
Caleb Stewart 3c33d015e8 Added way for output thread to communicate channel error 2021-06-17 17:00:24 -04:00
Caleb Stewart 65c3dd4864 Brought interactive enabling into exception handler 2021-06-17 16:31:52 -04:00
Caleb Stewart af84d1a5a8 Added correct channel closing logic to Socket
The recv method did not used to handle an empty result properly. It now
raises a ChannelClosed exception properly. Also, odly, the
`Manager.find_session_by_channel` method had never been implemented.
2021-06-17 15:57:16 -04:00
Caleb Stewart 8e40b1759d Removed C-d loop in favor of static C-d count
It appears that you need to send every C-d twice, but I can't figure out
why. All manual testing only requires a single C-d, but double each
seems to correctly behave with file IO.
2021-06-17 13:29:14 -04:00
Caleb Stewart d8a566a51d
Merge pull request #139 from calebstewart/issue-118-ssl-bind
- Added `ssl-bind` and `ssl-connect` channel protocols for encrypted shells
- Added `ncat`-style arguments for the entrypoint and `connect` command (e.g. `--ssl` and `--ssl-cert`/`--ssl-key`)
- Added query-string arguments to connection strings for both the entrypoint
  and the `connect` command.
2021-06-17 00:01:26 -04:00
Caleb Stewart 102426e59f Added ncat style arguments to entry and connect 2021-06-16 22:44:29 -04:00
Caleb Stewart 39447c6a31 Ran pre-merge checks and updated changelog 2021-06-16 19:10:33 -04:00
Caleb Stewart e187240c5f Merge branch 'issue-118-ssl-bind' of github.com:calebstewart/pwncat into issue-118-ssl-bind 2021-06-16 19:05:33 -04:00
Caleb Stewart a168857852 Fixed typo in users variable 2021-06-16 19:05:12 -04:00
Caleb Stewart e843c89b9a Added ssl-bind and ssl-connect usage documentation 2021-06-16 19:05:12 -04:00
Caleb Stewart c12d53d8c7 Added updated entrypoint syntax to connect command 2021-06-16 19:05:12 -04:00
Caleb Stewart 74962f2b2d Added certificate options for entrypoint
TODO: transfer entrypoint logic to `connect`
2021-06-16 19:05:12 -04:00
Caleb Stewart 0f00871abf Added ssl-connect protocol 2021-06-16 19:05:12 -04:00
Caleb Stewart 2c9a1dbc71 Initial implementation of ssl-wrapped socket 2021-06-16 19:05:12 -04:00
Caleb Stewart 882f41626a Added issue link to changelog 2021-06-16 18:51:45 -04:00
Caleb Stewart 5b2b11389e Updated changelog for exception handling 2021-06-16 18:49:56 -04:00
Caleb Stewart 07be104ddd Added exception handling for state transition 2021-06-16 18:48:10 -04:00
Caleb Stewart 2691f77c76
Merge pull request #136 from calebstewart/update-issue-templates
Added headings and version in feature/bug reports
2021-06-16 18:16:59 -04:00
Caleb Stewart 4116f94814 Added headings and version in feature/bug reports 2021-06-16 18:15:44 -04:00
Caleb Stewart 5f18ed48c6
Merge pull request #135 from calebstewart/issue-134-dockerhub-builds-failing
- Pinned Alpine to 3.13.5 in Dockerfile
- Installed pwncat within a virtual environment at /opt/pwncat inside the container
2021-06-16 18:03:16 -04:00
Caleb Stewart 6500ba72ec
Merge branch 'master' into issue-134-dockerhub-builds-failing 2021-06-16 17:31:54 -04:00
Caleb Stewart 67b9f52ff1 Update changelog to reflect dockerfile changes 2021-06-16 17:24:40 -04:00
Caleb Stewart 4afa208201 Pinned alpine to 3.13.5 2021-06-16 17:08:01 -04:00
Caleb Stewart 723d8dfdb8
Merge pull request #132 from Mitul16/master
### Changed
- Changed session tracking so session IDs aren't reused
- Changed zsh prompt to match CWD of other shell prompts
### Fixed
- Fixed syntax for f-strings in escalation command
2021-06-16 16:25:00 -04:00
Caleb Stewart 72c31e305e Removed release data and version from CHANGELOG
I will release a patch version once a couple other bugs
are fixed. Namely, the dockerhub building problems and
exception issues. In the meantime, the changes are listed
under "Unreleased".
2021-06-16 16:12:39 -04:00
Caleb Stewart f4c01af113 Modified dockerfile to install in virtualenv 2021-06-16 16:10:48 -04:00
Mitul16 226724f8d4 Merge the changes made through the Web Editor, fixed some comments 2021-06-17 01:29:22 +05:30
Mitul16 97ecf1eab1 Updated CHANGELOG.md
I am not sure about the changes I have made, please have a look yourself. I did follow `Keep a changelog`.
2021-06-17 01:27:47 +05:30
Mitul16 eb18bf4e8d Applied changes from python-black, pre-merge checks
These changes do not affect the working of `pwncat`. You had an older version of `python-black`, and allowed me to apply the changes. As per the provided template, I have also ran `isort` and `flake8`, they reported no errors and/or modifications.
2021-06-17 01:24:25 +05:30
Mitul Varshney 4ac8ddee38
Replaced redundant comments with informative ones 2021-06-16 20:54:50 +05:30
Mitul16 1ffbc0e8e7 Merge branch 'master' of https://github.com/calebstewart/pwncat 2021-06-16 16:58:58 +05:30