From 7252356f44d9d034a1068261e1d68830b2041c47 Mon Sep 17 00:00:00 2001 From: Oleksii Shevchuk Date: Sat, 18 Apr 2020 11:48:36 +0300 Subject: [PATCH] create-workspace: prebuild templates are broken, removing --- .travis.yml | 15 --------------- create-workspace.py | 42 ------------------------------------------ 2 files changed, 57 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5f57b86..e20edc87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,24 +35,9 @@ after_success: docker push alxchk/pupy:$TAG >/dev/null; docker push alxchk/pupy:base-$TAG >/dev/null; fi -- export TRAVIS_TAG=`if [ "$TRAVIS_REPO_SLUG" = "n1nj4sec/pupy" ] && [ -z "$TRAVIS_PULL_REQUEST_SLUG" ]; then echo "latest"; else echo ""; fi` env: global: - COMMIT=${TRAVIS_COMMIT::8} - secure: gKv5C4ZTnnzOcQiGrbwEgJhE8SPJLCSIYsdDLpDIHk7OjNu+hGp+frygU25w2NlHyV7cReu7glvyphVwmrQ+FyBRtrKysk+HbU59QiVVOD6x8uyDEZ5qG0NeEOoD9ChdgSy2CSl39Pf8IIcCgZIcyNDukxZbGaUr4LpOSRu8E5H1YT9qxpsDHidQkkcYbZLNlVmhBNZ2LlFXZAu7LwSx111dMTPPVY+zRR1VmaXLuqn90p/L5Cn04xcJHMSc9fhIA3ty463KgDMuM4IXYQS1xCxyZwCpYGbHtuZYDvjmrVhQpEidj5ibcnb+ll+9XNr4JYi6ldVRDmv7J/1DOVd9Iw77LJ0SAGvTDGzTMHRz74Er82xa6zu5NkzW98oti6tCYM9QeAGp4QSJnO0WqgG87y3JW0Ponv3suMG60zPAeLYcuiyhmmOy/v3w0Xq1FHsyqSayN4koJDpUJ7DQQDbSv1Nc0MaG9XZaNVAMab0sWaqbgCMkteNN6w72lAVTck6b/NDV2taONOiNJFJIhiOpO4EZ8g4t7j/ZXpBnP9O+//APQ5WeREEcsbS32y2/R6YiHkKlnPDomfm1fJWZh3KUzRur3PbXvpJkc9D+68UYh02oYlodfi9zoDpCn5OymFPYYI9fibmbuZ1aBwlGPsYnYliAXtlEd/W3XMKT1pWdvbI= - secure: HOQ7k4Sf9p3CyNy02lBMH5Ff2OeOXQWElLad9vFg0LTkxfnfkGeWP9K+fAR9Lp3nAAd5QRX/2MaJxJTomVHJSCGqjuqrqkBHBLCs7Fgt+bKx2F3QujoqJY4orZHKxpN7YFwAGF4rRzR5Q24xfvIgrnJNWgAoiEKV9yPEFa8k5pJ37MaTFRmOtkrfsN2bdpRc1uD5jbbccVFHPeTDIUa80JRuMBEVDMjJ+CeQq5il3OJUAEdiK03zPDeoCibQCl7UGQxvaWFpYlCUKw1r7d/roJcwlNnYrM0OnImAx0gAGg68vXfZFh/XHE75J3QA7eD/pQ3VdVH1OIgg2Ke3nqO4XMtl6nJGYjC+3fAzq+BOgqvHcwpNzVf6GIXwUl77Bfe1Hlx4uRrCmjbD769bIQLJeUtwKnp9fTjGC8iHEfxW5LsD3PH31vAWfADTB04puGzUAJaBVNwNlnw+dG15lH/LHvjxhJBze2Sj5Mgd2TyNDS+c6dDcIXBnLaajmxs32t87vWNjXjF0wMvBo9G1WMBH3N8UbIV/TPqaT5nINi9ntmY8wFDstNd6g1C3gtfVNsmA7cqb+AbeL8ezETMxwvTrUpPVAu2VcjomgE0zld4kBFvWVs9RQiBfmkChKEZZ3/5u9F9tRbaEcnQukw7+ULsrBqNbZwC4iHtMo3PYCHE0lk8= - secure: Ro35F3YR2e1vOnDSBTHe9HdUxC7N0CEk9cxNaiOrF34qm8EhS4SJT5pv6rmNWPw8eKctS35NFtHPkkPI1WSsomFxDSd36cq2e2vfO4vrfqojXEvPqeoJMneLV1/cmNUlX8kz3NDxOCyRBaPzF1fhem7QAmdWPZ005JzaZzPysQVXe0eTH5M1JKlLWBKkMgIDb/T0pI/zPq/kJc5V81ci9D7IVe8hlNR6SdSIZ4xOvBfZcPGMRZHew9yMIvI9a81uSplBy1LkX557Udj9n3A/4K5OsY+mrsJRd7Yk1AHB4SPLc2fW9GXiUCTVFCViQFX3YwdcPdbLnHVZbsVE6TfSrgN4GndG2OIkcVNXMgnNYk9bFjRcrXa+i+Oa2nnOQ0eYdvXuW5kGPoeoyJQZZWa9c3fWgt71Ze7eP/6SWIQ4mEyzpbWVHqL8m7aNGvI8/mfqlSk138ZiDYY1Va/IlcWwrBerkQaUz7a/j6sohB2zpua05LNrxW8ZPDhMo0Kq+U+e/x6Qqgc35MnnfhJR8AvA2CRccaxptWBcfzFlJ1CHhLKhdwSA8zfa58vRDnGphwqYO+FF44Tmr1NwRMT3ytHB5GtTSlUjzy0Evmyf81hhI0S+5L2Oeuv1n0sQEf/qS9Tfppuc36gAQClRgmHFgmM5WkIOQy/lyRKDUkM7/JUsE50= -before_deploy: - - tar -C $TRAVIS_BUILD_DIR/pupy -Jcf $TRAVIS_BUILD_DIR/payload_templates.txz payload_templates -deploy: - provider: releases - api_key: - secure: E3nJgSrYLIIil6eqP0h0c67Ktaw9QN7IfNDsaIuQwstZE/kBIJe9DIY93oaN+1soosknXHm/dsLeraNZVYXJbsoE9lPuDzOdC2sBq09xAR+ZRFXdtUMXtMDv816v2ZsdHZbfbNvm5ucixE9eGXDGPpDYcJRliHpAFPavysHL3lvF0dem1rI2RQsB0LGRYGOVFwjpdpqFITZs1BZxq/clXbqBLBnJO30D3LUdbXWYCqC4M4fMIIQOsWZRLGu8JgD6stmB8t+ve7XcXy4JhE6jFNgzMP6DHYoloobeUWWk6RbsAPs4j3UYbYFCsuow+JJ9iaXP0sgv8gST3nqjZtF1xiRVYOdqTa2MIAkGIuOmH1otl55C6UuXdIZGd6SPOKlKC3ccB92KcDy+7h5QcH16mFqZKsOkYRAE4izaE9GyWejpFxlnqOZGLwN8AKsf/zpWq4bRbEAYLWayi1KYNzGlFwsbdf7BWZJ90JWmVpf1AcJ92sbNexxkoW47Jm+Ir264ZK72IWLdE9PYkNUi5wt6IhsHsshdVlUa0p3qvIgBeWdfm+fgcm7qyJbCp37SFgbYmcs4+9U9B75lPpYR7RZOdGh3NGcREFbzYVz+VpPOaDGEJ4mBWn3DXcLtnjBG4q28/eDSkvrq1QK1g8+urzml6KYHaH738tRbjV97YsHsAvM= - file: - - "$TRAVIS_BUILD_DIR/payload_templates.txz" - skip_cleanup: true - overwrite: true - on: - repo: n1nj4sec/pupy - all_branches: true - tags: true diff --git a/create-workspace.py b/create-workspace.py index bda69e28..99242dce 100755 --- a/create-workspace.py +++ b/create-workspace.py @@ -54,13 +54,6 @@ templates_args.add_argument( help='Compile specified templates (default: linux32,linux64,windows)' ) -templates_args.add_argument( - '-DG', '--download-templates-from-github-releases', - action='store_true', default=False, - help='Do not compile payload templates and download latest ' - 'templates from travis-ci automatic build' -) - parser.add_argument( '-E', '--environment', choices=['virtualenv', 'docker', 'podman'], default='virtualenv', help='The way to organize workspace bottle' @@ -295,38 +288,6 @@ def build_templates( return update_commands -def fetch_templates(workdir, git_folder): - origin = get_repo_origin(git_folder) - - if 'n1nj4sec/pupy' not in origin: - print( - "[!] There are no prebuild templates, " - "you must build them manually" - ) - - return False - - download_link = "https://github.com/n1nj4sec/pupy" \ - "/releases/download/latest/payload_templates.txz" - - print("downloading payload_templates from {}".format(download_link)) - - with tempfile.NamedTemporaryFile() as tmpf: - response = urlopen(download_link) - while True: - chunk = response.read(1024 * 1024) - if not chunk: - break - tmpf.write(chunk) - - tmpf.flush() - tmpf.seek(0) - - tarfile.TarFile(fileobj=tmpf).extractall(workdir) - - return True - - def make_pupysh_wrapper(workdir, git_folder, orchestrator): pass @@ -623,9 +584,6 @@ def main(): update_commands.extend(update_cmds) - if args.download_templates_from_github_releases: - fetch_templates(workdir, git_folder) - print("[+] Initialize workdir") initialize_workdir(workdir, git_folder)