Skip to content

Change and minor adjustments to the tty detection method #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ohhara-shiojiri wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change and minor adjustments to the tty detection method #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions docker/config-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@

docker pull vuls/vuls

if [[ $(tty) =~ "not a tty" ]]
then
t=''
SELF=$$
ls /proc/$SELF/fd/0 -l | grep /dev/pts > /dev/null
if [ $? -eq 0 ]; then
echo "input device is TTY device"
T=-t
else
t="-t"
echo "input device is non TTY"
T=
fi

docker run --rm -i $t \
docker run --rm -i $T \
-v $HOME/.ssh:/root/.ssh:ro \
-v $PWD:/vuls \
vuls/vuls configtest \
Expand Down
15 changes: 9 additions & 6 deletions docker/cti.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,19 @@ else
DOCKER_NETWORK_OPT="--network ${DOCKER_NETWORK}"
fi

if [[ $(tty) =~ "not a tty" ]]
then
t=''
SELF=$$
ls /proc/$SELF/fd/0 -l | grep /dev/pts > /dev/null
if [ $? -eq 0 ]; then
echo "input device is TTY device"
T=-t
else
t="-t"
echo "input device is non TTY"
T=
fi

docker run --rm -i $t vuls/go-cti version
docker run --rm -i $T vuls/go-cti version

docker run --rm -i $t \
docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/go-cti \
vuls/go-cti fetch threat ${@}
21 changes: 12 additions & 9 deletions docker/cvedb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,36 @@ else
DOCKER_NETWORK_OPT="--network ${DOCKER_NETWORK}"
fi

if [[ $(tty) =~ "not a tty" ]]
then
t=''
SELF=$$
ls /proc/$SELF/fd/0 -l | grep /dev/pts > /dev/null
if [ $? -eq 0 ]; then
echo "input device is TTY device"
T=-t
else
t="-t"
echo "input device is non TTY"
T=
fi

docker pull vuls/go-cve-dictionary
docker run --rm -i $t vuls/go-cve-dictionary version
docker run --rm -i $T vuls/go-cve-dictionary version

case "$target" in
--nvd) docker run --rm -i $t \
--nvd) docker run --rm -i $T \
-v ${PWD}:/go-cve-dictionary \
${DOCKER_NETWORK_OPT} \
vuls/go-cve-dictionary fetch ${@} nvd
;;
--jvn) docker run --rm -i $t \
--jvn) docker run --rm -i $T \
-v ${PWD}:/go-cve-dictionary \
${DOCKER_NETWORK_OPT} \
vuls/go-cve-dictionary fetch ${@} jvn
;;
--fortinet) docker run --rm -i $t \
--fortinet) docker run --rm -i $T \
-v ${PWD}:/go-cve-dictionary \
${DOCKER_NETWORK_OPT} \
vuls/go-cve-dictionary fetch ${@} fortinet
;;
--mitre) docker run --rm -i $t \
--mitre) docker run --rm -i $T \
-v ${PWD}:/go-cve-dictionary \
${DOCKER_NETWORK_OPT} \
vuls/go-cve-dictionary fetch ${@} mitre
Expand Down
20 changes: 11 additions & 9 deletions docker/exploitdb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,27 @@ else
DOCKER_NETWORK_OPT="--network ${DOCKER_NETWORK}"
fi

if [[ $(tty) =~ "not a tty" ]]
then
t=''
SELF=$$
ls /proc/$SELF/fd/0 -l | grep /dev/pts > /dev/null
if [ $? -eq 0 ]; then
echo "input device is TTY device"
T=-t
else
t="-t"
echo "input device is non TTY"
T=
fi

docker run --rm -i $T vuls/go-exploitdb version

docker run --rm -i $t vuls/go-exploitdb version

docker run --rm -i $t \
docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/go-exploitdb \
vuls/go-exploitdb fetch exploitdb ${@}
docker run --rm -i $t \
docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/go-exploitdb \
vuls/go-exploitdb fetch githubrepos ${@}
docker run --rm -i $t \
docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/go-exploitdb \
vuls/go-exploitdb fetch inthewild ${@}
Expand Down
21 changes: 12 additions & 9 deletions docker/gost.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,36 @@ else
DOCKER_NETWORK_OPT="--network ${DOCKER_NETWORK}"
fi

