Add proxy

.github/workflows/publish_agent_docker.yml

@@ -16,8 +16,8 @@ jobs:
       - name: Login Docker Hub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.A }}
-          password: ${{ secrets.B }}
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -30,7 +30,7 @@ jobs:
           build-args: AGENT_VERSION=1.7.9
           builder: ${{ steps.buildx.outputs.name }}
           push: true
-          tags: drag0nfire19/katalon-agent:1.7.9
+          tags: katalonstudio/agent:1.7.9
 
       # - name: Build and push Docker images
       #   uses: docker/build-push-action@v2

package.json

@@ -38,6 +38,7 @@
     "ip": "^1.1.5",
     "lodash": "^4.17.21",
     "log4js": "^6.9.1",
+    "match-url-wildcard": "0.0.5",
     "moment": "^2.29.4",
     "progress": "^2.0.3",
     "properties": "^1.2.1",
@@ -47,7 +48,6 @@
     "triple-beam": "^1.3.0",
     "url-join": "^4.0.1",
     "uuid": "^8.3.2",
-    "wildcard": "^2.0.1",
     "winston": "^3.8.1",
     "winston-transport": "^4.4.0"
   },

src/core/api/proxy.js

@@ -1,5 +1,5 @@
 const https = require('https');
-const wildcard = require('wildcard');
+const matchUrl = require('match-url-wildcard');
 const config = require('../config');
 const logger = require('../../config/logger');
 
@@ -15,7 +15,7 @@ function getProxy(url) {
   }
   if (proxyExcludedUrls) {
     const excludedUrls = proxyExcludedUrls.split(',');
-    const isExcluded = excludedUrls.some((excludedUrl) => wildcard(excludedUrl, url));
+    const isExcluded = excludedUrls.some((excludedUrl) => matchUrl(url, excludedUrl));
     if (isExcluded) {
       return false;
     }