fix(scan): fix nil poiter in needs-restarting (#1767 )

chore(deps): bump github.com/gosnmp/gosnmp from 1.35.0 to 1.36.1 (#1763 )
Bumps [github.com/gosnmp/gosnmp](https://github.com/gosnmp/gosnmp) from 1.35.0 to 1.36.1. - [Release notes](https://github.com/gosnmp/gosnmp/releases) - [Changelog](https://github.com/gosnmp/gosnmp/blob/master/CHANGELOG.md) - [Commits](https://github.com/gosnmp/gosnmp/compare/v1.35.0...v1.36.1) --- updated-dependencies: - dependency-name: github.com/gosnmp/gosnmp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-17 17:58:21 +09:00 · 2023-10-17 15:25:53 +09:00 · 2023-10-12 15:30:27 +09:00 · 2023-10-12 14:23:25 +09:00 · 2023-10-12 14:17:34 +09:00 · 2023-10-12 14:12:32 +09:00
17 changed files with 106 additions and 88 deletions
--- a/config/config_v1.go
+++ b/config/config_v1.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"

@@ -89,7 +88,7 @@ func convertToLatestConfig(pathToToml string) error {
 	}
 	Conf.Servers = convertedServerConfigList

-	raw, err := ioutil.ReadFile(pathToSaasJSON)
+	raw, err := os.ReadFile(pathToSaasJSON)
 	if err != nil {
 		return xerrors.Errorf("Failed to read saas-credential.json. err: %w", err)
 	}
--- a/config/os.go
+++ b/config/os.go
@@ -225,6 +225,7 @@ func GetEOL(family, release string) (eol EOL, found bool) {
 			"15.2": {Ended: true},
 			"15.3": {StandardSupportUntil: time.Date(2022, 11, 30, 23, 59, 59, 0, time.UTC)},
 			"15.4": {StandardSupportUntil: time.Date(2023, 11, 30, 23, 59, 59, 0, time.UTC)},
+			"15.5": {StandardSupportUntil: time.Date(2024, 12, 31, 23, 59, 59, 0, time.UTC)},
 		}[release]
 	case constant.SUSEEnterpriseServer:
 		// https://www.suse.com/lifecycle
@@ -243,8 +244,11 @@ func GetEOL(family, release string) (eol EOL, found bool) {
 			"15":   {Ended: true},
 			"15.1": {Ended: true},
 			"15.2": {Ended: true},
-			"15.3": {StandardSupportUntil: time.Date(2022, 11, 30, 23, 59, 59, 0, time.UTC)},
-			"15.4": {StandardSupportUntil: time.Date(2023, 11, 30, 23, 59, 59, 0, time.UTC)},
+			"15.3": {StandardSupportUntil: time.Date(2022, 12, 31, 23, 59, 59, 0, time.UTC)},
+			"15.4": {StandardSupportUntil: time.Date(2023, 12, 31, 23, 59, 59, 0, time.UTC)},
+			"15.5": {},
+			"15.6": {},
+			"15.7": {StandardSupportUntil: time.Date(2028, 7, 31, 23, 59, 59, 0, time.UTC)},
 		}[release]
 	case constant.SUSEEnterpriseDesktop:
 		// https://www.suse.com/lifecycle
@@ -262,8 +266,11 @@ func GetEOL(family, release string) (eol EOL, found bool) {
 			"15":   {Ended: true},
 			"15.1": {Ended: true},
 			"15.2": {Ended: true},
-			"15.3": {StandardSupportUntil: time.Date(2022, 11, 30, 23, 59, 59, 0, time.UTC)},
-			"15.4": {StandardSupportUntil: time.Date(2023, 11, 30, 23, 59, 59, 0, time.UTC)},
+			"15.3": {StandardSupportUntil: time.Date(2022, 12, 31, 23, 59, 59, 0, time.UTC)},
+			"15.4": {StandardSupportUntil: time.Date(2023, 12, 31, 23, 59, 59, 0, time.UTC)},
+			"15.5": {},
+			"15.6": {},
+			"15.7": {StandardSupportUntil: time.Date(2028, 7, 31, 23, 59, 59, 0, time.UTC)},
 		}[release]
 	case constant.Alpine:
 		// https://github.com/aquasecurity/trivy/blob/master/pkg/detector/ospkg/alpine/alpine.go#L19
@@ -295,6 +302,7 @@ func GetEOL(family, release string) (eol EOL, found bool) {
 			"3.15": {StandardSupportUntil: time.Date(2023, 11, 1, 23, 59, 59, 0, time.UTC)},
 			"3.16": {StandardSupportUntil: time.Date(2024, 5, 23, 23, 59, 59, 0, time.UTC)},
 			"3.17": {StandardSupportUntil: time.Date(2024, 11, 22, 23, 59, 59, 0, time.UTC)},
+			"3.18": {StandardSupportUntil: time.Date(2025, 5, 9, 23, 59, 59, 0, time.UTC)},
 		}[majorDotMinor(release)]
 	case constant.FreeBSD:
 		// https://www.freebsd.org/security/
@@ -425,7 +433,7 @@ func GetEOL(family, release string) (eol EOL, found bool) {
 			"11": {},
 			"12": {},
 			"13": {},
-			// "14": {},
+			"14": {},
 		}[major(release)]
 	}
 	return
--- a/config/os_test.go
+++ b/config/os_test.go
@@ -478,8 +478,16 @@ func TestEOL_IsStandardSupportEnded(t *testing.T) {
 			found:    true,
 		},
 		{
-			name:     "Alpine 3.18 not found",
+			name:     "Alpine 3.18 supported",
 			fields:   fields{family: Alpine, release: "3.18"},
+			now:      time.Date(2025, 5, 9, 23, 59, 59, 0, time.UTC),
+			stdEnded: false,
+			extEnded: false,
+			found:    true,
+		},
+		{
+			name:     "Alpine 3.19 not found",
+			fields:   fields{family: Alpine, release: "3.19"},
 			now:      time.Date(2022, 1, 14, 23, 59, 59, 0, time.UTC),
 			stdEnded: false,
 			extEnded: false,
--- a/config/saasconf.go
+++ b/config/saasconf.go
@@ -7,9 +7,9 @@ import (

 // SaasConf is FutureVuls config
 type SaasConf struct {
-	GroupID int64  `json:"-"`
-	Token   string `json:"-"`
-	URL     string `json:"-"`
+	GroupID int64  `json:"GroupID"`
+	Token   string `json:"Token"`
+	URL     string `json:"URL"`
 }

 // Validate validates configuration
--- a/config/tomlloader.go
+++ b/config/tomlloader.go
@@ -138,14 +138,12 @@ func (c TOMLLoader) Load(pathToToml string) error {
 		if len(server.Enablerepo) == 0 {
 			server.Enablerepo = Conf.Default.Enablerepo
 		}
-		if len(server.Enablerepo) != 0 {
-			for _, repo := range server.Enablerepo {
-				switch repo {
-				case "base", "updates":
-					// nop
-				default:
-					return xerrors.Errorf("For now, enablerepo have to be base or updates: %s", server.Enablerepo)
-				}
+		for _, repo := range server.Enablerepo {
+			switch repo {
+			case "base", "updates":
+				// nop
+			default:
+				return xerrors.Errorf("For now, enablerepo have to be base or updates: %s", server.Enablerepo)
 			}
 		}

--- a/contrib/future-vuls/README.md
+++ b/contrib/future-vuls/README.md
@@ -100,6 +100,7 @@ future-vuls discover --cidr 192.168.0.0/24 --output discover_list.toml

 Flags:
      --cidr string           cidr range
+      --community string      snmp community name. default: public
  -h, --help                  help for discover
      --output string         output file
      --snmp-version string   snmp version v1,v2c and v3. default: v2c
--- a/contrib/future-vuls/cmd/main.go
+++ b/contrib/future-vuls/cmd/main.go
@@ -31,6 +31,7 @@ var (
 	cidr        string
 	snmpVersion string
 	proxy       string
+	community   string
 )

 func main() {
@@ -105,7 +106,10 @@ func main() {
 			if snmpVersion != "v1" && snmpVersion != "v2c" && snmpVersion != "v3" {
 				return fmt.Errorf("Invalid snmpVersion")
 			}
-			if err := discover.ActiveHosts(cidr, outputFile, snmpVersion); err != nil {
+			if community == "" {
+				community = config.Community
+			}
+			if err := discover.ActiveHosts(cidr, outputFile, snmpVersion, community); err != nil {
 				fmt.Printf("%v", err)
 				// avoid to display help message
 				os.Exit(1)
@@ -145,7 +149,8 @@ func main() {

 	cmdDiscover.PersistentFlags().StringVar(&cidr, "cidr", "", "cidr range")
 	cmdDiscover.PersistentFlags().StringVar(&outputFile, "output", "", "output file")
-	cmdDiscover.PersistentFlags().StringVar(&snmpVersion, "snmp-version", "", "snmp version v1,v2c and v3. default: v2c ")
+	cmdDiscover.PersistentFlags().StringVar(&snmpVersion, "snmp-version", "", "snmp version v1,v2c and v3. default: v2c")
+	cmdDiscover.PersistentFlags().StringVar(&community, "community", "", "snmp community name. default: public")

 	cmdAddCpe.PersistentFlags().StringVarP(&token, "token", "t", "", "future vuls token ENV: VULS_TOKEN")
 	cmdAddCpe.PersistentFlags().StringVar(&outputFile, "output", "", "output file")
--- a/contrib/future-vuls/pkg/config/config.go
+++ b/contrib/future-vuls/pkg/config/config.go
@@ -5,6 +5,7 @@ const (
 	DiscoverTomlFileName        = "discover_list.toml"
 	SnmpVersion                 = "v2c"
 	FvulsDomain                 = "vuls.biz"
+	Community                   = "public"
 	DiscoverTomlTimeStampFormat = "20060102150405"
 )

--- a/contrib/future-vuls/pkg/discover/discover.go
+++ b/contrib/future-vuls/pkg/discover/discover.go
@@ -15,7 +15,7 @@ import (
 )

 // ActiveHosts ...
-func ActiveHosts(cidr string, outputFile string, snmpVersion string) error {
+func ActiveHosts(cidr string, outputFile string, snmpVersion string, community string) error {
 	scanner := pingscanner.PingScanner{
 		CIDR: cidr,
 		PingOptions: []string{
@@ -42,7 +42,7 @@ func ActiveHosts(cidr string, outputFile string, snmpVersion string) error {

 	servers := make(config.DiscoverToml)
 	for _, activeHost := range activeHosts {
-		cpes, err := executeSnmp2cpe(activeHost, snmpVersion)
+		cpes, err := executeSnmp2cpe(activeHost, snmpVersion, community)
 		if err != nil {
 			fmt.Printf("failed to execute snmp2cpe. err: %v\n", err)
 			continue
@@ -100,9 +100,9 @@ func ActiveHosts(cidr string, outputFile string, snmpVersion string) error {
 	return nil
 }

-func executeSnmp2cpe(addr string, snmpVersion string) (cpes map[string][]string, err error) {
+func executeSnmp2cpe(addr string, snmpVersion string, community string) (cpes map[string][]string, err error) {
 	fmt.Printf("%s: Execute snmp2cpe...\n", addr)
-	result, err := exec.Command("./snmp2cpe", snmpVersion, addr, "public").CombinedOutput()
+	result, err := exec.Command("./snmp2cpe", snmpVersion, addr, community).CombinedOutput()
 	if err != nil {
 		return nil, fmt.Errorf("failed to execute snmp2cpe. err: %v", err)
 	}
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/aquasecurity/trivy-db v0.0.0-20220627104749-930461748b63
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
 	github.com/aws/aws-sdk-go v1.45.6
-	github.com/c-robinson/iplib v1.0.6
+	github.com/c-robinson/iplib v1.0.7
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/d4l3k/messagediff v1.2.2-0.20190829033028-7e0a312ae40b
 	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
@@ -21,7 +21,7 @@ require (
 	github.com/google/go-cmp v0.5.9
 	github.com/google/subcommands v1.2.0
 	github.com/google/uuid v1.3.1
-	github.com/gosnmp/gosnmp v1.35.0
+	github.com/gosnmp/gosnmp v1.36.1
 	github.com/gosuri/uitable v0.0.4
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/hashicorp/go-version v1.6.0
@@ -53,7 +53,7 @@ require (
 	go.etcd.io/bbolt v1.3.7
 	golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53
 	golang.org/x/oauth2 v0.12.0
-	golang.org/x/sync v0.2.0
+	golang.org/x/sync v0.4.0
 	golang.org/x/text v0.13.0
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
 )
@@ -165,11 +165,11 @@ require (
 	go.uber.org/goleak v1.1.12 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.23.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/tools v0.9.1 // indirect
 	google.golang.org/api v0.126.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
--- a/go.sum
+++ b/go.sum
@@ -284,8 +284,8 @@ github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQ
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M=
 github.com/briandowns/spinner v1.23.0 h1:alDF2guRWqa/FOZZYWjlMIx2L6H0wyewPxo/CH4Pt2A=
 github.com/briandowns/spinner v1.23.0/go.mod h1:rPG4gmXeN3wQV/TsAY4w8lPdIM6RX3yqeBQJSrbXjuE=
-github.com/c-robinson/iplib v1.0.6 h1:FfZV9BWNrah3BgLCFl5/nDXe4RbOi/C9n+DeXFOv5CQ=
-github.com/c-robinson/iplib v1.0.6/go.mod h1:i3LuuFL1hRT5gFpBRnEydzw8R6yhGkF4szNDIbF8pgo=
+github.com/c-robinson/iplib v1.0.7 h1:Dh9AINAlkc+NsNzZuFiVs+pi3AjN+0B7mu01KHdJKHU=
+github.com/c-robinson/iplib v1.0.7/go.mod h1:i3LuuFL1hRT5gFpBRnEydzw8R6yhGkF4szNDIbF8pgo=
 github.com/caarlos0/env/v6 v6.10.1 h1:t1mPSxNpei6M5yAeu1qtRdPAK29Nbcf/n3G7x+b3/II=
 github.com/caarlos0/env/v6 v6.10.1/go.mod h1:hvp/ryKXKipEkcuYjs9mI4bBCg+UI0Yhgm5Zu0ddvwc=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
@@ -525,8 +525,8 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gosnmp/gosnmp v1.35.0 h1:EuWWNPxTCdAUx2/NbQcSa3WdNxjzpy4Phv57b4MWpJM=
-github.com/gosnmp/gosnmp v1.35.0/go.mod h1:2AvKZ3n9aEl5TJEo/fFmf/FGO4Nj4cVeEc5yuk88CYc=
+github.com/gosnmp/gosnmp v1.36.1 h1:LaTyGWIM8Z91NmCUELJi45d+BtOafI8U82nVUGI1P+w=
+github.com/gosnmp/gosnmp v1.36.1/go.mod h1:iLcZxN2MxKhH0jPQDVMZaSNypw1ykqVi27O79koQj6w=
 github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY=
 github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM=
@@ -838,8 +838,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -934,8 +934,8 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -978,8 +978,8 @@ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1053,15 +1053,15 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
--- a/reporter/util.go
+++ b/reporter/util.go
@@ -378,25 +378,23 @@ No CVE-IDs are found in updatable packages.
 				}
 				data = append(data, []string{"Affected Pkg", line})

-				if len(pack.AffectedProcs) != 0 {
-					for _, p := range pack.AffectedProcs {
-						if len(p.ListenPortStats) == 0 {
-							data = append(data, []string{"", fmt.Sprintf("  - PID: %s %s", p.PID, p.Name)})
-							continue
-						}
-
-						var ports []string
-						for _, pp := range p.ListenPortStats {
-							if len(pp.PortReachableTo) == 0 {
-								ports = append(ports, fmt.Sprintf("%s:%s", pp.BindAddress, pp.Port))
-							} else {
-								ports = append(ports, fmt.Sprintf("%s:%s(◉ Scannable: %s)", pp.BindAddress, pp.Port, pp.PortReachableTo))
-							}
-						}
-
-						data = append(data, []string{"",
-							fmt.Sprintf("  - PID: %s %s, Port: %s", p.PID, p.Name, ports)})
+				for _, p := range pack.AffectedProcs {
+					if len(p.ListenPortStats) == 0 {
+						data = append(data, []string{"", fmt.Sprintf("  - PID: %s %s", p.PID, p.Name)})
+						continue
 					}
+
+					var ports []string
+					for _, pp := range p.ListenPortStats {
+						if len(pp.PortReachableTo) == 0 {
+							ports = append(ports, fmt.Sprintf("%s:%s", pp.BindAddress, pp.Port))
+						} else {
+							ports = append(ports, fmt.Sprintf("%s:%s(◉ Scannable: %s)", pp.BindAddress, pp.Port, pp.PortReachableTo))
+						}
+					}
+
+					data = append(data, []string{"",
+						fmt.Sprintf("  - PID: %s %s, Port: %s", p.PID, p.Name, ports)})
 				}
 			}
 		}
--- a/scanner/base.go
+++ b/scanner/base.go
@@ -1183,10 +1183,8 @@ func (l *base) execExternalPortScan(scanDestIPPorts map[string][]string) ([]stri

 func formatNmapOptionsToString(conf *config.PortScanConf) string {
 	cmd := []string{conf.ScannerBinPath}
-	if len(conf.ScanTechniques) != 0 {
-		for _, technique := range conf.ScanTechniques {
-			cmd = append(cmd, "-"+technique)
-		}
+	for _, technique := range conf.ScanTechniques {
+		cmd = append(cmd, "-"+technique)
 	}

 	if conf.SourcePort != "" {
--- a/scanner/redhatbase.go
+++ b/scanner/redhatbase.go
@@ -815,7 +815,7 @@ func (o *redhatBase) parseNeedsRestarting(stdout string) (procs []models.NeedRes
 		}

 		path := ss[1]
-		if !strings.HasPrefix(path, "/") {
+		if path != "" && !strings.HasPrefix(path, "/") {
 			path = strings.Fields(path)[0]
 			// [ec2-user@ip-172-31-11-139 ~]$ sudo needs-restarting
 			// 2024 : auditd
--- a/scanner/redhatbase_test.go
+++ b/scanner/redhatbase_test.go
@@ -500,8 +500,14 @@ func TestParseNeedsRestarting(t *testing.T) {
 	}{
 		{
 			`1 : /usr/lib/systemd/systemd --switched-root --system --deserialize 21kk
+30170 : 
 437 : /usr/sbin/NetworkManager --no-daemon`,
 			[]models.NeedRestartProcess{
+				{
+					PID:     "30170",
+					Path:    "",
+					HasInit: true,
+				},
 				{
 					PID:     "437",
 					Path:    "/usr/sbin/NetworkManager --no-daemon",
--- a/scanner/scanner.go
+++ b/scanner/scanner.go
@@ -300,8 +300,6 @@ func (s Scanner) initServers() error {
 		return xerrors.New("No scannable host OS")
 	}

-	// to generate random color for logging
-	rand.Seed(time.Now().UnixNano())
 	for _, srv := range hosts {
 		srv.setLogger(logging.NewCustomLogger(s.Debug, s.Quiet, s.LogToFile, s.LogDir, config.Colors[rand.Intn(len(config.Colors))], srv.getServerInfo().GetServerName()))
 	}
--- a/tui/tui.go
+++ b/tui/tui.go
@@ -719,24 +719,22 @@ func setChangelogLayout(g *gocui.Gui) error {
 				}
 				lines = append(lines, line)

-				if len(pack.AffectedProcs) != 0 {
-					for _, p := range pack.AffectedProcs {
-						if len(p.ListenPortStats) == 0 {
-							lines = append(lines, fmt.Sprintf("  * PID: %s %s", p.PID, p.Name))
-							continue
-						}
-
-						var ports []string
-						for _, pp := range p.ListenPortStats {
-							if len(pp.PortReachableTo) == 0 {
-								ports = append(ports, fmt.Sprintf("%s:%s", pp.BindAddress, pp.Port))
-							} else {
-								ports = append(ports, fmt.Sprintf("%s:%s(◉ Scannable: %s)", pp.BindAddress, pp.Port, pp.PortReachableTo))
-							}
-						}
-
-						lines = append(lines, fmt.Sprintf("  * PID: %s %s Port: %s", p.PID, p.Name, ports))
+				for _, p := range pack.AffectedProcs {
+					if len(p.ListenPortStats) == 0 {
+						lines = append(lines, fmt.Sprintf("  * PID: %s %s", p.PID, p.Name))
+						continue
 					}
+
+					var ports []string
+					for _, pp := range p.ListenPortStats {
+						if len(pp.PortReachableTo) == 0 {
+							ports = append(ports, fmt.Sprintf("%s:%s", pp.BindAddress, pp.Port))
+						} else {
+							ports = append(ports, fmt.Sprintf("%s:%s(◉ Scannable: %s)", pp.BindAddress, pp.Port, pp.PortReachableTo))
+						}
+					}
+
+					lines = append(lines, fmt.Sprintf("  * PID: %s %s Port: %s", p.PID, p.Name, ports))
 				}
 			}
 		}
Author	SHA1	Message	Date
Kota Kanbe	57264e1765	fix(scan): fix nil poiter in needs-restarting (#1767 )	2023-10-17 17:58:21 +09:00
dependabot[bot]	48ff5196f4	chore(deps): bump github.com/gosnmp/gosnmp from 1.35.0 to 1.36.1 (#1763 ) Bumps [github.com/gosnmp/gosnmp](https://github.com/gosnmp/gosnmp) from 1.35.0 to 1.36.1. - [Release notes](https://github.com/gosnmp/gosnmp/releases) - [Changelog](https://github.com/gosnmp/gosnmp/blob/master/CHANGELOG.md) - [Commits](https://github.com/gosnmp/gosnmp/compare/v1.35.0...v1.36.1) --- updated-dependencies: - dependency-name: github.com/gosnmp/gosnmp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-17 15:25:53 +09:00
hiroka-wada	738f275e50	fix(contrib/fvuls): Add flag to specify snmp community for future-vuls discover (#1762 ) * add: community option for discover command * fix: README --------- Co-authored-by: 和田皓翔 <wadahiroka@192.168.0.6>	2023-10-12 15:30:27 +09:00
dependabot[bot]	1c79cc5232	chore(deps): bump golang.org/x/net from 0.15.0 to 0.17.0 (#1761 ) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.15.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.15.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-12 14:23:25 +09:00
orangekame3	73da85210a	chore: remove rand.Seed() (#1756 ) Co-authored-by: MaineK00n <mainek00n.1229@gmail.com>	2023-10-12 14:17:34 +09:00
dependabot[bot]	3de546125f	chore(deps): bump golang.org/x/sync from 0.2.0 to 0.4.0 (#1757 ) Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.2.0 to 0.4.0. - [Commits](https://github.com/golang/sync/compare/v0.2.0...v0.4.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-12 14:12:32 +09:00
MaineK00n	d2ca56a515	chore(os): update EOL (#1749 )	2023-10-03 00:37:16 +09:00
guangwu	27df19f09d	chore: remove refs to deprecated io/ioutil (#1748 ) Signed-off-by: guoguangwu <guoguangwu@magic-shield.com>	2023-10-01 18:51:53 +09:00
Eng Zer Jun	c1854a3a7b	refactor: remove redundant `len` check (#1743 ) `len` returns 0 if the slice is nil. From the Go specification [1]: "1. For a nil slice, the number of iterations is 0." Therefore, an additional `len(v) != 0` check for before the loop is unnecessary. [1]: https://go.dev/ref/spec#For_range Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>	2023-09-26 18:00:05 +09:00
dependabot[bot]	b43c1b9984	chore(deps): bump github.com/c-robinson/iplib from 1.0.6 to 1.0.7 (#1745 ) Bumps [github.com/c-robinson/iplib](https://github.com/c-robinson/iplib) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/c-robinson/iplib/releases) - [Commits](https://github.com/c-robinson/iplib/compare/v1.0.6...v1.0.7) --- updated-dependencies: - dependency-name: github.com/c-robinson/iplib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-09-26 17:57:16 +09:00
hiroka-wada	9d8e510c0d	add: json tag (#1746 ) Co-authored-by: 和田皓翔 <wadahiroka@192.168.0.6>	2023-09-26 15:50:18 +09:00