cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove redundant md5 hashing

Browse source 
(cherry picked from commit d590f10d32)
This commit is contained in:
Brian Coca 2018-10-31 15:34:05 -04:00 committed by Toshio Kuratomi
parent c18eb52ade
commit 71ad7da2f8
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/remove_redundant_md5.yml Normal file
View file

@ -0,0 +1,3 @@
bugfixes:
- remove rendundant path uniquifying in inventory plugins. This removes
use of md5 hashing and fixes inventory plugins when run in FIPS mode.

7
lib/ansible/plugins/inventory/__init__.py
View file

@ -251,7 +251,7 @@ class Cacheable(object):
_cache = {} _cache = {}
def get_cache_key(self, path): def get_cache_key(self, path):
return "{0}_{1}_{2}".format(self.NAME, self._get_cache_prefix(path), self._get_config_identifier(path)) return "{0}_{1}".format(self.NAME, self._get_cache_prefix(path))
def _get_cache_prefix(self, path): def _get_cache_prefix(self, path):
''' create predictable unique prefix for plugin/inventory ''' ''' create predictable unique prefix for plugin/inventory '''
@ -266,11 +266,6 @@ class Cacheable(object):
return 's_'.join([d1[:5], d2[:5]]) return 's_'.join([d1[:5], d2[:5]])
def _get_config_identifier(self, path):
''' create predictable config-specific prefix for plugin/inventory '''
return hashlib.md5(path.encode()).hexdigest()
def clear_cache(self): def clear_cache(self):
self._cache = {} self._cache = {}