Skip to content

Commit

Permalink
Merge pull request #93 from cytopia/release-0.1.1
Browse files Browse the repository at this point in the history
Release 0.1.1
  • Loading branch information
cytopia authored Mar 27, 2021
2 parents f681073 + 8c14906 commit 25e443d
Show file tree
Hide file tree
Showing 18 changed files with 360 additions and 189 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/building.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
name: "[${{ matrix.version }}]"
steps:
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v2

- name: Build source distribution
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: "[ ${{ matrix.target }} ]"
steps:
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v2

- name: "${{ matrix.target }}"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: "[ ${{ matrix.target }} ]"
steps:
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v2

- name: "${{ matrix.target }}"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-pycodestyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: "[ ${{ matrix.target }} ]"
steps:
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v2

- name: "${{ matrix.target }}"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-pydocstyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: "[ ${{ matrix.target }} ]"
steps:
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v2

- name: "${{ matrix.target }}"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: "[ ${{ matrix.target }} ]"
steps:
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v2

- name: "${{ matrix.target }}"
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: "[ ${{ matrix.target }} ]"
steps:
- name: Checkout repository
uses: actions/checkout@master
uses: actions/checkout@v2

- name: Lint files
run: |
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
## Unreleased


## Release 0.1.1

### Fixes
- Fixes: pwncat will re-accept during local portforwarding if the client quits (previously pwncat shutdown)


## Release 0.1.0

### Fixes
Expand Down
55 changes: 37 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -146,44 +146,63 @@ code: _code-mypy

.PHONY: _code-pycodestyle
_code-pycodestyle:
@echo "# -------------------------------------------------------------------- #"
@echo "# Check pycodestyle"
@echo "# -------------------------------------------------------------------- #"
@V="$$( docker run --rm cytopia/pycodestyle --version | head -1 )"; \
echo "# -------------------------------------------------------------------- #"; \
echo "# Check pycodestyle: $${V}"; \
echo "# -------------------------------------------------------------------- #"
@#
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data --entrypoint= cytopia/pycodestyle sh -c ' \
mkdir -p /tmp \
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
&& pycodestyle --config=setup.cfg /tmp/$(BINNAME).py'

.PHONY: _code-pydocstyle
_code-pydocstyle:
@echo "# -------------------------------------------------------------------- #"
@echo "# Check pycodestyle"
@echo "# -------------------------------------------------------------------- #"
@V="$$( docker run --rm cytopia/pydocstyle --version | head -1 )"; \
echo "# -------------------------------------------------------------------- #"; \
echo "# Check pydocstyle: $${V}"; \
echo "# -------------------------------------------------------------------- #"
@#
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data --entrypoint= cytopia/pydocstyle sh -c ' \
mkdir -p /tmp \
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
&& pydocstyle --explain --config=setup.cfg /tmp/$(BINNAME).py'

.PHONY: _code-pylint
_code-pylint:
@echo "# -------------------------------------------------------------------- #"
@echo "# Check pylint"
@echo "# -------------------------------------------------------------------- #"
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data cytopia/pylint --rcfile=setup.cfg $(BINPATH)$(BINNAME)
@V="$$( docker run --rm cytopia/pylint --version | head -1 )"; \
echo "# -------------------------------------------------------------------- #"; \
echo "# Check pylint: $${V}"; \
echo "# -------------------------------------------------------------------- #"
@#
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data --entrypoint= cytopia/pylint sh -c ' \
mkdir -p /tmp \
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
&& pylint --rcfile=setup.cfg /tmp/$(BINNAME).py'

.PHONY: _code-black
_code-black:
@echo "# -------------------------------------------------------------------- #"
@echo "# Check Python Black"
@echo "# -------------------------------------------------------------------- #"
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data cytopia/black -l 100 --check --diff $(BINPATH)$(BINNAME)
@V="$$( docker run --rm cytopia/black --version | head -1 )"; \
echo "# -------------------------------------------------------------------- #"; \
echo "# Check Python Black: $${V}"; \
echo "# -------------------------------------------------------------------- #"
@#
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data --entrypoint= cytopia/black sh -c ' \
mkdir -p /tmp \
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
&& black -l 100 --check --diff /tmp/$(BINNAME).py'

.PHONY: _code-mypy
_code-mypy:
@echo "# -------------------------------------------------------------------- #"
@echo "# Check mypy"
@echo "# -------------------------------------------------------------------- #"
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data cytopia/mypy --config-file setup.cfg $(BINPATH)$(BINNAME)
@V="$$( docker run --rm cytopia/mypy --version | head -1 )"; \
echo "# -------------------------------------------------------------------- #"; \
echo "# Check Mypy: $${V}"; \
echo "# -------------------------------------------------------------------- #"
@#
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data --entrypoint= cytopia/mypy sh -c ' \
mkdir -p /tmp \
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
&& mypy --config-file setup.cfg /tmp/$(BINNAME).py'


# -------------------------------------------------------------------------------------------------
Expand Down
52 changes: 46 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
</tbody>
</table>

