Skip to content

feat!(detector): replace go-cti with vuls2 #2530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MaineK00n wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat!(detector): replace go-cti with vuls2 #2530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,7 @@ updates:
patterns:
- "github.com/MaineK00n/vuls-data-update"
- "github.com/MaineK00n/vuls2"
- "github.com/vulsio/go-cti"
- "github.com/vulsio/go-cve-dictionary"
- "github.com/vulsio/go-exploitdb"
- "github.com/vulsio/gost"
trivy:
patterns:
Expand All @@ -56,9 +54,7 @@ updates:
exclude-patterns:
- "github.com/MaineK00n/vuls-data-update"
- "github.com/MaineK00n/vuls2"
- "github.com/vulsio/go-cti"
- "github.com/vulsio/go-cve-dictionary"
- "github.com/vulsio/go-exploitdb"
- "github.com/vulsio/gost"
- "github.com/aquasecurity/trivy"
- "github.com/aquasecurity/trivy-db"
Expand Down
2 changes: 0 additions & 2 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ type Config struct {
// report
CveDict GoCveDictConf `json:"cveDict,omitzero"`
Gost GostConf `json:"gost,omitzero"`
Cti CtiConf `json:"cti,omitzero"`
Vuls2 Vuls2Conf `json:"vuls2,omitzero"`

Slack SlackConf `json:"-"`
Expand Down Expand Up @@ -187,7 +186,6 @@ func (c *Config) ValidateOnReport() bool {
for _, cnf := range []VulnDictInterface{
&Conf.CveDict,
&Conf.Gost,
&Conf.Cti,
} {
if err := cnf.Validate(); err != nil {
errs = append(errs, xerrors.Errorf("Failed to validate %s: %+v", cnf.GetName(), err))
Expand Down
1 change: 0 additions & 1 deletion config/tomlloader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ func (c TOMLLoader) Load(pathToToml string) error {
for _, cnf := range []VulnDictInterface{
&Conf.CveDict,
&Conf.Gost,
&Conf.Cti,
} {
cnf.Init()
}
Expand Down
27 changes: 0 additions & 27 deletions config/vulnDictConf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,33 +200,6 @@ func (cnf *GostConf) Init() {
cnf.DebugSQL = Conf.DebugSQL
}

// CtiConf is go-cti config
type CtiConf struct {
VulnDict
}

const ctiDBType = "CTI_TYPE"
const ctiDBURL = "CTI_URL"
const ctiDBPATH = "CTI_SQLITE3_PATH"

// Init set options with the following priority.
// 1. Environment variable
// 2. config.toml
func (cnf *CtiConf) Init() {
cnf.Name = "cti"
if os.Getenv(ctiDBType) != "" {
cnf.Type = os.Getenv(ctiDBType)
}
if os.Getenv(ctiDBURL) != "" {
cnf.URL = os.Getenv(ctiDBURL)
}
if os.Getenv(ctiDBPATH) != "" {
cnf.SQLite3Path = os.Getenv(ctiDBPATH)
}
cnf.setDefault("go-cti.sqlite3")
cnf.DebugSQL = Conf.DebugSQL
}

// Vuls2Conf is configuration items for vuls2
type Vuls2Conf struct {
Repository string
Expand Down
Loading