Let timeout run shells.

This commit is contained in:
Mark Stemm 2017-08-24 10:08:29 -07:00
parent 70e49161b1
commit ac82dd4b54

View File

@ -547,7 +547,7 @@
landscape-sysin, nessusd, PM2, syslog-summary, erl_child_setup, landscape-sysin, nessusd, PM2, syslog-summary, erl_child_setup,
npm, cloud-init, toybox, ceph, hhvm, certbot, mysql_install_d, npm, cloud-init, toybox, ceph, hhvm, certbot, mysql_install_d,
serf, a2enmod, runsv, supervisord, varnishd, authconfig, tini, serf, a2enmod, runsv, supervisord, varnishd, authconfig, tini,
x2goagent x2goagent, timeout
] ]
- rule: Run shell untrusted - rule: Run shell untrusted
@ -713,7 +713,7 @@
nomachine_binaries, nomachine_binaries,
monitoring_binaries, gitlab_binaries, initdb, pg_ctl, awk, falco, cron, monitoring_binaries, gitlab_binaries, initdb, pg_ctl, awk, falco, cron,
erl_child_setup, ceph, PM2, pycompile, py3compile, hhvm, npm, mysql_install_d, serf, erl_child_setup, ceph, PM2, pycompile, py3compile, hhvm, npm, mysql_install_d, serf,
runsv, supervisord, varnishd, crond, logrotate, x2goagent) runsv, supervisord, varnishd, crond, logrotate, x2goagent, timeout)
and not trusted_containers and not trusted_containers
and not shell_spawning_containers and not shell_spawning_containers
and not parent_java_running_echo and not parent_java_running_echo