Skip to content

Commit 25e443d

Browse files
authored
Merge pull request #93 from cytopia/release-0.1.1
Release 0.1.1
2 parents f681073 + 8c14906 commit 25e443d

18 files changed

+360
-189
lines changed

.github/workflows/building.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
name: "[${{ matrix.version }}]"
2929
steps:
3030
- name: Checkout repository
31-
uses: actions/checkout@master
31+
uses: actions/checkout@v2
3232

3333
- name: Build source distribution
3434
run: |

.github/workflows/code-black.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: "[ ${{ matrix.target }} ]"
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@master
26+
uses: actions/checkout@v2
2727

2828
- name: "${{ matrix.target }}"
2929
run: |

.github/workflows/code-mypy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: "[ ${{ matrix.target }} ]"
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@master
26+
uses: actions/checkout@v2
2727

2828
- name: "${{ matrix.target }}"
2929
run: |

.github/workflows/code-pycodestyle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: "[ ${{ matrix.target }} ]"
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@master
26+
uses: actions/checkout@v2
2727

2828
- name: "${{ matrix.target }}"
2929
run: |

.github/workflows/code-pydocstyle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: "[ ${{ matrix.target }} ]"
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@master
26+
uses: actions/checkout@v2
2727

2828
- name: "${{ matrix.target }}"
2929
run: |

.github/workflows/code-pylint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: "[ ${{ matrix.target }} ]"
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@master
26+
uses: actions/checkout@v2
2727

2828
- name: "${{ matrix.target }}"
2929
run: |

.github/workflows/linting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: "[ ${{ matrix.target }} ]"
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@master
26+
uses: actions/checkout@v2
2727

2828
- name: Lint files
2929
run: |

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
## Unreleased
55

66

7+
## Release 0.1.1
8+
9+
### Fixes
10+
- Fixes: pwncat will re-accept during local portforwarding if the client quits (previously pwncat shutdown)
11+
12+
713
## Release 0.1.0
814

915
### Fixes

Makefile

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -146,44 +146,63 @@ code: _code-mypy
146146

147147
.PHONY: _code-pycodestyle
148148
_code-pycodestyle:
149-
@echo "# -------------------------------------------------------------------- #"
150-
@echo "# Check pycodestyle"
151-
@echo "# -------------------------------------------------------------------- #"
149+
@V="$$( docker run --rm cytopia/pycodestyle --version | head -1 )"; \
150+
echo "# -------------------------------------------------------------------- #"; \
151+
echo "# Check pycodestyle: $${V}"; \
152+
echo "# -------------------------------------------------------------------- #"
153+
@#
152154
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data --entrypoint= cytopia/pycodestyle sh -c ' \
153155
mkdir -p /tmp \
154156
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
155157
&& pycodestyle --config=setup.cfg /tmp/$(BINNAME).py'
156158

157159
.PHONY: _code-pydocstyle
158160
_code-pydocstyle:
159-
@echo "# -------------------------------------------------------------------- #"
160-
@echo "# Check pycodestyle"
161-
@echo "# -------------------------------------------------------------------- #"
161+
@V="$$( docker run --rm cytopia/pydocstyle --version | head -1 )"; \
162+
echo "# -------------------------------------------------------------------- #"; \
163+
echo "# Check pydocstyle: $${V}"; \
164+
echo "# -------------------------------------------------------------------- #"
165+
@#
162166
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data --entrypoint= cytopia/pydocstyle sh -c ' \
163167
mkdir -p /tmp \
164168
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
165169
&& pydocstyle --explain --config=setup.cfg /tmp/$(BINNAME).py'
166170

167171
.PHONY: _code-pylint
168172
_code-pylint:
169-
@echo "# -------------------------------------------------------------------- #"
170-
@echo "# Check pylint"
171-
@echo "# -------------------------------------------------------------------- #"
172-
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data cytopia/pylint --rcfile=setup.cfg $(BINPATH)$(BINNAME)
173+
@V="$$( docker run --rm cytopia/pylint --version | head -1 )"; \
174+
echo "# -------------------------------------------------------------------- #"; \
175+
echo "# Check pylint: $${V}"; \
176+
echo "# -------------------------------------------------------------------- #"
177+
@#
178+
docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data --entrypoint= cytopia/pylint sh -c ' \
179+
mkdir -p /tmp \
180+
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
181+
&& pylint --rcfile=setup.cfg /tmp/$(BINNAME).py'
173182

174183
.PHONY: _code-black
175184
_code-black:
176-
@echo "# -------------------------------------------------------------------- #"
177-
@echo "# Check Python Black"
178-
@echo "# -------------------------------------------------------------------- #"
179-
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data cytopia/black -l 100 --check --diff $(BINPATH)$(BINNAME)
185+
@V="$$( docker run --rm cytopia/black --version | head -1 )"; \
186+
echo "# -------------------------------------------------------------------- #"; \
187+
echo "# Check Python Black: $${V}"; \
188+
echo "# -------------------------------------------------------------------- #"
189+
@#
190+
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data --entrypoint= cytopia/black sh -c ' \
191+
mkdir -p /tmp \
192+
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
193+
&& black -l 100 --check --diff /tmp/$(BINNAME).py'
180194

