Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

avoid loading vars on unspecified basedir (cwd) #42067

Merged
merged 2 commits into from
Jun 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/avoid_cwd_vars.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- '**Security Fix** - avoid loading host/group vars from cwd when not specifying a playbook or playbook base dir'
8 changes: 7 additions & 1 deletion lib/ansible/cli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ def version_info(gitinfo=False):
ansible_versions[counter] = 0
try:
ansible_versions[counter] = int(ansible_versions[counter])
except:
except Exception:
pass
if len(ansible_versions) < 3:
for counter in range(len(ansible_versions), 3):
Expand Down Expand Up @@ -809,6 +809,12 @@ def _play_prereqs(options):
# the code, ensuring a consistent view of global variables
variable_manager = VariableManager(loader=loader, inventory=inventory)

if hasattr(options, 'basedir'):
if options.basedir:
variable_manager.safe_basedir = True
else:
variable_manager.safe_basedir = True

# load vars from cli options
variable_manager.extra_vars = load_extra_vars(loader=loader, options=options)
variable_manager.options_vars = load_options_vars(options, CLI.version_info(gitinfo=False))
Expand Down
7 changes: 6 additions & 1 deletion lib/ansible/vars/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def __init__(self, loader=None, inventory=None):
self._hostvars = None
self._omit_token = '__omit_place_holder__%s' % sha1(os.urandom(64)).hexdigest()
self._options_vars = defaultdict(dict)
self.safe_basedir = False

# bad cache plugin is not fatal error
try:
Expand All @@ -110,6 +111,7 @@ def __getstate__(self):
omit_token=self._omit_token,
options_vars=self._options_vars,
inventory=self._inventory,
safe_basedir=self.safe_basedir,
)
return data

Expand All @@ -123,6 +125,7 @@ def __setstate__(self, data):
self._omit_token = data.get('omit_token', '__omit_place_holder__%s' % sha1(os.urandom(64)).hexdigest())
self._inventory = data.get('inventory', None)
self._options_vars = data.get('options_vars', dict())
self.safe_basedir = data.get('safe_basedir', False)

@property
def extra_vars(self):
Expand Down Expand Up @@ -183,7 +186,9 @@ def get_vars(self, play=None, host=None, task=None, include_hostvars=True, inclu
)

# default for all cases
basedirs = [self._loader.get_basedir()]
basedirs = []
if self.safe_basedir: # avoid adhoc/console loading cwd
basedirs = [self._loader.get_basedir()]

if play:
# first we compile any vars specified in defaults/main.yml
Expand Down