From 712521060d9c6b34759a17f939f3346d862db807 Mon Sep 17 00:00:00 2001 From: Manfred Kaiser Date: Tue, 8 Jun 2021 14:55:21 +0200 Subject: [PATCH 1/7] added ssh-mitm application --- applications/ssh-mitm/entrypoint.sh | 2 ++ applications/ssh-mitm/requirements.txt | 1 + applications/ssh-mitm/ssh-mitm.appdata.xml | 17 +++++++++++++++++ applications/ssh-mitm/ssh-mitm.desktop | 8 ++++++++ 4 files changed, 28 insertions(+) create mode 100644 applications/ssh-mitm/entrypoint.sh create mode 100644 applications/ssh-mitm/requirements.txt create mode 100644 applications/ssh-mitm/ssh-mitm.appdata.xml create mode 100644 applications/ssh-mitm/ssh-mitm.desktop diff --git a/applications/ssh-mitm/entrypoint.sh b/applications/ssh-mitm/entrypoint.sh new file mode 100644 index 0000000..a13985f --- /dev/null +++ b/applications/ssh-mitm/entrypoint.sh @@ -0,0 +1,2 @@ +#! /bin/bash -i +{{ python-executable }} -u "${APPDIR}/opt/python{{ python-version }}/bin/ssh-mitm" "$@" diff --git a/applications/ssh-mitm/requirements.txt b/applications/ssh-mitm/requirements.txt new file mode 100644 index 0000000..1b7203a --- /dev/null +++ b/applications/ssh-mitm/requirements.txt @@ -0,0 +1 @@ +ssh-mitm diff --git a/applications/ssh-mitm/ssh-mitm.appdata.xml b/applications/ssh-mitm/ssh-mitm.appdata.xml new file mode 100644 index 0000000..1e42f0d --- /dev/null +++ b/applications/ssh-mitm/ssh-mitm.appdata.xml @@ -0,0 +1,17 @@ + + + ssh-mitm + MIT + Python-2.0 + SSH-MITM + SSH-MITM on Python {{ python-fullversion }} + +

Python {{ python-fullversion }} + SSH-MITM bundled in an AppImage. +

