Improved config file loading

Dockerfile

@@ -114,6 +114,7 @@ ENV APP_SRC_DIR=/usr/local/src \
     GOARCH=amd64 \
     GOOS=linux \
     CGO_ENABLED=0 \
+    NVD_EXCLUDE_TYPES="o,h" \
     PATH=/usr/local/src/:${PATH}:/opt/gradle/bin:/opt/apache-maven/bin:/usr/local/go/bin:/opt/sl-cli:/opt/phpsast/vendor/bin:
 
 COPY --from=builder /usr/local/bin/shiftleft /usr/local/bin

ci/Dockerfile-csharp

@@ -76,6 +76,7 @@ ENV APP_SRC_DIR=/usr/local/src \
     GOARCH=amd64 \
     GOOS=linux \
     CGO_ENABLED=0 \
+    NVD_EXCLUDE_TYPES="o,h" \
     PATH=/usr/local/src/:${PATH}:/usr/local/go/bin:/opt/sl-cli:
 
 COPY --from=builder /usr/local/bin/shiftleft /usr/local/bin

ci/Dockerfile-dynamic-lang

@@ -40,6 +40,7 @@ ENV APP_SRC_DIR=/usr/local/src \
     DEPSCAN_CMD="/usr/local/bin/depscan" \
     PMD_CMD="" \
     PYTHONUNBUFFERED=1 \
+    NVD_EXCLUDE_TYPES="o,h" \
     PATH=/usr/local/src/:${PATH}:
 
 COPY --from=builder /usr/local/bin/shiftleft /usr/local/bin

ci/Dockerfile-java

@@ -120,6 +120,7 @@ ENV APP_SRC_DIR=/usr/local/src \
     GOARCH=amd64 \
     GOOS=linux \
     CGO_ENABLED=0 \
+    NVD_EXCLUDE_TYPES="o,h" \
     PATH=/usr/local/src/:${PATH}:/opt/sbt/bin:/opt/gradle/bin:/opt/apache-maven/bin:/usr/local/go/bin:/opt/sl-cli:
 
 COPY --from=builder /usr/local/bin/shiftleft /usr/local/bin

ci/Dockerfile-oss

@@ -110,6 +110,7 @@ ENV APP_SRC_DIR=/usr/local/src \
     GOARCH=amd64 \
     GOOS=linux \
     CGO_ENABLED=0 \
+    NVD_EXCLUDE_TYPES="o,h" \
     PATH=/usr/local/src/:${PATH}:/opt/gradle/bin:/opt/apache-maven/bin:/usr/local/go/bin:
 
 COPY --from=builder /usr/local/bin/shiftleft /usr/local/bin

lib/config.py

@@ -244,7 +244,7 @@ def get(configName, default_value=None):
     try:
         value = runtimeValues.get(configName)
         if value is None:
-            value = os.environ.get(configName.upper())
+            value = os.environ.get(configName.replace("-", "_").upper())
         if value is None:
             value = getattr(sys.modules[__name__], configName, None)
         if value is None:
@@ -1591,18 +1591,20 @@ def __hash__(self):
 
 def reload():
     # Load any .sastscanrc file from the root
+    scanrc = os.path.join(os.getcwd(), ".sastscanrc")
     if get("SAST_SCAN_SRC_DIR"):
         scanrc = os.path.join(get("SAST_SCAN_SRC_DIR"), ".sastscanrc")
-        if os.path.exists(scanrc):
-            with open(scanrc, "r") as rcfile:
-                try:
-                    new_config = json.loads(rcfile.read())
-                    for key, value in new_config.items():
-                        exis_config = get(key)
-                        if isinstance(exis_config, dict):
-                            exis_config.update(value)
-                            set(key, exis_config)
-                        else:
-                            set(key, value)
-                except Exception:
-                    print(".sastscanrc should be a valid json file")
+    if os.path.exists(scanrc):
+        with open(scanrc, "r") as rcfile:
+            try:
+                print("Overriding the config with .sastscanrc")
+                new_config = json.loads(rcfile.read())
+                for key, value in new_config.items():
+                    exis_config = get(key)
+                    if isinstance(exis_config, dict):
+                        exis_config.update(value)
+                        set(key, exis_config)
+                    else:
+                        set(key, value)
+            except Exception:
+                print(".sastscanrc should be a valid json file")