trusty/debian/patches/CVE-2013-6384_mongodb_db2_do_not_print_full_URL_in_logs.patch

   1 Description: mongodb, db2: do not print full URL in logs
   2  The full URL used to connect to MongoDB or DB2 might contains sensitive
   3  information such as username and password, so it's better to not print it at
   4  all. Instead, just print the hosts that are being connected to.
   5 Author: Julien Danjou <julien@danjou.info>
   6 Date: Wed, 30 Oct 2013 14:49:33 +0000 (+0100)
   7 Origin: upstream, https://review.openstack.org/#/c/56396/
   8 X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fceilometer.git;a=commitdiff_plain;h=ef6c659588feff646343fd80ba3d420d9c06404b
   9 Bug-Ubuntu: Bug-Ubuntu: https://launchpad.net/bugs/1244476
  10 Bug-Debian: Bug-Debian: http://bugs.debian.org/730227
  11
  12 diff --git a/ceilometer/storage/impl_db2.py b/ceilometer/storage/impl_db2.py
  13 index b44f424..5a72c1c 100644
  14 --- a/ceilometer/storage/impl_db2.py
  15 +++ b/ceilometer/storage/impl_db2.py
  16 @@ -153,7 +153,8 @@ class ConnectionPool(object):
  17              client = self._pool.get(pool_key)()
  18              if client:
  19                  return client
  20 -        LOG.info('connecting to MongoDB on %s', url)
  21 +        LOG.info(_('Connecting to DB2 on %s'),
  22 +                 connection_options['nodelist'])
  23          client = pymongo.MongoClient(
  24              url,
  25              safe=True)
  26 diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py
  27 index 9ca881c..9640ebe 100644
  28 --- a/ceilometer/storage/impl_mongodb.py
  29 +++ b/ceilometer/storage/impl_mongodb.py
  30 @@ -155,7 +155,8 @@ class ConnectionPool(object):
  31              client = self._pool.get(pool_key)()
  32              if client:
  33                  return client
  34 -        LOG.info('connecting to MongoDB on %s', url)
  35 +        LOG.info(_('Connecting to MongoDB on %s'),
  36 +                 connection_options['nodelist'])
  37          client = pymongo.MongoClient(
  38              url,
  39              safe=True)