+ + ssh-mitm.desktop + https://www.ssh.mitm.at + + python{{ python-version }} + + diff --git a/applications/ssh-mitm/ssh-mitm.desktop b/applications/ssh-mitm/ssh-mitm.desktop new file mode 100644 index 0000000..25fdcf6 --- /dev/null +++ b/applications/ssh-mitm/ssh-mitm.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=ssh-mitm +Exec=ssh-mitm +Comment=SSH-MITM on Python {{ python-fullversion }} +Icon=python +Categories=System; +Terminal=true From 365acc7431754a5a598aebb2fb4aa3ac7c91b2b8 Mon Sep 17 00:00:00 2001 From: Manfred Kaiser Date: Tue, 8 Jun 2021 15:03:53 +0200 Subject: [PATCH 2/7] updated python version and download link in readme --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index fdd17fb..b420baa 100644 --- a/README.md +++ b/README.md @@ -14,14 +14,14 @@ Running Python from these [AppImages][APPIMAGE] is as simple as downloading a single file and changing its mode to executable, e.g. as: ```sh -wget https://github.com/niess/python-appimage/releases/download/\ -python3.9/python3.9.4-cp39-cp39-manylinux1_x86_64.AppImage -chmod +x python3.9.4-cp39-cp39-manylinux1_x86_64.AppImage +wget https://github.com/niess/python-appimage/releases/download\ +/python3.10/python3.10.0-cp310-cp310-manylinux2010_x86_64.AppImage +chmod +x python3.10.0-cp310-cp310-manylinux2010_x86_64.AppImage -./python3.9.4-cp39-cp39-manylinux1_x86_64.AppImage +./python3.10.0-cp310-cp310-manylinux2010_x86_64.AppImage ``` -This should start a Python 3.8 interactive session on _almost_ any Linux +This should start a Python 3.10 interactive session on _almost_ any Linux provided that `fuse` is available. Note that on WSL1 since `fuse` is not supported you will need to extract the AppImage as explained hereafter. @@ -30,11 +30,11 @@ its standard library. However, if you plan to install extra packages we recommend extracting the AppImage, e.g. as: ```sh -./python3.9.4-cp39-cp39-manylinux1_x86_64.AppImage --appimage-extract -mv squashfs-root python3.9 -rm -f python3.9.4-cp39-cp39-manylinux1_x86_64.AppImage +./python3.10.0-cp310-cp310-manylinux2010_x86_64.AppImage --appimage-extract +mv squashfs-root python3.10 +rm -f python3.10.0-cp310-cp310-manylinux2010_x86_64.AppImage -export PATH="$(pwd)/python3.9/usr/bin:$PATH" +export PATH="$(pwd)/python3.10/usr/bin:$PATH" ``` Then, extra packages can be installed to the extracted AppDir using `pip`. For From ff2e60585862e9dc9f1bb04620ec134ba77fa1b5 Mon Sep 17 00:00:00 2001 From: Manfred Kaiser Date: Tue, 8 Jun 2021 15:04:18 +0200 Subject: [PATCH 3/7] added ssh-mitm project to project list --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b420baa..95f0425 100644 --- a/README.md +++ b/README.md @@ -64,10 +64,11 @@ packages. Then, simply rebuild the AppImage using your favourite tool, e.g. * [grand/python](https://github.com/grand-mother/python) - Contained, portable and modern python for [GRAND][GRAND] running from an AppImage * [xxh](https://github.com/xxh/xxh) - Bring your favorite shell wherever you go - through the ssh -* [xonsh](https://github.com/xonsh/xonsh) - Python-powered, cross-platform, Unix-gazing + through the ssh +* [xonsh](https://github.com/xonsh/xonsh) - Python-powered, cross-platform, Unix-gazing shell language and command prompt * [rever](https://github.com/regro/rever) - Cross-platform software release tool. +* [ssh-mitm](https://github.com/ssh-mitm/ssh-mitm) - ssh mitm server for security audits [APPIMAGE]: https://appimage.org From 376344d493d905dec3a663bd5187ebf9e94dc7d9 Mon Sep 17 00:00:00 2001 From: Manfred Kaiser Date: Tue, 8 Jun 2021 15:38:58 +0200 Subject: [PATCH 4/7] added test for ssh-mitm --- .github/workflows/applications.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/applications.yml b/.github/workflows/applications.yml index 36c4072..08de669 100644 --- a/.github/workflows/applications.yml +++ b/.github/workflows/applications.yml @@ -38,3 +38,9 @@ jobs: python -m python_appimage build app applications/xonsh test -e xonsh-x86_64.AppImage ./xonsh-x86_64.AppImage -c 'import xonsh' + + - name: Test ssh-mitm + run: | + python -m python_appimage build app applications/ssh-mitm + test -e ssh-mitm-x86_64.AppImage + ./ssh-mitm-x86_64.AppImage -c 'import ssh_proxy_server' From f217286fad5c80ac40958dbdf0e46c008893c93c Mon Sep 17 00:00:00 2001 From: Manfred Kaiser Date: Tue, 8 Jun 2021 15:43:18 +0200 Subject: [PATCH 5/7] trigger test --- .github/workflows/applications.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/applications.yml b/.github/workflows/applications.yml index 08de669..038b650 100644 --- a/.github/workflows/applications.yml +++ b/.github/workflows/applications.yml @@ -39,6 +39,7 @@ jobs: test -e xonsh-x86_64.AppImage ./xonsh-x86_64.AppImage -c 'import xonsh' + - name: Test ssh-mitm run: | python -m python_appimage build app applications/ssh-mitm From 8a4c48ba97f732b87e1d2f226236e77c40b32807 Mon Sep 17 00:00:00 2001 From: Manfred Kaiser Date: Tue, 8 Jun 2021 15:47:32 +0200 Subject: [PATCH 6/7] fixed ssh-mitm test --- .github/workflows/applications.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/applications.yml b/.github/workflows/applications.yml index 038b650..6262f84 100644 --- a/.github/workflows/applications.yml +++ b/.github/workflows/applications.yml @@ -39,9 +39,8 @@ jobs: test -e xonsh-x86_64.AppImage ./xonsh-x86_64.AppImage -c 'import xonsh' - - name: Test ssh-mitm run: | python -m python_appimage build app applications/ssh-mitm test -e ssh-mitm-x86_64.AppImage - ./ssh-mitm-x86_64.AppImage -c 'import ssh_proxy_server' + ./ssh-mitm-x86_64.AppImage --help' From 47cda355847cb1aa123dd3842ad658aa30132b8c Mon Sep 17 00:00:00 2001 From: Manfred Kaiser Date: Tue, 8 Jun 2021 15:56:13 +0200 Subject: [PATCH 7/7] added python 3.6 --- .github/workflows/applications.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/applications.yml b/.github/workflows/applications.yml index 6262f84..c260693 100644 --- a/.github/workflows/applications.yml +++ b/.github/workflows/applications.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ['2.7', '3.5'] + version: ['2.7', '3.5', '3.6'] steps: - uses: actions/checkout@v2 @@ -40,7 +40,8 @@ jobs: ./xonsh-x86_64.AppImage -c 'import xonsh' - name: Test ssh-mitm + if: ${{ matrix.version == '3.6' }} run: | python -m python_appimage build app applications/ssh-mitm test -e ssh-mitm-x86_64.AppImage - ./ssh-mitm-x86_64.AppImage --help' + ./ssh-mitm-x86_64.AppImage --help