extern/workspaces-core-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-core-images.git synced 2024-11-21 23:13:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/KASM-5283_upload_filename_sanitization' into 'develop'

Browse Source 
Resolve KASM-5283 "Bugfix/ upload filename sanitization"

Closes KASM-5283

See merge request kasm-technologies/internal/workspaces-core-images!151
This commit is contained in:
Richard Koliser 2023-12-22 21:20:29 +00:00
commit 302590dee5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/startup_scripts/vnc_startup.sh
View File

@ -239,7 +239,7 @@ function start_audio_in (){
function start_upload (){ function start_upload (){
if [[ ${KASM_SVC_UPLOADS:-1} == 1 ]]; then if [[ ${KASM_SVC_UPLOADS:-1} == 1 ]]; then
echo 'Starting upload server' echo 'Starting upload server'
$STARTUPDIR/upload_server/kasm_upload_server --ssl --auth-token "kasm_user:$VNC_PW" & $STARTUPDIR/upload_server/kasm_upload_server --ssl --auth-token "kasm_user:$VNC_PW" --port 4902 --upload_dir ${HOME}/Uploads &
KASM_PROCS['upload_server']=$! KASM_PROCS['upload_server']=$!

2
src/ubuntu/install/kasm_upload_server/install_kasm_upload_server.sh
View File

@ -3,6 +3,6 @@ set -ex
ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g') ARCH=$(arch | sed 's/aarch64/arm64/g' | sed 's/x86_64/amd64/g')
mkdir $STARTUPDIR/upload_server mkdir $STARTUPDIR/upload_server
wget --quiet https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_upload_service/dc82ed90ac44ddd05cbd08ae6968aaabebe0a6fe/kasm_upload_service_${ARCH}_develop.dc82ed.tar.gz -O /tmp/kasm_upload_server.tar.gz wget --quiet https://kasmweb-build-artifacts.s3.amazonaws.com/kasm_upload_service/a22519ef70d05fd50099196ff6cb3dd8cb2ed13c/kasm_upload_service_${ARCH}_develop.a22519.tar.gz -O /tmp/kasm_upload_server.tar.gz
tar -xvf /tmp/kasm_upload_server.tar.gz -C $STARTUPDIR/upload_server tar -xvf /tmp/kasm_upload_server.tar.gz -C $STARTUPDIR/upload_server
rm /tmp/kasm_upload_server.tar.gz rm /tmp/kasm_upload_server.tar.gz