Fix sudo option on Redhat like Linux, change some messages.

scan/linux.go

@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package scan
 
 import (
+	"fmt"
 	"sort"
 
 	"github.com/Sirupsen/logrus"
@@ -52,6 +53,10 @@ func (l *linux) setDistributionInfo(fam, rel string) {
 	l.Release = rel
 }
 
+func (l *linux) getDistributionInfo() string {
+	return fmt.Sprintf("%s %s", l.Family, l.Release)
+}
+
 func (l *linux) convertToModel() (models.ScanResult, error) {
 	var cves, unknownScoreCves []models.CveInfo
 	for _, p := range l.UnsecurePackages {

scan/redhat.go

@@ -51,7 +51,7 @@ func detectRedhat(c config.ServerInfo) (itsMe bool, red osTypeInterface) {
 	red = newRedhat(c)
 
 	// set sudo option flag
-	c.SudoOpt = config.SudoOption{ExecBySudoSh: true}
+	c.SudoOpt = config.SudoOption{ExecBySudo: true}
 	red.setServerInfo(c)
 
 	if r := sshExec(c, "ls /etc/fedora-release", noSudo); r.isSuccess() {

scan/serverapi.go

@@ -21,6 +21,7 @@ type osTypeInterface interface {
 	setServerInfo(config.ServerInfo)
 	getServerInfo() config.ServerInfo
 	setDistributionInfo(string, string)
+	getDistributionInfo() string
 	checkRequiredPackagesInstalled() error
 	scanPackages() error
 	scanVulnByCpeName() error
@@ -108,7 +109,7 @@ func detectOs(c config.ServerInfo) (osType osTypeInterface) {
 func InitServers(localLogger *logrus.Entry) (err error) {
 	Log = localLogger
 	if servers, err = detectServersOS(); err != nil {
-		err = fmt.Errorf("Failed to detect OS")
+		err = fmt.Errorf("Failed to detect the type of OS. err: %s", err)
 	} else {
 		Log.Debugf("%s", pp.Sprintf("%s", servers))
 	}
@@ -128,10 +129,26 @@ func detectServersOS() (osi []osTypeInterface, err error) {
 	for i := 0; i < len(config.Conf.Servers); i++ {
 		select {
 		case res := <-osTypeChan:
+			Log.Infof("(%d/%d) Successfully detected. %s: %s",
+				i+1, len(config.Conf.Servers),
+				res.getServerInfo().ServerName,
+				res.getDistributionInfo())
 			osi = append(osi, res)
 		case <-timeout:
-			Log.Error("Timeout occured while detecting OS")
-			err = fmt.Errorf("Timeout!")
+			Log.Error("Timeout occured while detecting")
+			err = fmt.Errorf("Timeout")
+			for servername := range config.Conf.Servers {
+				found := false
+				for _, o := range osi {
+					if servername == o.getServerInfo().ServerName {
+						found = true
+						break
+					}
+				}
+				if !found {
+					Log.Errorf("Failed to detect. servername: %s", servername)
+				}
+			}
 			return
 		}
 	}
@@ -151,7 +168,7 @@ func Prepare() []error {
 // Scan scan
 func Scan() []error {
 	if len(servers) == 0 {
-		return []error{fmt.Errorf("Not initialized yet")}
+		return []error{fmt.Errorf("No server defined. Check the configuration")}
 	}
 
 	Log.Info("Check required packages for scanning...")