oxsecurity
diff --git a/‎.automation/build.py
Lines changed: 46 additions & 12 deletions b/‎.automation/build.py
Lines changed: 46 additions & 12 deletions
diff --git a/‎.cspell.json
Lines changed: 1 addition & 0 deletions b/‎.cspell.json
Lines changed: 1 addition & 0 deletions
diff --git a/‎.jscpd.json
Lines changed: 2 additions & 1 deletion b/‎.jscpd.json
Lines changed: 2 additions & 1 deletion
diff --git a/‎CHANGELOG.md
Lines changed: 3 additions & 0 deletions b/‎CHANGELOG.md
Lines changed: 3 additions & 0 deletions
diff --git a/‎build.sh
Lines changed: 3 additions & 1 deletion b/‎build.sh
Lines changed: 3 additions & 1 deletion
@@ -2004,6 +2004,7 @@ def generate_documentation_all_linters():
             linter_licenses = json.load(json_file)
             license = ""
             md_license = "<!-- -->"
+            linter_license_md_file = None
             # get license from github api
             if (
                 hasattr(linter, "linter_repo")
@@ -2020,19 +2021,48 @@ def generate_documentation_all_linters():
                 session = requests_retry_session()
                 r = session.get(api_github_url, headers=api_github_headers)
                 if r is not None:
+                    # Update license key for licenses file
                     resp = r.json()
-                    if "license" in resp and "spdx_id" in resp["license"]:
-                        license = (
-                            resp["license"]["spdx_id"]
-                            if resp["license"]["spdx_id"] != "NOASSERTION"
-                            else resp["license"]["name"]
-                            if "name" in resp["license"]
-                            else resp["license"]["key"]
-                            if "key" in resp["license"]
-                            else ""
+                    if resp is not None and not isinstance(resp, type(None)):
+                        if "license" in resp and "spdx_id" in resp["license"]:
+                            license = (
+                                resp["license"]["spdx_id"]
+                                if resp["license"]["spdx_id"] != "NOASSERTION"
+                                else resp["license"]["name"]
+                                if "name" in resp["license"]
+                                else resp["license"]["key"]
+                                if "key" in resp["license"]
+                                else ""
+                            )
+                            if license != "":
+                                linter_licenses[linter.linter_name] = license
+                    # Fetch and update license file if not in repo
+                    linter_license_md_file = (
+                        f"{REPO_HOME}/docs/licenses/{linter.linter_name}.md"
+                    )
+                    if not os.path.isfile(linter_license_md_file):
+                        api_github_license_url = api_github_url + "/license"
+                        r_license = session.get(
+                            api_github_license_url, headers=api_github_headers
                         )
-                        if license != "":
-                            linter_licenses[linter.linter_name] = license
+                        if r_license is not None:
+                            resp_license = r_license.json()
+                            if "download_url" in resp_license:
+                                license_downloaded = session.get(
+                                    resp_license["download_url"]
+                                )
+                                with open(
+                                    linter_license_md_file, "w", encoding="utf-8"
+                                ) as license_out_file:
+                                    license_out_file.write(license_downloaded.text)
+                                    logging.info(
+                                        f"Copied license of {linter.linter_name} in {linter_license_md_file}"
+                                    )
+                            else:
+                                logging.warning(
+                                    f"WARNING: No download_url returned in {api_github_license_url}"
+                                )
+
             # get license from descriptor
             if (
                 license == ""
@@ -2045,7 +2075,11 @@ def generate_documentation_all_linters():
                 license = linter_licenses[linter.linter_name]
             # build md_license
             if license != "":
-                md_license = license
+                if linter_license_md_file is not None:
+                    license_doc_url = f"licenses/{linter.linter_name}.md"
+                    md_license = f"[{license}]({license_doc_url})"
+                else:
+                    md_license = license
         # Update licenses file
         with open(LICENSES_FILE, "w", encoding="utf-8") as outfile:
             json.dump(linter_licenses, outfile, indent=4, sort_keys=True)
 
@@ -5,6 +5,7 @@
         "**/.automation/generated/**",
         "**/.git/**",
         "**/package-lock.json",
+        "**/licenses/*.md",
         "lib",
         "report",
         ".vscode"
 
@@ -25,6 +25,7 @@
     "**/megalinter/tests/test_megalinter/helpers/utilstest.py",
     "**/*.test.js",
     "**/CHANGELOG.md",
-    "**/mega-linter-runner/README.md"
+    "**/mega-linter-runner/README.md",
+    "**/licenses/*.md"
   ]
 }
@@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 Note: Can be used with `megalinter/megalinter@beta` in your GitHub Action mega-linter.yml file, or with `megalinter/megalinter:beta` docker image
 
+- Add linters licenses to online documentation
+- Fix issue when config vars are both from ENV and from config file ([#1154](https://github.com/megalinter/megalinter/issues/1154))
+
 - Linter versions upgrades
   - [coffeelint](http://www.coffeelint.org) from 5.2.2 to **5.2.3** on 2022-01-09
   - [phpstan](https://phpstan.org/) from 1.3.0 to **1.3.3** on 2022-01-09
 
@@ -12,7 +12,9 @@ fi
 # Prettify markdown tables
 echo "Formatting markdown tables..."
 # shellcheck disable=SC2086
-MD_FILES=$(find . -type f -name "*.md" -not -path "*/node_modules/*" -not -path "*/.automation/*") && npx markdown-table-formatter $MD_FILES
+MD_FILES=$(find . -type f -name "*.md" -not -path "*/node_modules/*" -not -path "*/.automation/*" -not -path "*/licenses/*") && npx markdown-table-formatter $MD_FILES
+# shellcheck disable=SC2086
+MD_FILES_2=$(find . -type f -name "*.md" -not -path "*/node_modules/*" -not -path "*/.automation/*" -path "*/licenses/*") && npx markdown-table-formatter $MD_FILES_2
 
 # Build online documentation
 if type python3 >/dev/null 2>/dev/null; then
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`"**/megalinter/tests/test_megalinter/helpers/utilstest.py",`
`26`	`26`	`"*/.test.js",`
`27`	`27`	`"**/CHANGELOG.md",`
`28`		`- "**/mega-linter-runner/README.md"`
	`28`	`+ "**/mega-linter-runner/README.md",`
	`29`	`+ "*/licenses/.md"`
`29`	`30`	`]`
`30`	`31`	`}`