Fixing licenses cache;

Author: nicholasks

safety/cli.py

@@ -123,7 +123,7 @@ def review(full_report, bare, file):
 
 
 @cli.command()
-@click.option("--key", default="", envvar="SAFETY_API_KEY",
+@click.option("--key", required=True, envvar="SAFETY_API_KEY",
               help="API Key for pyup.io's vulnerability database. Can be set as SAFETY_API_KEY "
                    "environment variable. Default: empty")
 @click.option("--db", default="",

safety/constants.py

@@ -13,6 +13,8 @@
 
 CACHE_VALID_SECONDS = 60 * 60 * 2  # 2 hours
 
+CACHE_LICENSES_VALID_SECONDS = 60 * 60 * 24 * 7  # one week
+
 CACHE_FILE = os.path.join(
     os.path.expanduser("~"),
     ".safety",

safety/safety.py

@@ -8,8 +8,8 @@
 import requests
 from packaging.specifiers import SpecifierSet
 
-from .constants import (API_MIRRORS, CACHE_FILE, CACHE_VALID_SECONDS,
-                        OPEN_MIRRORS, REQUEST_TIMEOUT)
+from .constants import (API_MIRRORS, CACHE_FILE, CACHE_LICENSES_VALID_SECONDS,
+                        CACHE_VALID_SECONDS, OPEN_MIRRORS, REQUEST_TIMEOUT)
 from .errors import (DatabaseFetchError, DatabaseFileNotFoundError,
                      InvalidKeyError)
 from .util import RequirementFile
@@ -27,7 +27,13 @@ def get_from_cache(db_name):
                 data = json.loads(f.read())
                 if db_name in data:
                     if "cached_at" in data[db_name]:
-                        if data[db_name]["cached_at"] + CACHE_VALID_SECONDS > time.time():
+                        if 'licenses.json' in db_name:
+                            # Getting the specific cache time for the licenses db.
+                            cache_valid_seconds = CACHE_LICENSES_VALID_SECONDS
+                        else:
+                            cache_valid_seconds = CACHE_VALID_SECONDS
+
+                        if data[db_name]["cached_at"] + cache_valid_seconds > time.time():
                             return data[db_name]["db"]
             except json.JSONDecodeError:
                 pass