Skip to content

Do not convert empty strings in TXT records to bool #226

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

Merged
jstasiak merged 6 commits into from
Mar 7, 2020
Merged

Do not convert empty strings in TXT records to bool #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6dd19b9
Do not convert empty strings in TXT records to bool
mtdcr Feb 10, 2020
5c25884
Adjust weird tests to match new behavior
mtdcr Feb 19, 2020
e716183
ServiceInfo: Do not interpret received values; use None if a property…
mtdcr Feb 28, 2020
d9777ec
ServiceInfo: When encoding values, use either raw bytes or UTF-8
mtdcr Feb 28, 2020
0312a2d
Adjust tests again to match new behavior
mtdcr Feb 28, 2020
4cde41f
Correct a type hint
jstasiak Mar 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 8 additions & 21 deletions zeroconf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,20 +1655,12 @@ def _set_properties(self, properties: Union[bytes, Dict]) -> None:
if isinstance(key, str):
key = key.encode('utf-8')

if value is None:
suffix = b''
elif isinstance(value, str):
suffix = value.encode('utf-8')
elif isinstance(value, bytes):
suffix = value
elif isinstance(value, int):
if value:
suffix = b'true'
else:
suffix = b'false'
else:
suffix = b''
list_.append(b'='.join((key, suffix)))
record = key
if value is not None:
if not isinstance(value, bytes):
value = str(value).encode('utf-8')
record += b'=' + value
list_.append(record)
for item in list_:
result = b''.join((result, int2byte(len(item)), item))
self.text = result
Expand All @@ -1691,16 +1683,11 @@ def _set_text(self, text: bytes) -> None:
for s in strs:
parts = s.split(b'=', 1)
try:
key, value = parts # type: Tuple[bytes, Union[bool, bytes]]
key, value = parts # type: Tuple[bytes, Optional[bytes]]
except ValueError:
# No equals sign at all
key = s
value = False
else:
if value == b'true':
value = True
elif value == b'false' or not value:
value = False
value = None

# Only update non-existent properties
if key and result.get(key) is None:
Expand Down
10 changes: 5 additions & 5 deletions zeroconf/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,19 +985,19 @@ def update_service(self, zeroconf, type, name):
# get service info without answer cache
info = zeroconf_browser.get_service_info(type_, registration_name)
assert info is not None
assert info.properties[b'prop_none'] is False
assert info.properties[b'prop_none'] is None
assert info.properties[b'prop_string'] == properties['prop_string']
assert info.properties[b'prop_float'] is False
assert info.properties[b'prop_float'] == b'1.0'
assert info.properties[b'prop_blank'] == properties['prop_blank']
assert info.properties[b'prop_true'] is True
assert info.properties[b'prop_false'] is False
assert info.properties[b'prop_true'] == b'1'
assert info.properties[b'prop_false'] == b'0'
assert info.addresses == addresses[:1] # no V6 by default
all_addresses = info.addresses_by_version(r.IPVersion.All)
assert all_addresses == addresses, all_addresses

info = zeroconf_browser.get_service_info(subtype, registration_name)
assert info is not None
assert info.properties[b'prop_none'] is False
assert info.properties[b'prop_none'] is None

# test TXT record update
sublistener = MySubListener()
Expand Down