test: fix permission denied error with logs path

groupe-edf · Nov 30, 2020 · 35906d5 · 35906d5
1 parent 01cc30b
commit 35906d5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.0
+1.0.0
diff --git a/internal/security/rule.go b/internal/security/rule.go
@@ -40,7 +40,7 @@ var (
 	rules = []Rule{
 		{
 			Description: "ASYMMETRIC_PRIVATE_KEY",
-			Regexp:      regexp.MustCompile(string(`(\-){5}BEGIN[[:space:]]*?(RSA|OPENSSH|DSA|EC|PGP)?[[:space:]]*?PRIVATE[[:space:]]KEY[[:space:]]*?(BLOCK)?(\-){5}.*`)),
+			Regexp:      regexp.MustCompile(string(`(\-){5}BEGIN[[:blank:]]*?(RSA|OPENSSH|DSA|EC|PGP)?[[:blank:]]*?PRIVATE[[:blank:]]KEY[[:blank:]]*?(BLOCK)?(\-){5}.*`)),
 			Tags:        []string{"key"},
 			Severity:    SeverityMajor,
 		},
@@ -58,7 +58,7 @@ var (
 		},
 		{
 			Description: "BASE_64",
-			Regexp:      regexp.MustCompile("(?i)['\"]?((?:[_]?auth(?:Token|orization:[[:space:]]Basic)?)['\"]?[[:space:]=:]{1})[[:space:]]*['\"]?" + Base64Pattern + "['\"]?"),
+			Regexp:      regexp.MustCompile("(?i)['\"]?((?:[_]?auth(?:Token|orization:[[:blank:]]Basic)?)['\"]?[[:blank:]=:]{1})[[:blank:]]*['\"]?" + Base64Pattern + "['\"]?"),
 			Tags:        []string{"authentication", "base64"},
 			Severity:    SeverityMinor,
 		},

diff --git a/test/data/application.json.golden b/test/data/application.json.golden
@@ -5,7 +5,7 @@
   },
   "non_compliant": {
     "username": "root",
-    "password: "Pa$$w0rd",
+    "password": "Pa$$w0rd",
     "environment": [
       "DB_PASSWORD=Pa$$w0rd"
     ]

diff --git a/test/data/application.properties.golden b/test/data/application.properties.golden
@@ -1,5 +1,7 @@
 # Compliant
 spring.datasource.password
+spring.datasource.password=
+spring.datasource.password=${PASSWORD}
 
 # Non Compliant
 database.url=jdbc:sqlserver://localhost;user=root;password=Pa$$w0rd;

diff --git a/test/data/config.json.golden b/test/data/config.json.golden
@@ -3,7 +3,7 @@
   "auths": {
     "https://index.docker.io/v1/": {
       "email": "john.doe@acme.com",
-      "auth":"X3Rva2VuOjEyMzQ1Njc4OTBBQkNERUY="
+      "auth": "X3Rva2VuOjEyMzQ1Njc4OTBBQkNERUY="
     }
   }
 }
diff --git a/test/data/language.go.golden b/test/data/language.go.golden
@@ -6,12 +6,12 @@ import (
 )
 
 var (
-	// Compliant
-	password := os.Getenv("PASSWORD")
+  // Compliant
+  password := os.Getenv("PASSWORD")
   redisPassword := GetRedisPassword()
 
-	// Non Compliant
-	databasePassword := "Pa$$w0rd"
+  // Non Compliant
+  databasePassword := "Pa$$w0rd"
 )
 
 func main() {

diff --git a/test/data/pre-receive b/test/data/pre-receive
@@ -6,7 +6,7 @@ while read -r OldRev NewRev RefName; do
     --hook-type="pre-receive" \
     --hook-input="$OldRev $NewRev $RefName" \
     --verbose="true" \
-    --logs-path="/var/log/watchdog/watchdog.log" \
+    --logs-path="watchdog.log" \
     --logs-level="debug" \
     --output-format="%s"
   status=$?