Merge pull request #301 from snyk/fix/artifactory-systemcheck

fix: artifactory systmecheck endpoint
snyk · Dec 30, 2020 · 936bfa3 · 936bfa3
2 parents f34c1fe + 8bb8524
commit 936bfa3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/client-templates/artifactory/.env.sample b/client-templates/artifactory/.env.sample
@@ -21,3 +21,4 @@ RES_BODY_URL_SUB=http://<yourdomain.artifactory.com>/artifactory
 
 # Artifactory validation url, checked by broker client systemcheck endpoint
 BROKER_CLIENT_VALIDATION_URL=https://$ARTIFACTORY_URL/api/system/ping
+BROKER_CLIENT_VALIDATION_JSON_DISABLED=true
diff --git a/lib/client/index.js b/lib/client/index.js
@@ -49,6 +49,7 @@ module.exports = ({ port = null, config = {}, filters = {} }) => {
       config.brokerClientValidationMethod || 'GET';
     const brokerClientValidationTimeoutMs =
       config.brokerClientValidationTimeoutMs || 5000;
+    const isJsonResponse = !config.brokerClientValidationJsonDisabled;
 
     const data = {
       brokerClientValidationUrl: logger.sanitise(
@@ -79,7 +80,7 @@ module.exports = ({ port = null, config = {}, filters = {} }) => {
         headers: validationRequestHeaders,
         method: brokerClientValidationMethod,
         timeout: brokerClientValidationTimeoutMs,
-        json: true,
+        json: isJsonResponse,
         agentOptions: {
           ca: config.caCert, // Optional CA cert
         },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,4 @@ RES_BODY_URL_SUB=http://<yourdomain.artifactory.com>/artifactory

		# Artifactory validation url, checked by broker client systemcheck endpoint
		BROKER_CLIENT_VALIDATION_URL=https://$ARTIFACTORY_URL/api/system/ping
		BROKER_CLIENT_VALIDATION_JSON_DISABLED=true