empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 08:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Issue 3901 match target sw (#3982)

Browse Source 
* Allow to search with target_sw with a period

* Remove tests for a different thign

* Add a test for programs as a source as well

* Use MATCH again and add proper tests
This commit is contained in:
Tomas Touceda 2022-02-02 17:17:41 -03:00 committed by GitHub
parent 7c87dad4e1
commit b90e2e2e3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/issue-3901-match-target-sw Normal file
View File

@ -0,0 +1 @@
* Properly match target_sw when looking for vulnerabilities within npm packages

4
server/vulnerabilities/cpe.go
View File

@ -159,10 +159,10 @@ func CPEFromSoftware(db *sqlx.DB, software *fleet.Software) (string, error) {
case "portage_packages":
case "rpm_packages":
case "npm_packages":
targetSW = "node.js"
targetSW = `"node.js"`
case "atom_packages":
case "programs":
targetSW = "windows*"
targetSW = `"windows*"`
case "ie_extensions":
case "chocolatey_packages":
}

8
server/vulnerabilities/cpe_test.go
View File

@ -87,6 +87,14 @@ func TestSyncCPEDatabase(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "cpe:2.3:a:1password:1password:7.2.3:beta0:*:*:*:macos:*:*", cpe)
npmCPE, err := CPEFromSoftware(db, &fleet.Software{Name: "Adaltas Mixme 0.4.0 for Node.js", Version: "0.4.0", Source: "npm_packages"})
require.NoError(t, err)
assert.Equal(t, "cpe:2.3:a:adaltas:mixme:0.4.0:*:*:*:*:node.js:*:*", npmCPE)
windowsCPE, err := CPEFromSoftware(db, &fleet.Software{Name: "HP Storage Data Protector 8.0 for Windows 8", Version: "8.0", Source: "programs"})
require.NoError(t, err)
assert.Equal(t, "cpe:2.3:a:hp:storage_data_protector:8.0:-:*:*:*:windows_7:*:*", windowsCPE)
// but now we truncate to make sure searching for cpe fails
err = os.Truncate(dbPath, 0)
require.NoError(t, err)