winrm - ensure callers PATH for kinit is set (#77401)

* winrm - ensure callers PATH for kinit is set

* Fix unit test expectations

* Fix type annotation
pull/77410/head
Jordan Borean 3 years ago committed by GitHub
parent 353511a900
commit 60b4200bc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- winrm - Ensure ``kinit`` is run with the same ``PATH`` env var as the Ansible process

@ -8,6 +8,7 @@ __metaclass__ = type
import fcntl import fcntl
import os import os
import shlex import shlex
import typing as t
from abc import abstractmethod from abc import abstractmethod
from functools import wraps from functools import wraps
@ -48,7 +49,7 @@ class ConnectionBase(AnsiblePlugin):
# When running over this connection type, prefer modules written in a certain language # When running over this connection type, prefer modules written in a certain language
# as discovered by the specified file extension. An empty string as the # as discovered by the specified file extension. An empty string as the
# language means any language. # language means any language.
module_implementation_preferences = ('',) # type: tuple[str, ...] module_implementation_preferences = ('',) # type: t.Iterable[str]
allow_executable = True allow_executable = True
# the following control whether or not the connection supports the # the following control whether or not the connection supports the

@ -320,7 +320,7 @@ class Connection(ConnectionBase):
display.vvvvv("creating Kerberos CC at %s" % self._kerb_ccache.name) display.vvvvv("creating Kerberos CC at %s" % self._kerb_ccache.name)
krb5ccname = "FILE:%s" % self._kerb_ccache.name krb5ccname = "FILE:%s" % self._kerb_ccache.name
os.environ["KRB5CCNAME"] = krb5ccname os.environ["KRB5CCNAME"] = krb5ccname
krb5env = dict(KRB5CCNAME=krb5ccname) krb5env = dict(PATH=os.environ["PATH"], KRB5CCNAME=krb5ccname)
# Add any explicit environment vars into the krb5env block # Add any explicit environment vars into the krb5env block
kinit_env_vars = self.get_option('kinit_env_vars') kinit_env_vars = self.get_option('kinit_env_vars')

@ -6,6 +6,8 @@
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import os
import pytest import pytest
from io import StringIO from io import StringIO
@ -255,8 +257,9 @@ class TestWinRMKerbAuth(object):
assert len(mock_calls) == 1 assert len(mock_calls) == 1
assert mock_calls[0][1] == expected assert mock_calls[0][1] == expected
actual_env = mock_calls[0][2]['env'] actual_env = mock_calls[0][2]['env']
assert list(actual_env.keys()) == ['KRB5CCNAME'] assert sorted(list(actual_env.keys())) == ['KRB5CCNAME', 'PATH']
assert actual_env['KRB5CCNAME'].startswith("FILE:/") assert actual_env['KRB5CCNAME'].startswith("FILE:/")
assert actual_env['PATH'] == os.environ['PATH']
@pytest.mark.parametrize('options, expected', [ @pytest.mark.parametrize('options, expected', [
[{"_extras": {}}, [{"_extras": {}},
@ -287,8 +290,9 @@ class TestWinRMKerbAuth(object):
mock_calls = mock_pexpect.mock_calls mock_calls = mock_pexpect.mock_calls
assert mock_calls[0][1] == expected assert mock_calls[0][1] == expected
actual_env = mock_calls[0][2]['env'] actual_env = mock_calls[0][2]['env']
assert list(actual_env.keys()) == ['KRB5CCNAME'] assert sorted(list(actual_env.keys())) == ['KRB5CCNAME', 'PATH']
assert actual_env['KRB5CCNAME'].startswith("FILE:/") assert actual_env['KRB5CCNAME'].startswith("FILE:/")
assert actual_env['PATH'] == os.environ['PATH']
assert mock_calls[0][2]['echo'] is False assert mock_calls[0][2]['echo'] is False
assert mock_calls[1][0] == "().expect" assert mock_calls[1][0] == "().expect"
assert mock_calls[1][1] == (".*:",) assert mock_calls[1][1] == (".*:",)

Loading…
Cancel
Save