181195
.PHONY: _code-mypy
182196
_code-mypy:
183-
@echo "# -------------------------------------------------------------------- #"
184-
@echo "# Check mypy"
185-
@echo "# -------------------------------------------------------------------- #"
186-
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data cytopia/mypy --config-file setup.cfg $(BINPATH)$(BINNAME)
197+
@V="$$( docker run --rm cytopia/mypy --version | head -1 )"; \
198+
echo "# -------------------------------------------------------------------- #"; \
199+
echo "# Check Mypy: $${V}"; \
200+
echo "# -------------------------------------------------------------------- #"
201+
@#
202+
docker run --rm $$(tty -s && echo "-it" || echo) -v ${PWD}:/data --entrypoint= cytopia/mypy sh -c ' \
203+
mkdir -p /tmp \
204+
&& cp $(BINPATH)$(BINNAME) /tmp/$(BINNAME).py \
205+
&& mypy --config-file setup.cfg /tmp/$(BINNAME).py'
187206

188207

189208
# -------------------------------------------------------------------------------------------------

README.md

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
</tbody>
137137
</table>
138138

139-
> <sup>[1] <a href="https://cytopia.github.io/pwncat/pwncat.type.html">mypy type coverage</a> <strong>(fully typed: 93.84%)</strong></sup><br/>
139+
> <sup>[1] <a href="https://cytopia.github.io/pwncat/pwncat.type.html">mypy type coverage</a> <strong>(fully typed: 94.00%)</strong></sup><br/>
140140
> <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/>
141141
> <sup></sup>
142142
@@ -155,12 +155,50 @@ tool that works on older and newer machines (hence Python 2+3 compat). Most impo
155155

156156
## :tada: Install
157157

158-
Current version is: **0.1.0**
158+
Current version is: **0.1.1**
159+
160+
#### Generic
161+
162+
| [Pip](https://pypi.org/project/pwncat/) |
163+
|:-:|
164+
| [![](https://raw.githubusercontent.com/cytopia/icons/master/64x64/python.png)](https://pypi.org/project/pwncat/) |
165+
| `pip install pwncat` |
166+
167+
168+
#### OS specific
169+
170+
| **[MacOS][mac_lnk]** | **[Arch Linux][arch_lnk]** | **[BlackArch][barch_lnk]** | **[CentOS][centos_lnk]** |
171+
|:---------------------------:|:--------------------------:|:----------------------------:|:---------------------------:|
172+
| [![mac_img]][mac_lnk] | [![arch_img]][arch_lnk] | [![barch_img]][barch_lnk] | [![centos_img]][centos_lnk] |
173+
| `brew install pwncat` | `yay -S pwncat` | `pacman -S pwncat` | `yum install pwncat` |
174+
| **[Fedora][fedora_lnk]** | **[Kali Linux][kali_lnk]** | **[Parrot OS][parrot_lnk]** | **[Pentoo][pentoo_lnk]** |
175+
| [![fedora_img]][fedora_lnk] | [![kali_img]][kali_lnk] | [![parrot_img]][parrot_lnk] | [![pentoo_img]][pentoo_lnk] |
176+
| `dnf install pwncat` | `apt install pwncat` | `apt install pwncat` | `net-analyzer/pwncat` |
177+
178+
[mac_lnk]: https://formulae.brew.sh/formula/pwncat#default
179+
[mac_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/osx.png
180+
181+
[arch_lnk]: https://aur.archlinux.org/packages/pwncat/
182+
[arch_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/archlinux.png
183+
184+
[barch_lnk]: https://www.blackarch.org/tools.html
185+
[barch_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/blackarch.png
186+
187+
[centos_lnk]: https://pkgs.org/download/pwncat
188+
[centos_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/centos.png
189+
190+
[fedora_lnk]: https://src.fedoraproject.org/rpms/pwncat
191+
[fedora_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/fedora.png
192+
193+
[kali_lnk]: https://gitlab.com/kalilinux/packages/pwncat
194+
[kali_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/kali.png
195+
196+
[parrot_lnk]: https://repology.org/project/pwncat/versions
197+
[parrot_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/parrot.png
198+
199+
[pentoo_lnk]: https://repology.org/project/pwncat/versions
200+
[pentoo_img]: https://raw.githubusercontent.com/cytopia/icons/master/64x64/pentoo.png
159201

160-
| [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) |
161-
|:-:|:-:|:-:|:-:|
162-
| [![](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) |
163-
| `pip install pwncat` | `yay -S pwncat` | `pacman -S pwncat` | `brew install pwncat` |
164202

165203

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

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

14121452

14131453
## :octocat: Contributing

0 commit comments

Comments
 (0)