diff --git a/docker/config-test.sh b/docker/config-test.sh index b648963..1bcd2ec 100755 --- a/docker/config-test.sh +++ b/docker/config-test.sh @@ -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 \ diff --git a/docker/cti.sh b/docker/cti.sh index c5c57c4..dd5e116 100755 --- a/docker/cti.sh +++ b/docker/cti.sh @@ -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 ${@} diff --git a/docker/cvedb.sh b/docker/cvedb.sh index 579b7de..301e772 100755 --- a/docker/cvedb.sh +++ b/docker/cvedb.sh @@ -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 diff --git a/docker/exploitdb.sh b/docker/exploitdb.sh index 510628e..f538dc9 100755 --- a/docker/exploitdb.sh +++ b/docker/exploitdb.sh @@ -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 ${@} diff --git a/docker/gost.sh b/docker/gost.sh index a6e54af..c449257 100755 --- a/docker/gost.sh +++ b/docker/gost.sh @@ -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 diff --git a/docker/kev.sh b/docker/kev.sh index c167e56..d869105 100755 --- a/docker/kev.sh +++ b/docker/kev.sh @@ -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 ${@} diff --git a/docker/msfdb.sh b/docker/msfdb.sh index 4bd1323..c4ea6cb 100755 --- a/docker/msfdb.sh +++ b/docker/msfdb.sh @@ -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 ${@} diff --git a/docker/oval.sh b/docker/oval.sh index e0fff64..3a3321f 100755 --- a/docker/oval.sh +++ b/docker/oval.sh @@ -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 diff --git a/docker/scan.sh b/docker/scan.sh index b0f3ed7..c5ead6d 100755 --- a/docker/scan.sh +++ b/docker/scan.sh @@ -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 \ @@ -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 \ diff --git a/docker/server.sh b/docker/server.sh index cfc5a9f..687eca0 100755 --- a/docker/server.sh +++ b/docker/server.sh @@ -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 \ @@ -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 \ diff --git a/docker/tui.sh b/docker/tui.sh index f439d22..8c26031 100755 --- a/docker/tui.sh +++ b/docker/tui.sh @@ -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 \ diff --git a/docker/vulsrepo.sh b/docker/vulsrepo.sh index 5d97568..40bdb73 100755 --- a/docker/vulsrepo.sh +++ b/docker/vulsrepo.sh @@ -2,15 +2,9 @@ docker pull ishidaco/vulsrepo -if [[ $(tty) =~ "not a tty" ]] -then - t='' -else - t="-t" -fi - -docker run -d $t \ +docker run -dt \ -v $PWD:/vuls \ -p 5111:5111 \ + --name vulsrepo \ ishidaco/vulsrepo \ $@