1
0
mirror of https://github.com/calebstewart/pwncat.git synced 2024-11-24 09:35:39 +01:00
Commit Graph

602 Commits

Author SHA1 Message Date
Mitul16
2767547019 Updated 'verbose' in 'Platform'
I have changed the logger name from 'str(channel)' to 'str(id(channel))' to create a logger unique to one 'channel'. Also, added a separate method to set verbose output and added a private variable to store the logging handler object
2021-07-19 17:14:13 +05:30
Mitul16
168b98ea7b Pre-Merge task: formatted w/ python-black 2021-07-18 13:25:25 +05:30
Mitul16
fd458aa308 Prevented '^C' from being shown to the user
This will only keep the 'log info' in one line, the output for 'rich console'. I have 'force-pushed' to prevent git-history pollution. Oops! I forgot to use same comments :p
2021-07-18 12:58:03 +05:30
Mitul16
a4cee5be27 Completed pre-merge tasks
There was a 'flake8' warning about an unused import 'import signal' in 'pwncat/platform/windows.py'
2021-07-18 02:38:01 +05:30
Mitul16
868ee84f0f Updated CHANGELOG.md 2021-07-18 02:37:49 +05:30
Mitul16
b511a37f71 Fixed some error messages
'socket.gaierror' is caught when we are unable to resolve the host name into the IP address. 'OSError' is caught when the host is invalid. I have now used the appropriate messages.
2021-07-18 02:30:17 +05:30
Mitul16
eae6440145 Replaced a single 'better shell' with a list
This is not a required feature to have, since 'bash' is rarely absent on a system. I may be wrong :p
2021-07-18 02:28:27 +05:30
Mitul16
50998d4c97 Fixed a possible exception leak
Previously, we were registering a new 'session' with the 'manager' before completing the setup: '__init__'. Any exception raised after we registered the 'session' didn't remove the registered session. This will allow the reuse of same 'session_id' because we have already registered the 'session' with this 'session_id', which may possibly be an invalid session because an exception is raised. And 'session_id' variable in 'manager' will not be updated because of this exception. Thus, I have shifted down the session registering part so that it occurs after the completion of session creation.
2021-07-18 02:24:28 +05:30
Mitul16
534002288c Added warning messages for 'KeyboardInterrupt'
I have added warning messages so that the attacker can use 'C-c' to cancel the session when used from command line (not from local prompt). And added the message for already handled same exception. I have also changed two warning message color from 'red' to 'yellow', because 'yellow' is being used everywhere in the code.
2021-07-18 02:21:16 +05:30
Mitul16
230b3995f5 Fixed a minor typo
To me, it looked like a 'typo'. You may !cherry-pick this commit. :)
2021-07-18 02:13:36 +05:30
Caleb Stewart
175eb5da9f small change to .gitattributes 2021-06-21 15:29:36 -04:00
Caleb Stewart
e3152e52f8
Merge pull request #148 from calebstewart/fix-language-listing
added gitattributes to hide powershell from language statistics
2021-06-21 15:25:59 -04:00
Caleb Stewart
7f4120e1e0 added gitattributes to hide powershell from language statistics 2021-06-21 15:21:24 -04:00
Caleb Stewart
af0888fc70
Merge pull request #146 from Mitul16/patch-1
Updated current master branch version
2021-06-19 22:31:45 -04:00
Mitul Varshney
6fdd31d8d6
Updated current master branch version
Please consider any other modifications as well, e.g. _Read the Docs_
2021-06-19 13:42:58 +05:30
Caleb Stewart
3c09a84454 Bumped version number and changelog 2021-06-18 20:21:25 -04:00
Caleb Stewart
a949a611c1
Merge pull request #138 from calebstewart/issue-133-uncaught-channelerror
Improved exception handling throughout the framework.
2021-06-18 19:57:02 -04:00
Caleb Stewart
d2e757e7f3 Merge branch 'issue-133-uncaught-channelerror' of github.com:calebstewart/pwncat into issue-133-uncaught-channelerror 2021-06-18 19:47:12 -04:00
Caleb Stewart
a95f2df50c Fixed Windows platform transitions
Exception handling in the output thread was cleaned up and had Windows
platform raise the RawModeExit exception to trigger an exit when
interactive end marker was observed.
2021-06-18 19:45:59 -04:00
Caleb Stewart
f1b96a8f9d
Merge branch 'master' into issue-133-uncaught-channelerror 2021-06-18 18:48:37 -04:00
Caleb Stewart
cce789c99d Updated changelog
There's no easy way to classify all the exception handling fixes
implemented in this branch, so I'm just going with this...
2021-06-18 18:44:23 -04:00
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
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