mirror of
https://github.com/hackerschoice/segfault.git
synced 2024-06-25 16:28:37 +00:00
small fixes for 3.9a3fob
This commit is contained in:
SkyperTHC
parent
b5da8d3c4c
commit
91a252bb54
4
Makefile
4
Makefile
@ -1,4 +1,4 @@
|
||||
VER := 0.3.9a2fob
|
||||
VER := 0.3.9a3fob
|
||||
|
||||
all:
|
||||
make -C cleaner/cg
|
||||
@ -29,7 +29,7 @@ FILES_GUEST += "segfault-$(VER)/guest/fs-root/etc/zsh_command_not_found"
|
||||
FILES_GUEST += "segfault-$(VER)/guest/fs-root/etc/proxychains.conf"
|
||||
FILES_GUEST += "segfault-$(VER)/guest/fs-root/sf/bin/sf-motd.sh"
|
||||
FILES_GUEST += "segfault-$(VER)/guest/fs-root/sf/bin/sf-setup.sh"
|
||||
FILES_GUEST += "segfault-$(VER)/guest/fs-root/sf/bin/startvnc"
|
||||
FILES_GUEST += "segfault-$(VER)/guest/fs-root/sf/bin/startxvnc"
|
||||
FILES_GUEST += "segfault-$(VER)/guest/fs-root/sf/bin/startxweb"
|
||||
FILES_GUEST += "segfault-$(VER)/guest/fs-root/sf/bin/pkg-install.sh"
|
||||
FILES_GUEST += "segfault-$(VER)/guest/fs-root/etc/rc.local-example"
|
||||
|
||||
@ -481,8 +481,8 @@ services:
|
||||
- sf-encfsd
|
||||
restart: ${SF_RESTART:-on-failure}
|
||||
init: true
|
||||
ports:
|
||||
- 31337:31337 # FIXME-2022 disable in production
|
||||
# ports:
|
||||
# - 31337:31337 # FIXME-2022 disable in production
|
||||
# SSHD clears all environment variables before spwaning a shell (segfaultsh).
|
||||
# Add any variables to docker_sshd.sh as well.
|
||||
environment:
|
||||
@ -506,7 +506,7 @@ services:
|
||||
- "${SF_SHMDIR:-/dev/shm/sf}/config-for-guest:/config/guest"
|
||||
- "${SF_SHMDIR:-/dev/shm/sf}/self-for-guest:/config/self-for-guest:shared"
|
||||
- "/var/run/docker.sock:/var/run/docker.sock"
|
||||
- "/research:/r" # FIXME-2022 disable in production
|
||||
# - "/research:/r" # FIXME-2022 disable in production
|
||||
|
||||
nginx:
|
||||
image: nginx
|
||||
|
||||
@ -16,7 +16,7 @@ stop_lg()
|
||||
|
||||
LOG "$lid" "Stopping"
|
||||
|
||||
red RPUSH portd:cmd "remport ${lid}"
|
||||
red RPUSH portd:cmd "remport ${lid}" >/dev/null
|
||||
|
||||
# Tear down container
|
||||
[[ ! -z $is_container ]] && docker stop "lg-$lid" &>/dev/nuill
|
||||
|
||||
@ -271,6 +271,7 @@ RUN /pkg-install.sh GUI bash -c '{ cd /tmp \
|
||||
enlightenment-data \
|
||||
fluxbox \
|
||||
geany \
|
||||
gimp \
|
||||
remmina remmina-plugin-rdp remmina-plugin-vnc remmina-plugin-secret remmina-plugin-exec remmina-plugin-kwallet remmina-plugin-python remmina-plugin-www remmina-plugin-x2go \
|
||||
`### qterminal # needs RSS 80mb of memory` \
|
||||
tigervnc-standalone-server \
|
||||
|
||||
@ -19,7 +19,7 @@ alias l='ls -Alh'
|
||||
alias lt='ls -Alhrt'
|
||||
alias xterm='xterm -bg black -fg gray'
|
||||
function dmesg {
|
||||
[[ ! -t 1 ]] && { command curl -s rpc/dmesg/ -dnocolor=1; return }
|
||||
[[ ! -t 1 ]] && { command curl -s rpc/dmesg/ -dnocolor=1; return; }
|
||||
command curl -s rpc/dmesg/
|
||||
}
|
||||
|
||||
|
||||
@ -14,8 +14,9 @@ unset VNC_OPTS
|
||||
VNC_OPTS+=("-shared")
|
||||
VNC_OPTS+=("-xkb")
|
||||
VNC_OPTS+=("-timeout" "3600")
|
||||
VNC_OPTS+=("-usepw")
|
||||
[[ -n $PASSWORD ]] && VNC_OPTS+=("-usepw")
|
||||
VNC_OPTS+=("-forever")
|
||||
VNC_OPTS+=("-localhost")
|
||||
#VNC_OPTS+=("-wirecopyrect" "-scrollcopyrect")
|
||||
#VNC_OPTS+=("nopw")
|
||||
VNC_OPTS+=("-afteraccept" "pidof xterm || { DISPLAY=:10 xterm -bg black -fg gray & }")
|
||||
@ -24,15 +25,15 @@ VNC_PASSWDFILE="${HOME}/.vnc/passwd"
|
||||
mk_vncpass()
|
||||
{
|
||||
local str
|
||||
[[ -z $VNC_PASS ]] && {
|
||||
[[ -z $PASSWORD ]] && {
|
||||
str=$(echo -n "VNC-$USERNAME-${SF_SEC}" | sha512sum | base64 -w0)
|
||||
str="${str//[^[:alpha:]]/}"
|
||||
str="${str//[1lIi0ODG8B5S2Zmn]/}"
|
||||
VNC_PASS="${str:0:16}"
|
||||
PASSWORD="${str:0:16}"
|
||||
}
|
||||
str="$(dirname "$VNC_PASSWDFILE")"
|
||||
[[ ! -d "$str" ]] && mkdir "$str"
|
||||
x11vnc -storepasswd "${VNC_PASS}" "${VNC_PASSWDFILE}" &>/dev/null
|
||||
x11vnc -storepasswd "${PASSWORD}" "${VNC_PASSWDFILE}" &>/dev/null
|
||||
}
|
||||
|
||||
startonce()
|
||||
@ -68,16 +69,19 @@ sv_startx()
|
||||
}
|
||||
|
||||
|
||||
C_IP=$(</config/self/c_ip)
|
||||
mk_vncpass
|
||||
#C_IP=$(</config/self/c_ip)
|
||||
[[ -n $PASSWORD ]] && {
|
||||
[[ ${#PASSWORD} -le 3 ]] && unset PASSWORD
|
||||
mk_vncpass
|
||||
}
|
||||
sv_startx $PPID &>/dev/null &
|
||||
disown
|
||||
|
||||
echo -e "Log in using:
|
||||
|
||||
${CDC}ssh -L5900:${C_IP:-<THIS IP>}:5900 -o 'SetEnv SECRET=${SF_SEC}' root@${SF_FQDN}${CN}
|
||||
${CDC}ssh -L5900:127.0.0.1:5900 -o 'SetEnv SECRET=${SF_SEC}' root@${SF_FQDN}${CN}
|
||||
|
||||
Then use your favourite VNC client and connect to 127.0.0.1:5900.
|
||||
VNC PASSWORD: ${CDY}${VNC_PASS}${CN}
|
||||
VNC PASSWORD: ${CDY}${PASSWORD:-<NO PASSWORD>}${CN}
|
||||
|
||||
Exiting this shell will also terminate the VNC session."
|
||||
@ -5,10 +5,15 @@ CDC="\e[0;36m"
|
||||
CN="\e[0m"
|
||||
|
||||
|
||||
str=$(echo -n "VNC-$USERNAME-${SF_SEC}" | sha512sum | base64 -w0)
|
||||
str="${str//[^[:alpha:]]/}"
|
||||
str="${str//[1lIi0ODG8B5S2Zmn]/}"
|
||||
VNC_PASS="${str:0:16}"
|
||||
[[ -n $PASSWORD ]] && {
|
||||
[[ ${#PASSWORD} -le 3 ]] && unset PASSWORD
|
||||
[[ -z $PASSWORD ]] && {
|
||||
str=$(echo -n "VNC-$USERNAME-${SF_SEC}" | sha512sum | base64 -w0)
|
||||
str="${str//[^[:alpha:]]/}"
|
||||
str="${str//[1lIi0ODG8B5S2Zmn]/}"
|
||||
PASSWORD="${str:0:16}"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
cleanup()
|
||||
@ -21,7 +26,7 @@ sv_startx()
|
||||
{
|
||||
local ppid=$1
|
||||
|
||||
XPRA_PASSWORD="${VNC_PASS}" xpra.orig start --resize-display=1280x1024 --bind-tcp=0.0.0.0:2000,auth=env --html=on --start=xterm-dark --daemon=no &>/dev/null &
|
||||
XPRA_PASSWORD="${PASSWORD}" xpra.orig start --resize-display=1280x1024 --bind-tcp=127.0.0.1:2000,auth=env --html=on --start=xterm-dark --daemon=no &>/dev/null &
|
||||
PID_V=$!
|
||||
|
||||
while [[ -d /proc/$PPID && -d /proc/$PID_V ]]; do
|
||||
@ -36,9 +41,9 @@ sv_startx $PPID &
|
||||
|
||||
echo -e "Log in using:
|
||||
|
||||
${CDC}ssh -L2000:${C_IP:-<THIS IP>}:2000 -o 'SetEnv SECRET=${SF_SEC}' root@${SF_FQDN}${CN}
|
||||
${CDC}ssh -L2000:127.0.0.1:2000 -o 'SetEnv SECRET=${SF_SEC}' root@${SF_FQDN}${CN}
|
||||
|
||||
Then use your web browser and go to http://127.0.0.1:2000.
|
||||
PASSWORD: ${CDY}${VNC_PASS}${CN}
|
||||
PASSWORD: ${CDY}${PASSWORD:-<NO PASSWORD>}${CN}
|
||||
|
||||
Exiting this shell will also terminate the GUI session."
|
||||
|
||||
Loading…
Reference in New Issue
Block a user