Merge pull request #176 from future-architect/add_sudo_check_to_prepare

Add sudo check to prepare subcommand
future-architect · Sep 13, 2016 · 1b85e56 · 1b85e56
2 parents 00c0354 + 8a8ac5f
commit 1b85e56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/commands/prepare.go b/commands/prepare.go
@@ -140,6 +140,12 @@ func (p *PrepareCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{
 	logger.Info("Detecting OS... ")
 	scan.InitServers(logger)
 
+	logger.Info("Checking sudo configuration... ")
+	if err := scan.CheckIfSudoNoPasswd(logger); err != nil {
+		logger.Errorf("Failed to sudo with nopassword via SSH. Define NOPASSWD in /etc/sudoers on target servers")
+		return subcommands.ExitFailure
+	}
+
 	logger.Info("Installing...")
 	if errs := scan.Prepare(); 0 < len(errs) {
 		for _, e := range errs {

diff --git a/scan/serverapi.go b/scan/serverapi.go
@@ -369,7 +369,7 @@ func detectContainerOSesOnServer(containerHost osTypeInterface) (oses []osTypeIn
 
 // CheckIfSudoNoPasswd checks whether vuls can sudo with nopassword via SSH
 func CheckIfSudoNoPasswd(localLogger *logrus.Entry) error {
-	timeoutSec := 1 * 15
+	timeoutSec := 15
 	errs := parallelSSHExec(func(o osTypeInterface) error {
 		return o.checkIfSudoNoPasswd()
 	}, timeoutSec)