Add UASHIELD_TARGETS variable that overrides list of UAShield target …

…sites.

.env

@@ -14,5 +14,7 @@ LOG_RESPONSE_ERROR='false'
 
 # UAShield settings.
 UASHIELD_USE_PROXY='true'
+## Override target URLs. Needs to be valid JSON array with URLs.
+#UASHIELD_TARGETS='["https://kremlin.ru", "https://www.sberbank.ru"]'
 UASHIELD_URLS='https://raw.githubusercontent.com/opengs/uashieldtargets/v2/sites.json'
 UASHIELD_PROXIES='https://raw.githubusercontent.com/opengs/uashieldtargets/v2/proxy.json'

README.md

@@ -87,6 +87,8 @@ services:
       LOG_RESPONSE_ERROR: 'false'
       # UAShield settings.
       UASHIELD_USE_PROXY: 'true'
+      ## Override target URLs. Needs to be valid JSON array with URLs.
+      #UASHIELD_TARGETS: '["https://kremlin.ru", "https://www.sberbank.ru"]'
       UASHIELD_URLS: 'https://raw.githubusercontent.com/opengs/uashieldtargets/v2/sites.json'
       UASHIELD_PROXIES: 'https://raw.githubusercontent.com/opengs/uashieldtargets/v2/proxy.json'
 ```

examples/docker-compose.yml

@@ -15,5 +15,7 @@ services:
       LOG_RESPONSE_ERROR: 'false'
       # UAShield settings.
       UASHIELD_USE_PROXY: 'true'
+      ## Override target URLs. Needs to be valid JSON array with URLs.
+      #UASHIELD_TARGETS: '["https://kremlin.ru", "https://www.sberbank.ru"]'
       UASHIELD_URLS: 'https://raw.githubusercontent.com/opengs/uashieldtargets/v2/sites.json'
       UASHIELD_PROXIES: 'https://raw.githubusercontent.com/opengs/uashieldtargets/v2/proxy.json'

src/config.ts

@@ -21,6 +21,21 @@ export function mainConfigValidationSchema() {
     UASHIELD_USE_PROXY: Joi.string().valid('true', 'false').default('true'),
     UASHIELD_URLS: Joi.string().uri().required(),
     UASHIELD_PROXIES: Joi.string().uri().required(),
+    UASHIELD_TARGETS: Joi.string().custom((value, helpers) => {
+      const errorMessage: Joi.LanguageMessages = {
+        custom: 'Needs to be valid JSON string with array of URLs as strings.',
+      };
+      try {
+        // Try to parse json string.
+        const parsed = JSON.parse(value);
+        // If not an array.
+        if (!Array.isArray(parsed)) return helpers.message(errorMessage);
+        return value;
+      } catch (e) {
+        // Catch JSON.parse() errors.
+        return helpers.message(errorMessage);
+      }
+    }),
     LOG_SUMMARY_TABLE: Joi.string().valid('true', 'false').default('true'),
     LOG_CLEAR: Joi.string().valid('true', 'false').default('false'),
     LOG_RESPONSE_SUCCESS: Joi.string().valid('true', 'false').default('false'),
@@ -42,6 +57,7 @@ export function config() {
           urls: process.env.UASHIELD_URLS,
           proxy: process.env.UASHIELD_PROXIES,
         },
+        targets: process.env.UASHIELD_TARGETS ? JSON.parse(process.env.UASHIELD_TARGETS) : [],
         useProxy: process.env.UASHIELD_USE_PROXY === 'true',
         axios: {
           timeout: +process.env.UASHIELD_REQUEST_TIMEOUT,
@@ -76,6 +92,7 @@ export interface UashieldConfigInterface {
     urls: string;
     proxy: string;
   };
+  targets: Array<string>;
   useProxy: boolean;
   axios: AxiosRequestConfig;
 }

src/service/uashield.service.ts

@@ -62,6 +62,13 @@ export class UashieldService {
    */
   @Cron('0 */10 * * * *')
   protected async fetchUrls() {
+    // If custom targets are defined.
+    if (this.config.targets?.length) {
+      this.urls = new Set(this.config.targets);
+      this.logger.debug(`Used ${this.urls.size} URLs from "UASHIELD_TARGETS" variable`);
+      return;
+    }
+
     // Retrieve list of hosts from API.
     const { data: hostsList } = await lastValueFrom(
       this.axios.get<Array<SiteInterface>>(this.config.endpoints.urls, this.config.axios),