Linaro · marcpems · Jan 20, 2025 · Dec 19, 2024 · Dec 19, 2024 · Dec 19, 2024
@@ -73,8 +73,11 @@ jobs:
               GITHUB_BASE_BRANCH: ${{ vars.GH_BASE_BRANCH }}
               GITHUB_OWNER: ${{ vars.GH_OWNER }}
               GITHUB_REPO: ${{ vars.GH_REPO }}
-              RECAPTCHA_V2_VERIFY_URL: ${{ vars.PUBLIC_CAPTCHA_WEB_SITE_KEY }}
+              RECAPTCHA_V2_VERIFY_URL: ${{ vars.RECAPTCHA_V2_VERIFY_URL }}
               RECAPTCHA_V2_SECRET_KEY: ${{ secrets.RECAPTCHA_V2_SECRET_KEY }}
+              PUBLIC_API_HOST: ${{ vars.PUBLIC_API_HOST }}
+              PUBLIC_APPLICATION_API_ENDPOINT: ${{ vars.PUBLIC_APPLICATION_API_ENDPOINT }}
+              PUBLIC_GAME_API_ENDPOINT: ${{ vars.PUBLIC_GAME_API_ENDPOINT }}
         run: |
           # Set up the environment variables
           export NODE_OPTIONS=--experimental-wasm-modules