if [[ $(tty) =~ "not a tty" ]]
then
t=''
SELF=$$
ls /proc/$SELF/fd/0 -l | grep /dev/pts > /dev/null
if [ $? -eq 0 ]; then
echo "input device is TTY device"
T=-t
else
t="-t"
echo "input device is non TTY"
T=
fi

docker pull vuls/gost
docker run --rm -i $t vuls/gost version
docker run --rm -i $T vuls/gost version

case "$target" in
--redhat) docker run --rm -i $t \
--redhat) docker run --rm -i $T \
-v ${PWD}:/gost \
${DOCKER_NETWORK_OPT} \
vuls/gost fetch ${@} redhat
;;
--debian) docker run --rm -i $t \
--debian) docker run --rm -i $T \
-v ${PWD}:/gost \
${DOCKER_NETWORK_OPT} \
vuls/gost fetch ${@} debian
;;
--ubuntu) docker run --rm -i $t \
--ubuntu) docker run --rm -i $T \
-v ${PWD}:/gost \
${DOCKER_NETWORK_OPT} \
vuls/gost fetch ${@} ubuntu
;;
--microsoft) docker run --rm -i $t \
--microsoft) docker run --rm -i $T \
-v ${PWD}:/gost \
${DOCKER_NETWORK_OPT} \
vuls/gost fetch ${@} microsoft
Expand Down
15 changes: 9 additions & 6 deletions docker/kev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,19 @@ else
DOCKER_NETWORK_OPT="--network ${DOCKER_NETWORK}"
fi

if [[ $(tty) =~ "not a tty" ]]
then
t=''
SELF=$$
ls /proc/$SELF/fd/0 -l | grep /dev/pts > /dev/null
if [ $? -eq 0 ]; then
echo "input device is TTY device"
T=-t
else
t="-t"
echo "input device is non TTY"
T=
fi

docker run --rm -i $t vuls/go-kev version
docker run --rm -i $T vuls/go-kev version

docker run --rm -i $t \
docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/go-kev \
vuls/go-kev fetch kevuln ${@}
15 changes: 9 additions & 6 deletions docker/msfdb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,19 @@ else
DOCKER_NETWORK_OPT="--network ${DOCKER_NETWORK}"
fi

if [[ $(tty) =~ "not a tty" ]]
then
t=''
SELF=$$
ls /proc/$SELF/fd/0 -l | grep /dev/pts > /dev/null
if [ $? -eq 0 ]; then
echo "input device is TTY device"
T=-t
else
t="-t"
echo "input device is non TTY"
T=
fi

docker run --rm -i $t vuls/go-msfdb version
docker run --rm -i $T vuls/go-msfdb version

docker run --rm -i $t \
docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/go-msfdb \
vuls/go-msfdb fetch msfdb ${@}
Expand Down
36 changes: 19 additions & 17 deletions docker/oval.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,65 +14,67 @@ else
DOCKER_NETWORK_OPT="--network ${DOCKER_NETWORK}"
fi

if [[ $(tty) =~ "not a tty" ]]
then
t=''
SELF=$$
ls /proc/$SELF/fd/0 -l | grep /dev/pts > /dev/null
if [ $? -eq 0 ]; then
echo "input device is TTY device"
T=-t
else
t="-t"
echo "input device is non TTY"
T=
fi


docker pull vuls/goval-dictionary
docker run --rm -i $t vuls/goval-dictionary version
docker run --rm -i $T vuls/goval-dictionary version

