respect the NO_PROXY environment variable (#551)

also, use stdlib functions to get the proxy url

fixes #458
closes #551

CHANGELOG.md

@@ -3,9 +3,14 @@
 ## Unreleased
 [Check the diff](https://github.com/elastic/apm-agent-python/compare/v5.0.0...master)
 
+### Security issues
+
+ * This release fixes CVE-2019-7617
+
 ### New Features
 
  * added support for global labels which will be applied to every transaction/error/metric (#549)
+ * added support for `NO_PROXY` environment variable (#458, #551)
 
 ### Bugfixes
 

docs/api.asciidoc

@@ -73,7 +73,7 @@ client.capture_message('Billing process succeeded.')
  * `message`: The message as a string.
  * `param_message`: Alternatively, a parameterized message as a dictionary.
     The dictionary contains two values: `message`, and `params`.
-    This allows the APM server to group messages together that share the same
+    This allows the APM Server to group messages together that share the same
     parameterized message. Example:
 +
 [source,python]

docs/configuration.asciidoc

@@ -111,7 +111,7 @@ The URL must be fully qualified, including protocol (`http` or `https`) and port
 |============
 
 
-The transport class to use when sending events to the APM server.
+The transport class to use when sending events to the APM Server.
 The default `AsyncTransport` uses a background thread to send data.
 If your environment doesn't allow background threads, you can use
 `elasticapm.transport.http.Transport` instead.
@@ -152,16 +152,16 @@ You must use the query bar to filter for a specific environment in versions prio
 | `ELASTIC_APM_SECRET_TOKEN` | `SECRET_TOKEN`  | `None`     | A random string
 |============
 
-This string is used to ensure that only your agents can send data to your APM server.
-Both the agents and the APM server have to be configured with the same secret token.
+This string is used to ensure that only your agents can send data to your APM Server.
+Both the agents and the APM Server have to be configured with the same secret token.
 One example to generate a secure secret token is:
 
 [source,bash]
 ----
 python -c "import uuid; print(str(uuid.uuid4()))"
 ----
 
-WARNING: secret tokens only provide any security if your APM server use TLS.
+WARNING: secret tokens only provide any security if your APM Server use TLS.
 
 [float]
 [[config-service-version]]
@@ -214,7 +214,7 @@ otherwise, the default is `None`.
 |============
 
 A list of exception types to be filtered.
-Exceptions of these types will not be sent to the APM server.
+Exceptions of these types will not be sent to the APM Server.
 
 
 [float]
@@ -228,7 +228,7 @@ Exceptions of these types will not be sent to the APM server.
 |============
 
 A list of regular expressions.
-Transactions that match any of the of the configured patterns will be ignored and not sent to the APM server.
+Transactions that match any of the of the configured patterns will be ignored and not sent to the APM Server.
 
 
 [float]
@@ -243,12 +243,12 @@ Transactions that match any of the of the configured patterns will be ignored an
 
 A timeout for requests to the APM Server.
 The setting has to be provided in *<<config-format-duration, duration format>>*.
-If a request to the APM server takes longer than the configured timeout,
+If a request to the APM Server takes longer than the configured timeout,
 the request is cancelled and the event (exception or transaction) is discarded.
 Set to `None` to disable timeouts.
 
 WARNING: If timeouts are disabled or set to a high value,
-your app could experience memory issues if the APM server times out.
+your app could experience memory issues if the APM Server times out.
 
 
 [float]
@@ -261,7 +261,7 @@ your app could experience memory issues if the APM server times out.
 | `ELASTIC_APM_HOSTNAME`     | `HOSTNAME`    | `socket.gethostname()` | `app-server01.example.com`
 |============
 
-The host name to use when sending error and transaction data to the APM server.
+The host name to use when sending error and transaction data to the APM Server.
 
 [float]
 [[config-auto-log-stacks]]
@@ -407,7 +407,7 @@ filter such data.
 
 Limits the amount of spans that are recorded per transaction.
 This is helpful in cases where a transaction creates a very high amount of spans (e.g. thousands of SQL queries).
-Setting an upper limit will prevent overloading the agent and the APM server with too much work for such edge cases.
+Setting an upper limit will prevent overloading the agent and the APM Server with too much work for such edge cases.
 
 [float]
 [[config-span-frames-min-duration]]
@@ -440,8 +440,8 @@ this setting has to be provided in *<<config-format-duration, duration format>>*
 | `ELASTIC_APM_API_REQUEST_SIZE` | `API_REQUEST_SIZE` | `"724kb"`
 |============
 
-Maximum queue length of the request buffer before sending the request to the APM server.
-A lower value will increase the load on your APM server,
+Maximum queue length of the request buffer before sending the request to the APM Server.
+A lower value will increase the load on your APM Server,
 while a higher value can increase the memory pressure of your app.
 A higher value also impacts the time until data is indexed and searchable in Elasticsearch.
 
@@ -460,8 +460,8 @@ By default, the APM Server limits request payload size to 1 MByte.
 | `ELASTIC_APM_API_REQUEST_TIME` | `API_REQUEST_TIME` | `"10s"`
 |============
 
-Maximum queue time of the request buffer before sending the request to the APM server.
-A lower value will increase the load on your APM server,
+Maximum queue time of the request buffer before sending the request to the APM Server.
+A lower value will increase the load on your APM Server,
 while a higher value can increase the memory pressure of your app.
 A higher value also impacts the time until data is indexed and searchable in Elasticsearch.
 
@@ -552,7 +552,7 @@ The default value varies based on your Python version and implementation, e.g.:
 |============
 
 If your app is in debug mode (e.g. in Django with `settings.DEBUG = True` or in Flask with `app.debug = True`),
-the agent won't send any data to the APM server. You can override it by changing this setting to `True`.
+the agent won't send any data to the APM Server. You can override it by changing this setting to `True`.
 
 
 [float]
@@ -563,7 +563,7 @@ the agent won't send any data to the APM server. You can override it by changing
 | `ELASTIC_APM_DISABLE_SEND`  | `DISABLE_SEND` | `False`
 |============
 
-If set to `True`, the agent won't send any events to the APM server, independent of any debug state.
+If set to `True`, the agent won't send any events to the APM Server, independent of any debug state.
 
 
 [float]
@@ -586,7 +586,7 @@ This disables most of the tracing functionality, but can be useful to debug poss
 | `ELASTIC_APM_VERIFY_SERVER_CERT`  | `VERIFY_SERVER_CERT` | `True`
 |============
 
-By default, the agent verifies the SSL certificate if you use an HTTPS connection to the APM server.
+By default, the agent verifies the SSL certificate if you use an HTTPS connection to the APM Server.
 Verification can be disabled by changing this setting to `False`.
 This setting is ignored when <<config-server-cert,`server_cert`>> is set.
 
@@ -698,6 +698,32 @@ If you want to use the route instead of the view name as the transaction name, y
 
 NOTE: in versions previous to Django 2.2, changing this setting will have no effect.
 
+[float]
+[[config-generic-environment]]
+=== Generic Environment variables
+
+Some environment variables that are not specific to the APM agent can be used to configure the agent.
+
+[float]
+[[config-generic-http-proxy]]
+==== `HTTP_PROXY` and `HTTPS_PROXY`
+
+Using `HTTP_PROXY` and `HTTPS_PROXY`, the agent can be instructed to use a proxy to connect to the APM Server.
+If both are set, `HTTPS_PROXY` takes precedence.
+
+NOTE: The environment variables are case-insensitive.
+
+[float]
+[[config-generic-no-proxy]]
+==== `NO_PROXY`
+
+To instruct the agent to *not* use a proxy, you can use the `NO_PROXY` environment variable.
+You can either set it to a comma-separated list of hosts for which no proxy should be used (e.g. `localhost,example.com`)
+or use `*` to match any host.
+
+This is useful if `HTTP_PROXY` / `HTTPS_PROXY` is set for other reasons than agent / APM Server communication.
+
+
 [float]
 [[config-formats]]
 === Configuration formats

docs/flask.asciidoc

@@ -71,7 +71,7 @@ apm = ElasticAPM(app, service_name='<APP-ID>', secret_token='<SECRET-TOKEN>')
 [[flask-debug-mode]]
 ==== Debug Mode
 
-Please note that errors and transactions will only be sent to the apm server if your app is *not* in
+Please note that errors and transactions will only be sent to the APM Server if your app is *not* in
 http://flask.pocoo.org/docs/0.12/quickstart/#debug-mode[debug mode].
 
 To force the agent to send data while the app is in debug mode,
@@ -192,7 +192,7 @@ def bar():
         app.logger.error( 'I cannot math', exc_info=True)
 ----
 
-NOTE: `exc_info=True` adds the exception info to the data that gets sent to the APM server.
+NOTE: `exc_info=True` adds the exception info to the data that gets sent to the APM Server.
 Without it, only the message is sent.
 
 [float]
@@ -221,7 +221,7 @@ def bar():
 [[flask-celery-tasks]]
 ==== Celery tasks
 
-The Elastic APM agent will automatically send errors and performance data from your Celery tasks to the APM server.
+The Elastic APM agent will automatically send errors and performance data from your Celery tasks to the APM Server.
 
 [float]
 [[flask-performance-metrics]]

elasticapm/transport/http.py

@@ -32,7 +32,6 @@
 
 import hashlib
 import logging
-import os
 import re
 import ssl
 
@@ -50,6 +49,7 @@
 class Transport(HTTPTransportBase):
     def __init__(self, url, **kwargs):
         super(Transport, self).__init__(url, **kwargs)
+        url_parts = compat.urlparse.urlparse(url)
         pool_kwargs = {"cert_reqs": "CERT_REQUIRED", "ca_certs": certifi.where(), "block": True}
         if self._server_cert:
             pool_kwargs.update(
@@ -59,8 +59,9 @@ def __init__(self, url, **kwargs):
         elif not self._verify_server_cert:
             pool_kwargs["cert_reqs"] = ssl.CERT_NONE
             pool_kwargs["assert_hostname"] = False
-        proxy_url = os.environ.get("HTTPS_PROXY", os.environ.get("HTTP_PROXY"))
-        if proxy_url:
+        proxies = compat.getproxies_environment()
+        proxy_url = proxies.get("https", proxies.get("http", None))
+        if proxy_url and not compat.proxy_bypass_environment(url_parts.netloc):
             self.http = urllib3.ProxyManager(proxy_url, **pool_kwargs)
         else:
             self.http = urllib3.PoolManager(**pool_kwargs)

elasticapm/utils/compat.py

@@ -81,6 +81,7 @@ def uwsgi_atexit():
     import Queue as queue  # noqa F401
     import urlparse  # noqa F401
     from urllib2 import HTTPError  # noqa F401
+    from urllib import proxy_bypass_environment, getproxies_environment  # noqa F401
 
     StringIO = BytesIO = StringIO.StringIO
 
@@ -112,6 +113,7 @@ def iterlists(d, **kw):
     import queue  # noqa F401
     from urllib import parse as urlparse  # noqa F401
     from urllib.error import HTTPError  # noqa F401
+    from urllib.request import proxy_bypass_environment, getproxies_environment  # noqa F401
 
     StringIO = io.StringIO
     BytesIO = io.BytesIO

tests/transports/test_urllib3.py

@@ -116,7 +116,7 @@ def test_https_proxy_environment_variable():
 
 
 def test_https_proxy_environment_variable_is_preferred():
-    with mock.patch.dict("os.environ", {"HTTPS_PROXY": "https://example.com", "HTTP_PROXY": "http://example.com"}):
+    with mock.patch.dict("os.environ", {"https_proxy": "https://example.com", "HTTP_PROXY": "http://example.com"}):
         transport = Transport("http://localhost:9999")
         try:
             assert isinstance(transport.http, urllib3.poolmanager.ProxyManager)
@@ -125,6 +125,24 @@ def test_https_proxy_environment_variable_is_preferred():
             transport.close()
 
 
+def test_no_proxy_star():
+    with mock.patch.dict("os.environ", {"HTTPS_PROXY": "https://example.com", "NO_PROXY": "*"}):
+        transport = Transport("http://localhost:9999")
+        try:
+            assert not isinstance(transport.http, urllib3.poolmanager.ProxyManager)
+        finally:
+            transport.close()
+
+
+def test_no_proxy_host():
+    with mock.patch.dict("os.environ", {"HTTPS_PROXY": "https://example.com", "NO_PROXY": "localhost"}):
+        transport = Transport("http://localhost:9999")
+        try:
+            assert not isinstance(transport.http, urllib3.poolmanager.ProxyManager)
+        finally:
+            transport.close()
+
+
 def test_header_encodings():
     """
     Tests that headers are encoded as bytestrings. If they aren't,