test: fix the NodeSWG test

isolate each server url in a different local repo according to its url
nearform · Jul 27, 2018 · 3a05ae4 · 3a05ae4
1 parent b07d5df
commit 3a05ae4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/vulnfetcher/nodeswg/nodeswg.go b/vulnfetcher/nodeswg/nodeswg.go
@@ -1,6 +1,7 @@
 package nodeswg
 
 import (
+	"encoding/base64"
 	"encoding/json"
 	"io"
 	"log"
@@ -39,8 +40,12 @@ func New(URL string) *Fetcher {
 
 // Fetch builds the database from nodeswg on github
 func (n *Fetcher) Fetch() error {
-	destFilePath := path.Join(os.TempDir(), "nodeswg.zip")
-	unzipFolder := path.Join(os.TempDir(), "nodeswg")
+	tmpDir := path.Join(os.TempDir(), base64.StdEncoding.EncodeToString([]byte(n.DatabaseURL)))
+	os.Mkdir(tmpDir, os.ModePerm)
+
+	log.Print("Temporary directory for NodeSWG Database <", n.DatabaseURL, ">:\n", tmpDir)
+	destFilePath := path.Join(tmpDir, "nodeswg.zip")
+	unzipFolder := path.Join(tmpDir, "nodeswg")
 	vulnFolder := path.Join(unzipFolder, "security-wg-master", "vuln", "npm")
 
 	os.Mkdir(unzipFolder, os.ModePerm)

diff --git a/vulnfetcher/nodeswg/nodeswg_test.go b/vulnfetcher/nodeswg/nodeswg_test.go
@@ -46,7 +46,7 @@ func TestTestExistingPackage(t *testing.T) {
 	assert.Equal(t, "Arbitrary JavaScript Execution", vulnerabilities[0].Title, "Title")
 	assert.True(t, strings.HasPrefix(vulnerabilities[0].Description, "A vulnerability exists in bassmaster"), "Description")
 	assert.Equal(t, "<=1.5.1", vulnerabilities[0].Versions, "Version")
-	assert.True(t, strings.HasPrefix(vulnerabilities[0].References, "- https://www.npmjs.org/package/bassmaster"))
+	assert.True(t, strings.HasPrefix(vulnerabilities[0].References, "https://www.npmjs.org/package/bassmaster"))
 }
 
 func TestTestExistingPackageWithFixedVersion(t *testing.T) {

diff --git a/vulnfetcher/nodeswg/test_data/test-data.zip b/vulnfetcher/nodeswg/test_data/test-data.zip