# NOTE: fetches oval of the OS with security support enabled.
case "$target" in
--redhat) docker run --rm -i $t \
--redhat) docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/goval-dictionary \
vuls/goval-dictionary fetch redhat ${@} 6 7 8 9
;;
--amazon) docker run --rm -i $t \
--amazon) docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/goval-dictionary \
vuls/goval-dictionary fetch amazon ${@} 2 2023
;;
--debian) docker run --rm -i $t \
--debian) docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/goval-dictionary \
vuls/goval-dictionary fetch debian ${@} 10 11 12
;;
--ubuntu) docker run --rm -i $t \
--ubuntu) docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/goval-dictionary \
vuls/goval-dictionary fetch ubuntu ${@} 16.04 18.04 20.04 22.04 24.04
;;
--alpine) docker run --rm -i $t \
--alpine) docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/goval-dictionary \
vuls/goval-dictionary fetch alpine ${@} 3.17 3.18 3.19 3.20
vuls/goval-dictionary fetch alpine ${@} 3.17 3.18 3.19 3.20 3.21
;;
--oracle) docker run --rm -i $t \
--oracle) docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/goval-dictionary \
vuls/goval-dictionary fetch oracle ${@} 6 7 8 9
;;
--fedora) docker run --rm -i $t \
--fedora) docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/goval-dictionary \
vuls/goval-dictionary fetch fedora ${@} 39 40
;;
--suse) docker run --rm -i $t \
--suse) docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/goval-dictionary \
vuls/goval-dictionary fetch suse --suse-type suse-enterprise-server ${@} 12 15

docker run --rm -i $t \
docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/goval-dictionary \
vuls/goval-dictionary fetch suse --suse-type opensuse tumbleweed

docker run --rm -i $t \
docker run --rm -i $T \
${DOCKER_NETWORK_OPT} \
-v $PWD:/goval-dictionary \
vuls/goval-dictionary fetch suse --suse-type opensuse-leap 15.5 15.6
Expand Down
17 changes: 11 additions & 6 deletions docker/scan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@

docker pull vuls/vuls

if [[ $(tty) =~ "not a tty" ]]
then
t=''
SELF=$$
ls /proc/$SELF/fd/0 -l | grep /dev/pts > /dev/null
if [ $? -eq 0 ]; then
echo "input device is TTY device"
T=-t
else
t="-t"
echo "input device is non TTY"
T=
fi

docker run --rm -i $t \
docker run --rm -i $T \
-v $HOME/.ssh:/root/.ssh:ro \
-v $PWD:/vuls \
vuls/vuls configtest \
Expand All @@ -22,9 +25,11 @@ if [ $ret -ne 0 ]; then
exit 1
fi

docker run --rm -i $t \
docker run --rm -i $T \
-v $HOME/.ssh:/root/.ssh:ro \
-v $PWD:/vuls \
-v /etc/localtime:/etc/localtime:ro -v /etc/timezone:/etc/timezone:ro \
--name vuls \
vuls/vuls scan \
-log-dir=/vuls/log \
-config=/vuls/config.toml \
Expand Down
15 changes: 9 additions & 6 deletions docker/server.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@

docker pull vuls/vuls

if [[ $(tty) =~ "not a tty" ]]
then
t=''
SELF=$$
ls /proc/$SELF/fd/0 -l | grep /dev/pts > /dev/null
if [ $? -eq 0 ]; then
echo "input device is TTY device"
T=-t
else
t="-t"
echo "input device is non TTY"
T=
fi

docker run --rm -i $t \
docker run --rm -i $T \
-v $HOME/.ssh:/root/.ssh:ro \
-v $PWD:/vuls \
vuls/vuls configtest \
Expand All @@ -22,7 +25,7 @@ if [ $ret -ne 0 ]; then
exit 1
fi

docker run --rm -d $t \
docker run --rm -d $T \
-v $HOME/.ssh:/root/.ssh:ro \
-v $PWD:/vuls \
-p 5515:5515 \
Expand Down
9 changes: 1 addition & 8 deletions docker/tui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,7 @@

docker pull vuls/vuls

if [[ $(tty) =~ "not a tty" ]]
then
t=''
else
t="-t"
fi

docker run --rm -i $t\
docker run --rm -it\
-v $PWD:/vuls \
vuls/vuls tui $@ \
-log-dir=/vuls/log \
Expand Down
Loading