kallithea Changeset - 12fce5e499d5

Changeset - 12fce5e499d5

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-09-29 19:16:00
marcin@python-works.com

obfuscate password in logs for engine connection string

2 files changed with 11 insertions and 2 deletions:

rhodecode/lib/utils2.py

rhodecode/model/__init__.py

0 comments (0 inline, 0 general)

rhodecode/lib/utils2.py

➞

Show inline comments

@@ @@ -488,12 +488,20 @@ def fix_PATH(os_=None): @@
     Get current active python path, and append it to PATH variable to fix issues
     of subprocess calls and different python versions
     """
     import sys
     if os_ is None:
         import os
     else:
         os = os_
     cur_path = os.path.split(sys.executable)[0]
     if not os.environ['PATH'].startswith(cur_path):
         os.environ['PATH'] = '%s:%s' % (cur_path, os.environ['PATH'])
 def obfuscate_url_pw(engine):
     from sqlalchemy.engine import url
     url = url.make_url(engine)
     if url.password:
         url.password = 'XXXXX'
     return str(url)
@@ \ No newline at end of file @@

rhodecode/model/__init__.py

➞

Show inline comments

@@ @@ -34,38 +34,39 @@ @@
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 from rhodecode.model import meta
 from rhodecode.lib.utils2 import safe_str
+from rhodecode.lib.utils2 import safe_str, obfuscate_url_pw
 log = logging.getLogger(__name__)
 def init_model(engine):
     """
     Initializes db session, bind the engine with the metadata,
     Call this before using any of the tables or classes in the model,
     preferably once in application start
     :param engine: engine to bind to
     """
     log.info("initializing db for %s" % engine)
     engine_str = obfuscate_url_pw(str(engine.url))
     log.info("initializing db for %s" % engine_str)
     meta.Base.metadata.bind = engine
 class BaseModel(object):
     """
     Base Model for all RhodeCode models, it adds sql alchemy session
     into instance of model
     :param sa: If passed it reuses this session instead of creating a new one
     """
     cls = None  # override in child class

0 comments (0 inline, 0 general)