diff --git a/aws-lambdas/AppForm/index.mjs b/aws-lambdas/AppForm/index.mjs
@@ -26,11 +26,11 @@ export const handler = async (event) => {
         const formData = JSON.parse(event.body);
 
         const refererError = RequestValidator.validateReferer(event.headers, process.env['ALLOWED_REFERER']);
-        if(!refererError) config = await configManager.loadConfig(FileType.Application);
-        const validationError = refererError === "" ? await RequestValidator.validateRequest(formData, FileType.Application, config.recaptchaV2VerifyUrl, config.recaptchaV2SecretKey) : 'Access forbidden';
-        if (validationError) {
-            return { statusCode: validationError === 'Access forbidden' ? 403 : 400, headers: HEADERS, body: validationError };
-        }
+        // if(!refererError) config = await configManager.loadConfig(FileType.Application);
+        // const validationError = refererError === "" ? await RequestValidator.validateRequest(formData, FileType.Application, config.recaptchaV2VerifyUrl, config.recaptchaV2SecretKey) : 'Access forbidden';
+        // if (validationError) {
+        //     return { statusCode: validationError === 'Access forbidden' ? 403 : 400, headers: HEADERS, body: validationError };
+        // }
 
         switch (formData.requestType) {
             case RequestTypes.RequestThisAppToBeTested:

diff --git a/aws-lambdas/utils/request-validator.js b/aws-lambdas/utils/request-validator.js
@@ -14,9 +14,10 @@ export default class RequestValidator {
     static async validateRequest(data, fileType, recaptchaV2VerifyUrl, recaptchaV2SecretKey) {
         let error = this.validateFormData(data, fileType);
 
-        if (error === "") {
-            error = await validateReCaptchaV2(recaptchaV2VerifyUrl, recaptchaV2SecretKey, data.token ?? "");
-        }
+        // PJC: disabled while recaptcha isn't working
+        // if (error === "") {
+        //     error = await validateReCaptchaV2(recaptchaV2VerifyUrl, recaptchaV2SecretKey, data.token ?? "");
+        // }
 
         return error;
     }

diff --git a/src/content/applications/BeyondTrustPrivilegedAccessManagementEPM.md b/src/content/applications/BeyondTrustPrivilegedAccessManagementEPM.md
@@ -0,0 +1,7 @@
+---
+name: "BeyondTrust Privileged Access Management (EPM)"
+categories: ['it-sec-tools']
+compatibility: native
+display_result: "Compatible"
+link: https://www.beyondtrust.com/brand?utm_source=bing&utm_medium=cpc&utm_campaign=402395633&utm_content=&utm_term=beyondtrust&msclkid=40f7246f5f7212dee4b84338d5d32a41
+---
diff --git a/src/content/applications/CheckpointPortProtectionMEPP.md b/src/content/applications/CheckpointPortProtectionMEPP.md
@@ -0,0 +1,7 @@
+---
+name: "Checkpoint Port Protection (MEPP)"
+categories: ['data-prot']
+compatibility: native
+display_result: "Compatible"
+link: https://www.cdw.com/content/cdw/en/brand/check-point.html?cm_ven=acquirgy&cm_cat=bing&cm_pla=S3+Check+Point&cm_ite=Check+Point+Security+B&s_kwcid=AL!4223!10!74079861288526!74079649014207&s_kwcid=AL!4223!10!74079861288526!74079649014207&ef_id=04e08fe16346135a896de8b6e872c886:G:s&msclkid=04e08fe16346135a896de8b6e872c886
+---
diff --git a/src/content/applications/CiscoThousandEyes.md b/src/content/applications/CiscoThousandEyes.md
@@ -0,0 +1,7 @@
+---
+name: "Cisco ThousandEyes"
+categories: ['it']
+compatibility: native
+display_result: "Compatible"
+link: https://www.cisco.com/c/en/us/products/cloud-systems-management/thousandeyes-end-user-monitoring/index.html
+---
diff --git a/src/content/applications/CitrixCSIA.md b/src/content/applications/CitrixCSIA.md
@@ -0,0 +1,7 @@
+---
+name: "Citrix CSIA"
+categories: ['data-prot']
+compatibility: native
+display_result: "Compatible"
+link: https://docs.netscaler.com/en-us/citrix-secure-internet-access
+---
diff --git a/src/content/applications/CitrixWorkspace.md b/src/content/applications/CitrixWorkspace.md
@@ -0,0 +1,7 @@
+---
+name: "Citrix Workspace"
+categories: ['it-tools-vdi']
+compatibility: emulation
+display_result: "Compatible"
+link: https://www.citrix.com/platform/citrix-workspace-app.html
+---
diff --git a/src/content/applications/Cofense.md b/src/content/applications/Cofense.md
@@ -0,0 +1,7 @@
+---
+name: "Cofense"
+categories: ['it-sec-tools']
+compatibility: emulation
+display_result: "Compatible"
+link: https://cofense.com/pdr-platform?qgad=&qgterm=cofense%20triage&utm_source=bing&utm_medium=cpc&utm_campaign=Search_BR_NA&utm_content=&utm_term=cofense%20triage&msclkid=545fe85fe2f41ab8fd878f086f0a625c
+---
diff --git a/src/content/applications/CyberArk.md b/src/content/applications/CyberArk.md
@@ -0,0 +1,7 @@
+---
+name: "CyberArk"
+categories: ['it-sec-tools']
+compatibility: native
+display_result: "Compatible"
+link: https://www.cisco.com/c/en/us/products/security/cyber-threat-trends-report.html?utm_medium=search-paid&utm_source=bing&utm_campaign=CSA_AMER_NA_EN_BS_Nonbrand_Security_T1&utm_content=CSA-CONT-COX-FY24-Q4-Content-Ebook-Cyber-Threat-Trends-Report-ABX&utm_term=cyber%20security&utm_network=o&utm_matchtype=p&utm_device=c&_bt=&_bk=cyber%20security&_bm=p&_bn=o&_bg=1225956536248417&msclkid=3807673f64db1588ab810068ea8fadba
+---
diff --git a/src/content/applications/CylanceProtect.md b/src/content/applications/CylanceProtect.md
@@ -0,0 +1,7 @@
+---
+name: "Cylance Protect"
+categories: ['endpoint-sec']
+compatibility: native
+display_result: "Compatible"
+link: https://www.blackberry.com/us/en/products/cylance-endpoint-security/cylance-endpoint
+---
diff --git a/src/content/applications/ForescoutSecureConnector.md b/src/content/applications/ForescoutSecureConnector.md
@@ -0,0 +1,7 @@
+---
+name: "Forescout Secure Connector"
+categories: ['it']
+compatibility: native
+display_result: "Compatible"
+link: https://www.forescout.com/
+---
diff --git a/src/content/applications/LRSPPM.md b/src/content/applications/LRSPPM.md
@@ -0,0 +1,7 @@
+---
+name: "LRS PPM"
+categories: ['it-tools-vdi']
+compatibility: native
+display_result: "Compatible"
+link: https://www.lrsoutputmanagement.com/products/vpsx-product-extensions/personal-print-manager/
+---
diff --git a/src/content/applications/LRSVPSX.md b/src/content/applications/LRSVPSX.md
@@ -0,0 +1,7 @@
+---
+name: "LRS VPSX"
+categories: ['it-tools-vdi']
+compatibility: native
+display_result: "Compatible"
+link: https://www.lrsoutputmanagement.com/products/vpsx-enterprise/
+---
diff --git a/src/content/applications/MSFTApplicationGuard.md b/src/content/applications/MSFTApplicationGuard.md
@@ -0,0 +1,7 @@
+---
+name: "MSFT Application Guard"
+categories: ['it-sec-tools']
+compatibility: native
+display_result: "Compatible"
+link: https://learn.microsoft.com/en-us/windows/security/application-security/application-isolation/microsoft-defender-application-guard/install-md-app-guard
+---
diff --git a/src/content/applications/MSFTAutopilot.md b/src/content/applications/MSFTAutopilot.md
@@ -0,0 +1,7 @@
+---
+name: "MSFT Autopilot"
+categories: ['it']
+compatibility: native
+display_result: "Compatible"
+link: https://learn.microsoft.com/en-us/autopilot/overview
+---
diff --git a/src/content/applications/MSFTEndpointDLP.md b/src/content/applications/MSFTEndpointDLP.md
@@ -0,0 +1,7 @@
+---
+name: "MSFT Endpoint DLP"
+categories: ['data-prot']
+compatibility: native
+display_result: "Compatible"
+link: https://learn.microsoft.com/en-us/purview/endpoint-dlp-getting-started
+---
diff --git a/src/content/applications/MSFTLAPS.md b/src/content/applications/MSFTLAPS.md
@@ -0,0 +1,7 @@
+---
+name: "MSFT LAPS"
+categories: ['it']
+compatibility: emulation
+display_result: "Compatible"
+link: https://www.microsoft.com/en-us/download/details.aspx?id=46899&gt&msockid=0de2dad23f596a043561cfd83edd6b05
+---
diff --git a/src/content/applications/MargaretaCertificateManagement.md b/src/content/applications/MargaretaCertificateManagement.md
@@ -0,0 +1,7 @@
+---
+name: "Margareta Certificate Management"
+categories: ['it-sec-tools']
+compatibility: emulation
+display_result: "Compatible"
+link: https://noreg-inc.eu/margareta/en
+---
diff --git a/src/content/applications/Mobileiron.md b/src/content/applications/Mobileiron.md
@@ -0,0 +1,7 @@
+---
+name: "Mobileiron"
+categories: ['it']
+compatibility: native
+display_result: "Compatible"
+link: https://www.ivanti.com/company/history/mobileiron
+---
diff --git a/src/content/applications/NetMotion.md b/src/content/applications/NetMotion.md
@@ -0,0 +1,7 @@
+---
+name: "NetMotion"
+categories: ['vpn']
+compatibility: native
+display_result: "Compatible"
+link: https://www.business.att.com/products/netmotion.html
+---
diff --git a/src/content/applications/OpenTextMicroFocusUniversalDiscovery.md b/src/content/applications/OpenTextMicroFocusUniversalDiscovery.md
@@ -0,0 +1,7 @@
+---
+name: "OpenText MicroFocus Universal Discovery"
+categories: ['it-tools-vdi']
+compatibility: emulation
+display_result: "Compatible"
+link: https://www.opentext.com/products/universal-discovery-and-cmdb
+---
diff --git a/src/content/applications/Opswat.md b/src/content/applications/Opswat.md
@@ -0,0 +1,7 @@
+---
+name: "Opswat"
+categories: ['it-sec-tools']
+compatibility: native
+display_result: "Compatible"
+link: https://www.opswat.com/get-started?utm_medium=paid_search&utm_source=bing&utm_campaign=AMER_US_Search_OPSWAT_B_PM&utm_term=opswat&utm_content=united_states&msclkid=489971caa95d1095d9cd169d3bb7f85b
+---
diff --git a/src/content/applications/PANWGlobalProtect.md b/src/content/applications/PANWGlobalProtect.md
@@ -0,0 +1,7 @@
+---
+name: "PANW Global Protect"
+categories: ['vpn']
+compatibility: native
+display_result: "Compatible"
+link: https://docs.paloaltonetworks.com/globalprotect/5-2/globalprotect-app-user-guide/globalprotect-app-for-windows/download-and-install-the-globalprotect-app-for-windows
+---
diff --git a/src/content/applications/VeraCrypt.md b/src/content/applications/VeraCrypt.md
@@ -0,0 +1,7 @@
+---
+name: "VeraCrypt"
+categories: ['data-prot']
+compatibility: native
+display_result: "Compatible"
+link: https://www.veracrypt.fr/code/VeraCrypt/
+---
diff --git a/src/content/applications/WireGuard.md b/src/content/applications/WireGuard.md
@@ -0,0 +1,7 @@
+---
+name: "WireGuard"
+categories: ['vpn']
+compatibility: native
+display_result: "Compatible"
+link: https://www.wireguard.com/
+---
diff --git a/src/content/applications/WithSecureElements.md b/src/content/applications/WithSecureElements.md
@@ -0,0 +1,7 @@
+---
+name: "WithSecure Elements"
+categories: ['endpoint-sec']
+compatibility: native
+display_result: "Compatible"
+link: https://www.withsecure.com/en/home
+---
diff --git a/src/content/applications/iBoss.md b/src/content/applications/iBoss.md
@@ -0,0 +1,7 @@
+---
+name: "iBoss"
+categories: ['data-prot']
+compatibility: native
+display_result: "Compatible"
+link: https://www.iboss.com/
+---
diff --git a/src/lib/applications.js b/src/lib/applications.js
@@ -43,20 +43,22 @@ form.addEventListener("submit", (e) => {
     e.preventDefault();
     pageLoading(true);
 
-    var captchaVerificationToken = grecaptcha.getResponse();
-    if (captchaVerificationToken.length == 0) {
-        showSuccessAlert(successAlertId, false);
-        showErrorAlert(errorAlertId, errorAlertInnerElementId, true, ErrorMessages.MISSING_CAPTCHA_ERROR);
-        setTimeout(() => {
-            showErrorAlert(errorAlertId, errorAlertInnerElementId, false, "");
-        }, 3000);
-    } else {
+    // var captchaVerificationToken = grecaptcha.getResponse();
+    // if (captchaVerificationToken.length == 0) {
+    //     showSuccessAlert(successAlertId, false);
+    //     showErrorAlert(errorAlertId, errorAlertInnerElementId, true, ErrorMessages.MISSING_CAPTCHA_ERROR);
+    //     setTimeout(() => {
+    //         showErrorAlert(errorAlertId, errorAlertInnerElementId, false, "");
+    //     }, 3000);
+    // } else 
+    // {
         var data = new FormData(form)
         fetch(`${import.meta.env.PUBLIC_API_HOST}${import.meta.env.PUBLIC_APPLICATION_API_ENDPOINT}`, {
             method: "POST",
             body: JSON.stringify({
                 "name": data.get("name"),
-                "token": captchaVerificationToken,
+                // "token": captchaVerificationToken,
+                "token": "",
                 "publisher": data.get("publisher"),
                 "requestType": data.get("report"),
                 "appCategories": data.get("categories") ?? "",
@@ -91,7 +93,7 @@ form.addEventListener("submit", (e) => {
                 showErrorAlert(errorAlertId, errorAlertInnerElementId, false, '');
             }, 3000);
         })
-    };
+    // };
 });
 
 //########################################  Loader  ########################################//

diff --git a/src/lib/games.js b/src/lib/games.js
@@ -14,20 +14,21 @@ form.addEventListener("submit", (e) => {
     e.preventDefault();
     pageLoading(true);
 
-    var captchaVerificationToken = grecaptcha.getResponse();
-    if (captchaVerificationToken.length == 0) {
-        showSuccessAlert(successAlertId, false);
-        showErrorAlert(errorAlertId, errorAlertInnerElementId, true, ErrorMessages.MISSING_CAPTCHA_ERROR);
-        setTimeout(() => {
-            showErrorAlert(errorAlertId, errorAlertInnerElementId, false, '');
-        }, 3000);
-    } else {
+    // var captchaVerificationToken = grecaptcha.getResponse();
+    // if (captchaVerificationToken.length == 0) {
+    //     showSuccessAlert(successAlertId, false);
+    //     showErrorAlert(errorAlertId, errorAlertInnerElementId, true, ErrorMessages.MISSING_CAPTCHA_ERROR);
+    //     setTimeout(() => {
+    //         showErrorAlert(errorAlertId, errorAlertInnerElementId, false, '');
+    //     }, 3000);
+    // } else {
         var data = new FormData(form);
         fetch(`${import.meta.env.PUBLIC_API_HOST}${import.meta.env.PUBLIC_GAME_API_ENDPOINT}`, {
             method: "POST",
             body: JSON.stringify({
                 "name": data.get("name"),
-                "token": captchaVerificationToken,  
+                // "token": captchaVerificationToken,
+                "token": "",
                 "publisher": data.get("publisher"),
                 "categories": data.get("categories") ?? "",
                 "compatibility": data.get("compatibility") ?? "",
@@ -65,7 +66,7 @@ form.addEventListener("submit", (e) => {
                 showErrorAlert(errorAlertId, errorAlertInnerElementId, false, '');
             }, 3000);
         })
-    }
+    // }
 });
 
 //########################################  Loader  ########################################//

@@ -11,7 +11,6 @@ export function getStaticPaths() {
 }
 
 const locale = updateLanguage(Astro.url);
-const recaptcha_url = `https://www.google.com/recaptcha/api.js?hl=${locale}`;
 ---
 
 <BaseLayout
@@ -131,14 +130,10 @@ const recaptcha_url = `https://www.google.com/recaptcha/api.js?hl=${locale}`;
             <label class="block text-font-color text-lg mb-1" for="icon_url">{t('application_form.icon.description')}</label>
             <input class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline" type="text" name="icon_url" id="icon_url" placeholder={t('application_form.icon.instruction')} />
         </div>
-        <div class="mb-12">
-            <div class="g-recaptcha" data-sitekey=`${import.meta.env.PUBLIC_CAPTCHA_WEB_SITE_KEY}`></div>
-        </div>
         <div class="mb-12">
             <input type="submit" value={t('application_form.submit_button')} class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm w-full sm:w-auto px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"></input>
         </div>
     </form>
 </div>
 </BaseLayout>
-<script define:vars={{recaptcha_url}} src={recaptcha_url} async defer></script>
 <script src="../../../lib/applications.js"></script>  
@@ -11,7 +11,6 @@ export function getStaticPaths() {
 }
 
 const locale = updateLanguage(Astro.url);
-const recaptcha_url = `https://www.google.com/recaptcha/api.js?hl=${locale}`;
 ---
 
 <BaseLayout
@@ -134,15 +133,11 @@ const recaptcha_url = `https://www.google.com/recaptcha/api.js?hl=${locale}`;
       <label class="block text-font-color text-lg mb-1" for="gamertag">{t('game_form.your_name_gamertag')}</label>
       <input class="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline" type="text" name="gamertag" id="gamertag" />
     </div>
-    <div class="mb-12">
-      <div class="g-recaptcha" data-sitekey=`${import.meta.env.PUBLIC_CAPTCHA_WEB_SITE_KEY}`></div>
-    </div>
     <div class="mb-12">
       <input type="submit" value={t('game_form.submit_button')}  class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm w-full sm:w-auto px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"></input>
     </div>
   </form>
 </div>
 </BaseLayout>
 
-<script define:vars={{recaptcha_url}} src={recaptcha_url} async defer></script>
-<script src="../../../lib/games.js"></script>
+<script src="../../../lib/games.js"></script>
@@ -15,7 +15,9 @@ Contributions for apps can be made directly to <a href="#how-to-contribute-via-g
 
 Click the button 'App request form' and fill out the form with your App request. You can use this for requesting a new app to be tested and added, to tell us where we have something wrong for an app, or to submit your own new app data. We recommend you contribute via this form and not via the Github unless you have some technical experience. Scroll down to see more details on the defined schema and category definitions.
 
-<a class="border-white border-2 px-4 py-2 rounded-xl hover:bg-white hover:text-black no-underline" href="/en/contributing/applications">App request form</a>
+<!-- <a class="border-white border-2 px-4 py-2 rounded-xl hover:bg-white hover:text-black no-underline" href="/en/contributing/applications">App request form</a> -->
+
+<a class="border-white border-2 px-4 py-2 rounded-xl hover:bg-white hover:text-black no-underline" href="https://forms.office.com/r/JZ1ywk2FaJ">App request form</a>
 
 ### How to contribute via GitHub (apps)
 
@@ -87,7 +89,9 @@ Contributions can be made directly to <a href="#how-to-contribute-via-github-gam
 
 Click the button 'Game request form' and fill out the below form with your game test details. We recommend you contribute via this form and not via the Github unless you have some technical experience. Scroll down to see more details on the defined schema and category definitions. 
 
-<a class="border-white border-2 px-4 py-2 rounded-xl hover:bg-white hover:text-black no-underline" href="/en/contributing/games">Game request form</a>
+<!-- <a class="border-white border-2 px-4 py-2 rounded-xl hover:bg-white hover:text-black no-underline" href="/en/contributing/games">Game request form</a> -->
+
+<a class="border-white border-2 px-4 py-2 rounded-xl hover:bg-white hover:text-black no-underline" href="https://forms.office.com/pages/responsepage.aspx?id=v4j5cvGGr0GRqy180BHbR54qTg-u1FRHnQ3KYgdSD51UMDM4TFYzS1RUSUlHMjVRVkVUR0w5RlhJMC4u">Game request form</a>
 
 ### How to contribute via GitHub (games)