> <sup>[1] <a href="https://cytopia.github.io/pwncat/pwncat.type.html">mypy type coverage</a> <strong>(fully typed: 93.84%)</strong></sup><br/>
> <sup>[1] <a href="https://cytopia.github.io/pwncat/pwncat.type.html">mypy type coverage</a> <strong>(fully typed: 94.00%)</strong></sup><br/>
> <sup>[2] <strong>Failing builds do not indicate broken functionality.</strong> Integration tests run for multiple hours and break sporadically for various different reasons (network timeouts, unknown cancellations of GitHub Actions, etc): <a href="https://github.com/actions/virtual-environments/issues/736">#735</a>, <a href="https://github.com/actions/virtual-environments/issues/841">#841</a></sup><br/>
> <sup></sup>
Expand All @@ -155,12 +155,50 @@ tool that works on older and newer machines (hence Python 2+3 compat). Most impo

## :tada: Install

Current version is: **0.1.0**
Current version is: **0.1.1**

#### Generic

| [Pip](https://pypi.org/project/pwncat/) |
|:-:|
| [![](https://raw.githubusercontent.com/cytopia/icons/master/64x64/python.png)](https://pypi.org/project/pwncat/) |
| `pip install pwncat` |


#### OS specific

| **[MacOS][mac_lnk]** | **[Arch Linux][arch_lnk]** | **[BlackArch][barch_lnk]** | **[CentOS][centos_lnk]** |
|:---------------------------:|:--------------------------:|:----------------------------:|:---------------------------:|
| [![mac_img]][mac_lnk] | [![arch_img]][arch_lnk] | [![barch_img]][barch_lnk] | [![centos_img]][centos_lnk] |
| `brew install pwncat` | `yay -S pwncat` | `pacman -S pwncat` | `yum install pwncat` |
| **[Fedora][fedora_lnk]** | **[Kali Linux][kali_lnk]** | **[Parrot OS][parrot_lnk]** | **[Pentoo][pentoo_lnk]** |
| [![fedora_img]][fedora_lnk] | [![kali_img]][kali_lnk] | [![parrot_img]][parrot_lnk] | [![pentoo_img]][pentoo_lnk] |
| `dnf install pwncat` | `apt install pwncat` | `apt install pwncat` | `net-analyzer/pwncat` |

[mac_lnk]: https://formulae.brew.sh/formula/pwncat#default
[mac_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/osx.png

[arch_lnk]: https://aur.archlinux.org/packages/pwncat/
[arch_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/archlinux.png

[barch_lnk]: https://www.blackarch.org/tools.html
[barch_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/blackarch.png

[centos_lnk]: https://pkgs.org/download/pwncat
[centos_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/centos.png

[fedora_lnk]: https://src.fedoraproject.org/rpms/pwncat
[fedora_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/fedora.png

[kali_lnk]: https://gitlab.com/kalilinux/packages/pwncat
[kali_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/kali.png

[parrot_lnk]: https://repology.org/project/pwncat/versions
[parrot_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/parrot.png

[pentoo_lnk]: https://repology.org/project/pwncat/versions
[pentoo_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/pentoo.png

| [Pip](https://pypi.org/project/pwncat/) | [ArchLinux](https://aur.archlinux.org/packages/pwncat/) | [BlackArch](https://www.blackarch.org/tools.html) | [MacOS](https://formulae.brew.sh/formula/pwncat#default) |
|:-:|:-:|:-:|:-:|
| [![](https://raw.githubusercontent.com/cytopia/icons/master/64x64/python.png)](https://pypi.org/project/pwncat/) | [![](https://raw.githubusercontent.com/cytopia/icons/master/64x64/archlinux.png)](https://aur.archlinux.org/packages/pwncat/) | [![](https://raw.githubusercontent.com/cytopia/icons/master/64x64/blackarch.png)](https://www.blackarch.org/tools.html) | [![](https://raw.githubusercontent.com/cytopia/icons/master/64x64/osx.png)](https://formulae.brew.sh/formula/pwncat#default) |
| `pip install pwncat` | `yay -S pwncat` | `pacman -S pwncat` | `brew install pwncat` |


## :coffee: TL;DR
Expand Down Expand Up @@ -1400,6 +1438,7 @@ Below is a list of sec tools and docs I am maintaining.
| **[pwncat]** | Pivoting | Python 2+3 | Cross-platform netcat on steroids |
| **[badchars]** | Reverse Engineering | Python 2+3 | Badchar generator |
| **[fuzza]** | Reverse Engineering | Python 2+3 | TCP fuzzing tool |
| **[docker-dvwa]** | Playground | PHP | DVWA with local priv esc challenges |

[offsec]: https://github.com/cytopia/offsec
[header-fuzz]: https://github.com/cytopia/header-fuzz
Expand All @@ -1408,6 +1447,7 @@ Below is a list of sec tools and docs I am maintaining.
[pwncat]: https://github.com/cytopia/pwncat
[badchars]: https://github.com/cytopia/badchars
[fuzza]: https://github.com/cytopia/fuzza
[docker-dvwa]: https://github.com/cytopia/docker-dvwa


## :octocat: Contributing
Expand Down
Loading

0 comments on commit 25e443d

Please sign in to comment.