From 3b83046466f17e249d871187e5f5bf4380b56c09 Mon Sep 17 00:00:00 2001 From: Justin Travis Date: Tue, 12 Oct 2021 15:08:02 -0400 Subject: [PATCH 1/3] KASM-1871 Pull in latest kasmvnc with scroll improvements --- src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh index cdd2ede..0e7932c 100644 --- a/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh +++ b/src/ubuntu/install/kasm_vnc/install_kasm_vnc.sh @@ -3,14 +3,13 @@ set -e echo "Install KasmVNC server" cd /tmp - if [ "${DISTRO}" == "kali" ] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/159d7527955f131e096cf1602b7f9f66cc5d66cb/kasmvncserver_kali-rolling_0.9.3_master_159d75_amd64.deb" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/bcad19542e02921f1f275532cc7854559d737cb5/kasmvncserver_kali-rolling_0.9.3_master_bcad19_amd64.deb" elif [ "${DISTRO}" == "centos" ] ; then - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/159d7527955f131e096cf1602b7f9f66cc5d66cb/output/centos_core/kasmvncserver-0.9.1~beta-1.el7.x86_64.rpm" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/bcad19542e02921f1f275532cc7854559d737cb5/output/centos_core/kasmvncserver-0.9.1~beta-1.el7.x86_64.rpm" else - BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/159d7527955f131e096cf1602b7f9f66cc5d66cb/kasmvncserver_bionic_0.9.3_master_159d75_amd64.deb" + BUILD_URL="https://kasmweb-build-artifacts.s3.amazonaws.com/kasmvnc/bcad19542e02921f1f275532cc7854559d737cb5/kasmvncserver_bionic_0.9.3_master_bcad19_amd64.deb" fi From eca1b4d6ae555901ae442b25d8d9487b09e998f8 Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Thu, 14 Oct 2021 15:55:12 +0000 Subject: [PATCH 2/3] KASM-1994 Use custom aws runner for kali image --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40b155c..71b8288 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,6 +67,8 @@ build_kali_rolling: - /^release\/.*$/ except: - schedules + tags: + - aws-autoscale build_centos: stage: build @@ -120,6 +122,8 @@ build_kali_rolling_dev: except: - develop - /^release\/.*$/ + tags: + - aws-autoscale build_centos_dev: stage: build @@ -166,6 +170,8 @@ build_kali_rolling_schedules: - docker push ${ORG_NAME}/core-kali-rolling:$SANITIZED_ROLLING_BRANCH only: - schedules + tags: + - aws-autoscale build_centos_schedules: stage: build From f774c4b02349571238f4fde682ed49d3ffe3734a Mon Sep 17 00:00:00 2001 From: Justin Travis Date: Sun, 17 Oct 2021 20:44:50 -0400 Subject: [PATCH 3/3] KASM-2015 Update auxilary services to support multi-arch --- src/ubuntu/install/audio/install_audio.sh | 5 +++-- src/ubuntu/install/audio_input/install_audio_input.sh | 8 ++------ .../kasm_upload_server/install_kasm_upload_server.sh | 7 ++----- src/ubuntu/install/squid/install/install_squid.sh | 9 ++++----- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/ubuntu/install/audio/install_audio.sh b/src/ubuntu/install/audio/install_audio.sh index 03260ca..8324992 100644 --- a/src/ubuntu/install/audio/install_audio.sh +++ b/src/ubuntu/install/audio/install_audio.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash ### every exit != 0 fails the script -set -e +set -ex +ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') echo "Install Audio Requirements" if [ "${DISTRO}" == "centos" ] ; then yum install -y curl git @@ -16,5 +17,5 @@ fi cd $STARTUPDIR mkdir jsmpeg -wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_websocket_relay/5b1e1eaa251f7a423a818056e2e8cdb66c17ef98/kasm_websocket_relay_master.5b1e1e.tar.gz | tar xz --strip 1 -C $STARTUPDIR/jsmpeg +wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_websocket_relay/68ee0a0311d2ba8a9f2c206ec89e3abce6451f92/kasm_websocket_relay_${DISTRO/kali/ubuntu}_${ARCH}_develop.68ee0a.tar.gz | tar xz --strip 1 -C $STARTUPDIR/jsmpeg chmod +x $STARTUPDIR/jsmpeg/kasm_audio_out-linux diff --git a/src/ubuntu/install/audio_input/install_audio_input.sh b/src/ubuntu/install/audio_input/install_audio_input.sh index d7d927f..849ee08 100644 --- a/src/ubuntu/install/audio_input/install_audio_input.sh +++ b/src/ubuntu/install/audio_input/install_audio_input.sh @@ -1,10 +1,6 @@ #!/usr/bin/env bash ### every exit != 0 fails the script set -e - +ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') mkdir -p $STARTUPDIR/audio_input -if [ "$DISTRO" = centos ]; then - wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_audio_input_server/17b516ead4504f180358bf11bd735cb5eb28d032/kasm_audio_input_server_centos_core_feature_KASM-1476_centos_build_microphone_server.17b516.tar.gz | tar -xvz -C $STARTUPDIR/audio_input/ -else - wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_audio_input_server/627e9301c4140cd70c82a798b33c2acae2860e28/kasm_audio_input_server_develop.627e93.tar.gz | tar -xvz -C $STARTUPDIR/audio_input/ -fi +wget -qO- https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_audio_input_server/3b599f999efdb349969cf607b6ed636c4501108d/kasm_audio_input_server_${DISTRO/kali/ubuntu}_${ARCH}_develop.3b599f.tar.gz | tar -xvz -C $STARTUPDIR/audio_input/ \ No newline at end of file diff --git a/src/ubuntu/install/kasm_upload_server/install_kasm_upload_server.sh b/src/ubuntu/install/kasm_upload_server/install_kasm_upload_server.sh index 1e1cc39..11daa06 100644 --- a/src/ubuntu/install/kasm_upload_server/install_kasm_upload_server.sh +++ b/src/ubuntu/install/kasm_upload_server/install_kasm_upload_server.sh @@ -1,11 +1,8 @@ #!/usr/bin/env bash set -ex +ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') mkdir $STARTUPDIR/upload_server -if [ -f /etc/centos-release ]; then - wget --quiet https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_upload_service/7a9ab9203b5b16502349bcf8bd8be1527d5e6cad/kasm_upload_service_centos_1.2.0.7a9ab9.tar.gz -O /tmp/kasm_upload_server.tar.gz -else - wget --quiet https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_upload_service/742b7f4ba521ee89969d2eddfbda0e7bd619944d/kasm_upload_service_1.2.0.742b7f.tar.gz -O /tmp/kasm_upload_server.tar.gz -fi +wget --quiet https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_upload_service/839a3b9ce63569aaee4f7d62bd31ffb20184a393/kasm_upload_service_${DISTRO/kali/ubuntu}_${ARCH}_develop.839a3b.tar.gz -O /tmp/kasm_upload_server.tar.gz tar -xvf /tmp/kasm_upload_server.tar.gz -C $STARTUPDIR/upload_server rm /tmp/kasm_upload_server.tar.gz diff --git a/src/ubuntu/install/squid/install/install_squid.sh b/src/ubuntu/install/squid/install/install_squid.sh index 37bc750..e8eafbd 100644 --- a/src/ubuntu/install/squid/install/install_squid.sh +++ b/src/ubuntu/install/squid/install/install_squid.sh @@ -1,6 +1,8 @@ # update squid conf with user info set -ex +ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') + if [ "$DISTRO" = centos ]; then useradd --system --shell /usr/sbin/nologin --home-dir /bin proxy fi @@ -41,11 +43,8 @@ sasldb_path: /etc/sasl2/memcached-sasldb2 EOL -if [ "$DISTRO" = centos ]; then - KASM_SQUID_ADAPTER=https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_squid_adapter/f06293b2e585dbee75728e84293fe61386289c27/kasm_squid_adapter_centos_feature_KASM-1474_centos_build.f06293.tar.gz -else - KASM_SQUID_ADAPTER=https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_squid_adapter/1cc3b450ee0bfb1aa76a0c3330f8d6e86b365448/kasm_squid_adapter_develop.1cc3b4.tar.gz -fi +KASM_SQUID_ADAPTER=https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_squid_adapter/d03389153257831e2378a3629c560e4d34f7e772/kasm_squid_adapter_${DISTRO/kali/ubuntu}_${ARCH}_develop.d03389.tar.gz + wget -qO- ${KASM_SQUID_ADAPTER} | tar xz -C /etc/squid/ ls -la /etc/squid chmod +x /etc/squid/kasm_squid_adapter