jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'manoj/dirs' of https://github.com/msays2000/noVNC

This commit is contained in:
Pierre Ossman 2022-11-07 16:19:12 +01:00
parent 081f9d2a13 8e660ba3e8
commit 4cfe0fffcd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/novnc_proxy
View File

@ -25,6 +25,8 @@ usage() {
echo " Default: ./" echo " Default: ./"
echo " --ssl-only Disable non-https connections." echo " --ssl-only Disable non-https connections."
echo " " echo " "
echo " --file-only Disable directory listing in web server."
echo " "
echo " --record FILE Record traffic to FILE.session.js" echo " --record FILE Record traffic to FILE.session.js"
echo " " echo " "
echo " --syslog SERVER Can be local socket such as /dev/log, or a UDP host:port pair." echo " --syslog SERVER Can be local socket such as /dev/log, or a UDP host:port pair."
@ -60,7 +62,7 @@ TIMEOUT_ARG=""
WEBAUTH_ARG="" WEBAUTH_ARG=""
AUTHPLUGIN_ARG="" AUTHPLUGIN_ARG=""
AUTHSOURCE_ARG="" AUTHSOURCE_ARG=""
FILEONLY_ARG=""
die() { die() {
@ -90,6 +92,7 @@ while [ "$*" ]; do
--key) KEY="${OPTARG}"; shift ;; --key) KEY="${OPTARG}"; shift ;;
--web) WEB="${OPTARG}"; shift ;; --web) WEB="${OPTARG}"; shift ;;
--ssl-only) SSLONLY="--ssl-only" ;; --ssl-only) SSLONLY="--ssl-only" ;;
--file-only) FILEONLY_ARG="--file-only" ;;
--record) RECORD_ARG="--record ${OPTARG}"; shift ;; --record) RECORD_ARG="--record ${OPTARG}"; shift ;;
--syslog) SYSLOG_ARG="--syslog ${OPTARG}"; shift ;; --syslog) SYSLOG_ARG="--syslog ${OPTARG}"; shift ;;
--heartbeat) HEARTBEAT_ARG="--heartbeat ${OPTARG}"; shift ;; --heartbeat) HEARTBEAT_ARG="--heartbeat ${OPTARG}"; shift ;;
@ -190,7 +193,7 @@ fi
echo "Starting webserver and WebSockets proxy on port ${PORT}" echo "Starting webserver and WebSockets proxy on port ${PORT}"
#${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & #${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
${WEBSOCKIFY} ${SYSLOG_ARG} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${KEY:+--key ${KEY}} ${PORT} ${VNC_DEST} ${HEARTBEAT_ARG} ${IDLETIMEOUT_ARG} ${RECORD_ARG} ${TIMEOUT_ARG} ${WEBAUTH_ARG} ${AUTHPLUGIN_ARG} ${AUTHSOURCE_ARG} & ${WEBSOCKIFY} ${SYSLOG_ARG} ${SSLONLY} ${FILEONLY_ARG} --web ${WEB} ${CERT:+--cert ${CERT}} ${KEY:+--key ${KEY}} ${PORT} ${VNC_DEST} ${HEARTBEAT_ARG} ${IDLETIMEOUT_ARG} ${RECORD_ARG} ${TIMEOUT_ARG} ${WEBAUTH_ARG} ${AUTHPLUGIN_ARG} ${AUTHSOURCE_ARG} &
proxy_pid="$!" proxy_pid="$!"
sleep 1 sleep 1
if ! ps -p ${proxy_pid} >/dev/null; then if ! ps -p ${proxy_pid} >/dev/null; then