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.

Sign up for GitHub

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

Jump to bottom

properly convert inputs to handle bytes/unicode #53072

Merged
merged 2 commits into from
Feb 28, 2019
Merged

properly convert inputs to handle bytes/unicode #53072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b7777b
properly convert inputs to handle bytes/unicode
bcoca Feb 27, 2019
1de74a2
Update changelogs/fragments/nmap_bytes_fix.yml
gundalow Feb 27, 2019
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/nmap_bytes_fix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- convert input into text to ensure valid comparisons in nmap inventory plugin
3 changes: 2 additions & 1 deletion lib/ansible/plugins/inventory/nmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

from ansible import constants as C
from ansible.errors import AnsibleParserError
from ansible.module_utils._text import to_native
from ansible.module_utils._text import to_native, to_text
from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable


Expand Down Expand Up @@ -127,6 +127,7 @@ def parse(self, inventory, loader, path, cache=False):
ip = None
ports = []
for line in stdout.splitlines():
line = to_text(line)
hits = self.find_host.match(line)
if hits:
if host is not None:
Expand Down