ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Set accept_hostkey to False by default in the git module and fail

Browse source 
early if the key is unknown
This commit is contained in:
James Tanner 2014-01-11 11:02:01 -05:00
parent 8665b0638a
commit eeee1e1c5a
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/module_utils/known_hosts.py
View file

@ -2,16 +2,16 @@ def add_git_host_key(module, url, accept_hostkey=True):
""" idempotently add a git url hostkey """ """ idempotently add a git url hostkey """
if accept_hostkey: fqdn = get_fqdn(module.params['repo'])
fqdn = get_fqdn(module.params['repo']) if fqdn:
known_host = check_hostkey(module, fqdn)
if fqdn: if not known_host and accept_hostkey:
known_host = check_hostkey(module, fqdn) rc, out, err = add_host_key(module, fqdn)
if not known_host: if rc != 0:
rc, out, err = add_host_key(module, fqdn) module.fail_json(msg="failed to add %s hostkey: %s" % (fqdn, out + err))
if rc != 0: else:
module.fail_json(msg="failed to add %s hostkey: %s" % (fqdn, out + err)) module.fail_json(msg="%s has an unknown hostkey. Set accept_hostkey to True or manually add the hostkey prior to running the git module" % fqdn)
def get_fqdn(repo_url): def get_fqdn(repo_url):

8
library/source_control/git
View file

@ -45,7 +45,7 @@ options:
branch name, or a tag name. branch name, or a tag name.
accept_hostkey: accept_hostkey:
required: false required: false
default: true default: false
version_added: "1.5" version_added: "1.5"
description: description:
- Add the hostkey for the repo url if not already added. - Add the hostkey for the repo url if not already added.
@ -359,7 +359,7 @@ def main():
force=dict(default='yes', type='bool'), force=dict(default='yes', type='bool'),
depth=dict(default=None, type='int'), depth=dict(default=None, type='int'),
update=dict(default='yes', type='bool'), update=dict(default='yes', type='bool'),
accept_hostkey=dict(default='yes', type='bool'), accept_hostkey=dict(default='no', type='bool'),
executable=dict(default=None), executable=dict(default=None),
bare=dict(default='no', type='bool'), bare=dict(default='no', type='bool'),
), ),
@ -378,8 +378,8 @@ def main():
git_path = module.params['executable'] or module.get_bin_path('git', True) git_path = module.params['executable'] or module.get_bin_path('git', True)
# add the git repo's hostkey # add the git repo's hostkey
if module.params['accept_hostkey']: #if module.params['accept_hostkey']:
add_git_host_key(module, repo, accept_hostkey=True) add_git_host_key(module, repo, accept_hostkey=module.params['accept_hostkey'])
if bare: if bare:
gitconfig = os.path.join(dest, 'config') gitconfig = os.path.join(dest, 'config')