diff --git a/lam/lib/plugins/captcha/FriendlyCaptcha.inc b/lam/lib/plugins/captcha/FriendlyCaptcha.inc index be7d4bc5c..e50676714 100644 --- a/lam/lib/plugins/captcha/FriendlyCaptcha.inc +++ b/lam/lib/plugins/captcha/FriendlyCaptcha.inc @@ -118,7 +118,7 @@ class htmlFriendlyCaptcha extends htmlElement { * @return array List of input field names and their type (name => type) */ function generateHTML($module, $input, $values, $restricted, $scope) { - $script = new htmlScript('../lib/extra/friendlyCaptcha/friendlyCaptcha-0.9.13.js'); + $script = new htmlScript('../lib/extra/friendlyCaptcha/friendly-challenge-0.9.14.js'); $script->generateHTML($module, $input, $values, $restricted, $scope); echo '
'; return []; diff --git a/lam/sbom-libs.json b/lam/sbom-libs.json index 2cfaee6f7..ea39e7f78 100644 --- a/lam/sbom-libs.json +++ b/lam/sbom-libs.json @@ -1,10 +1,10 @@ { "bomFormat" : "CycloneDX", "specVersion" : "1.5", - "serialNumber" : "urn:uuid:1970d9aa-098f-4912-9581-dbeaffdaf024", + "serialNumber" : "urn:uuid:383e49e6-483d-40ee-b1ec-6266b29ee6d1", "version" : 1, "metadata" : { - "timestamp" : "2024-02-13T19:48:21Z", + "timestamp" : "2024-02-14T06:58:15Z", "tools" : [ { "vendor" : "OWASP", @@ -66,6 +66,21 @@ "type" : "library", "bom-ref" : "c4134441-7211-47d1-a970-202c819157d1" }, + { + "group" : "cdx:npm:package:bundled", + "name" : "friendly-challenge", + "version" : "0.9.14", + "licenses" : [ + { + "license" : { + "id" : "MIT" + } + } + ], + "purl" : "pkg:npm/friendly-challenge@3.7.1", + "type" : "library", + "bom-ref" : "5ffbae18-bc06-4fdb-ba19-f9e9e1afdda5" + }, { "group" : "cdx:npm:package:bundled", "name" : "jQuery", @@ -174,6 +189,10 @@ "ref" : "c4134441-7211-47d1-a970-202c819157d1", "dependsOn" : [ ] }, + { + "ref" : "5ffbae18-bc06-4fdb-ba19-f9e9e1afdda5", + "dependsOn" : [ ] + }, { "ref" : "599b305d-5cc9-4fa5-8594-e95bf8c723ef", "dependsOn" : [ ] diff --git a/lam/sbom.json b/lam/sbom.json index 5142b6fdb..782c4764b 100644 --- a/lam/sbom.json +++ b/lam/sbom.json @@ -1,7 +1,7 @@ { "bomFormat": "CycloneDX", "specVersion": "1.5", - "serialNumber": "urn:uuid:a638adf6-d969-4550-9dc8-3c7e09fc5e01", + "serialNumber": "urn:uuid:7e958857-eb9b-4f3d-887d-22f2756ccf7d", "version": 1, "metadata": { "tools": [ @@ -3710,6 +3710,21 @@ ], "purl": "pkg:npm/flatpickr@4.6.13" }, + { + "type": "library", + "bom-ref": "5ffbae18-bc06-4fdb-ba19-f9e9e1afdda5", + "group": "cdx:npm:package:bundled", + "name": "friendly-challenge", + "version": "0.9.14", + "licenses": [ + { + "license": { + "id": "MIT" + } + } + ], + "purl": "pkg:npm/friendly-challenge@3.7.1" + }, { "type": "library", "bom-ref": "599b305d-5cc9-4fa5-8594-e95bf8c723ef", @@ -4237,6 +4252,10 @@ "ref": "c4134441-7211-47d1-a970-202c819157d1", "dependsOn": [] }, + { + "ref": "5ffbae18-bc06-4fdb-ba19-f9e9e1afdda5", + "dependsOn": [] + }, { "ref": "599b305d-5cc9-4fa5-8594-e95bf8c723ef", "dependsOn": [] diff --git a/lam/templates/lib/extra/friendlyCaptcha/friendlyCaptcha-0.9.13.js b/lam/templates/lib/extra/friendlyCaptcha/friendly-challenge-0.9.14.js similarity index 93% rename from lam/templates/lib/extra/friendlyCaptcha/friendlyCaptcha-0.9.13.js rename to lam/templates/lib/extra/friendlyCaptcha/friendly-challenge-0.9.14.js index 4a3fc33b4..21e19cbfc 100644 --- a/lam/templates/lib/extra/friendlyCaptcha/friendlyCaptcha-0.9.13.js +++ b/lam/templates/lib/extra/friendlyCaptcha/friendly-challenge-0.9.14.js @@ -1,104 +1,104 @@ -var css = '.frc-captcha *{margin:0;padding:0;border:0;text-align:initial;border-radius:px;filter:none!important;transition:none!important;font-weight:400;font-size:14px;line-height:1.2;text-decoration:none;background-color:initial;color:#222}.frc-captcha{position:relative;min-width:250px;max-width:312px;border:1px solid #f4f4f4;padding-bottom:12px;background-color:#fff}.frc-captcha b{font-weight:700}.frc-container{display:flex;align-items:center;min-height:52px}.frc-icon{fill:#222;stroke:#222;flex-shrink:0;margin:8px 8px 0}.frc-icon.frc-warning{fill:#c00}.frc-success .frc-icon{animation:1s ease-in both frc-fade-in}.frc-content{white-space:nowrap;display:flex;flex-direction:column;margin:4px 6px 0 0;overflow-x:auto;flex-grow:1}.frc-banner{position:absolute;bottom:0;right:6px;line-height:1}.frc-banner *{font-size:10px;opacity:.8;text-decoration:none}.frc-progress{-webkit-appearance:none;-moz-appearance:none;appearance:none;margin:3px 0;height:4px;border:none;background-color:#eee;color:#222;width:100%;transition:.5s linear}.frc-progress::-webkit-progress-bar{background:#eee}.frc-progress::-webkit-progress-value{background:#222}.frc-progress::-moz-progress-bar{background:#222}.frc-button{cursor:pointer;padding:2px 6px;background-color:#f1f1f1;border:1px solid transparent;text-align:center;font-weight:600;text-transform:none}.frc-button:focus{border:1px solid #333}.frc-button:hover{background-color:#ddd}.frc-captcha-solution{display:none}.frc-err-url{text-decoration:underline;font-size:.9em}.dark.frc-captcha{color:#fff;background-color:#222;border-color:#333}.dark.frc-captcha *{color:#fff}.dark.frc-captcha button{background-color:#444}.dark .frc-icon{fill:#fff;stroke:#fff}.dark .frc-progress{background-color:#444}.dark .frc-progress::-webkit-progress-bar{background:#444}.dark .frc-progress::-webkit-progress-value{background:#ddd}.dark .frc-progress::-moz-progress-bar{background:#ddd}@keyframes frc-fade-in{from{opacity:0}to{opacity:1}}'; +var css = '.frc-captcha *{margin:0;padding:0;border:0;text-align:initial;border-radius:px;filter:none!important;transition:none!important;font-weight:400;font-size:14px;line-height:1.2;text-decoration:none;background-color:initial;color:#222}.frc-captcha{position:relative;min-width:250px;max-width:312px;border:1px solid #f4f4f4;padding-bottom:12px;background-color:#fff}.frc-captcha b{font-weight:700}.frc-container{display:flex;align-items:center;min-height:52px}.frc-icon{fill:#222;stroke:#222;flex-shrink:0;margin:8px 8px 0}.frc-icon.frc-warning{fill:#c00}.frc-success .frc-icon{animation:1s ease-in both frc-fade-in}.frc-content{white-space:nowrap;display:flex;flex-direction:column;margin:4px 6px 0 0;overflow-x:auto;flex-grow:1}.frc-banner{position:absolute;bottom:0;right:6px;line-height:1}.frc-banner *{font-size:10px;opacity:.8;text-decoration:none}.frc-progress{-webkit-appearance:none;-moz-appearance:none;appearance:none;margin:3px 0;height:4px;border:none;background-color:#eee;color:#222;width:100%;transition:.5s linear}.frc-progress::-webkit-progress-bar{background:#eee}.frc-progress::-webkit-progress-value{background:#222}.frc-progress::-moz-progress-bar{background:#222}.frc-button{cursor:pointer;padding:2px 6px;background-color:#f1f1f1;border:1px solid transparent;text-align:center;font-weight:600;text-transform:none}.frc-button:focus{border:1px solid #333}.frc-button:hover{background-color:#ddd}.frc-captcha-solution{display:none}.frc-err-url{text-decoration:underline;font-size:.9em}.frc-rtl{direction:rtl}.frc-rtl .frc-content{margin:4px 0 0 6px}.frc-banner.frc-rtl{left:6px;right:auto}.dark.frc-captcha{color:#fff;background-color:#222;border-color:#333}.dark.frc-captcha *{color:#fff}.dark.frc-captcha button{background-color:#444}.dark .frc-icon{fill:#fff;stroke:#fff}.dark .frc-progress{background-color:#444}.dark .frc-progress::-webkit-progress-bar{background:#444}.dark .frc-progress::-webkit-progress-value{background:#ddd}.dark .frc-progress::-moz-progress-bar{background:#ddd}@keyframes frc-fade-in{from{opacity:0}to{opacity:1}}'; // This is not an enum to save some bytes in the output bundle. const SOLVER_TYPE_JS = 1; const CHALLENGE_SIZE_BYTES = 128; -// @ts-ignore -const loaderSVG = `