Merge pull request #120 from hasbel/proxy

fix(binding-http): correctly use security proxy
eclipse-thingweb · Jul 3, 2019 · a890adc · a890adc
2 parents 579508c + 777df23
commit a890adc
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/binding-http/src/http-client.ts b/packages/binding-http/src/http-client.ts
@@ -42,7 +42,7 @@ export default class HttpClient implements ProtocolClient {
 
     // config proxy by client side (not from TD)
     if (config!==null && config.proxy && config.proxy.href) {
-      this.proxyOptions = this.uriToOptions(config.proxy.href);
+      this.proxyOptions = this.uriToOptions(config.proxy.href, true);
 
       if (config.proxy.scheme === "basic") {
         if (!config.proxy.hasOwnProperty("username") || !config.proxy.hasOwnProperty("password")) console.warn(`HttpClient client configured for basic proxy auth, but no username/password given`);
@@ -286,7 +286,7 @@ export default class HttpClient implements ProtocolClient {
         console.info(`HttpClient overriding client-side proxy with security proxy '${security.proxy}`);
       }
 
-      this.proxyOptions = this.uriToOptions(security.proxy);
+      this.proxyOptions = this.uriToOptions(security.proxy, true);
 
       // TODO support for different credentials at proxy and server (e.g., credentials.username vs credentials.proxy.username)
       if (security.scheme == "basic") {
@@ -308,12 +308,12 @@ export default class HttpClient implements ProtocolClient {
     return true;
   }
 
-  private uriToOptions(uri: string): https.RequestOptions {
+  private uriToOptions(uri: string, ignoreProxy=false): https.RequestOptions {
     let requestUri = url.parse(uri);
     let options: https.RequestOptions = {};
     options.agent = this.agent;
 
-    if (this.proxyOptions != null) {
+    if (this.proxyOptions != null && ignoreProxy === false) {
       options.hostname = this.proxyOptions.hostname;
       options.port = this.proxyOptions.port;
       options.path = uri;