Skip to content

Ensure PTR questions asked in uppercase are answered #465

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
bdraco merged 1 commit into from
Jun 6, 2021
Merged

Ensure PTR questions asked in uppercase are answered #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions zeroconf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2967,7 +2967,7 @@ def _answer_service_type_enumeration_query(self, msg: DNSIncoming, out: DNSOutgo

def _answer_ptr_query(self, msg: DNSIncoming, out: DNSOutgoing, question: DNSQuestion) -> None:
"""Answer a PTR query."""
for service in self.registry.get_infos_type(question.name):
for service in self.registry.get_infos_type(question.name.lower()):
out.add_answer(msg, service.dns_pointer())
# Add recommended additional answers according to
# https://tools.ietf.org/html/rfc6763#section-12.1.
Expand Down Expand Up @@ -3014,7 +3014,7 @@ def handle_query(self, msg: DNSIncoming, addr: Optional[str], port: int) -> None

for question in msg.questions:
if question.type == _TYPE_PTR:
if question.name == _SERVICE_TYPE_ENUMERATION_NAME:
if question.name.lower() == _SERVICE_TYPE_ENUMERATION_NAME:
self._answer_service_type_enumeration_query(msg, out)
else:
self._answer_ptr_query(msg, out, question)
Expand Down
31 changes: 31 additions & 0 deletions zeroconf/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,6 +1004,37 @@ def test_name_conflicts(self):
zc.register_service(conflicting_info)
zc.close()

def test_register_and_lookup_type_by_uppercase_name(self):
# instantiate a zeroconf instance
zc = Zeroconf(interfaces=['127.0.0.1'])
type_ = "_mylowertype._tcp.local."
name = "Home"
registration_name = "%s.%s" % (name, type_)

info = ServiceInfo(
type_,
name=registration_name,
server="random123.local.",
addresses=[socket.inet_pton(socket.AF_INET, "1.2.3.4")],
port=80,
properties={"version": "1.0"},
)
zc.register_service(info)
_clear_cache(zc)
info = ServiceInfo(type_, registration_name)
info.load_from_cache(zc)
assert info.addresses == []

out = r.DNSOutgoing(r._FLAGS_QR_QUERY)
out.add_question(r.DNSQuestion(type_.upper(), r._TYPE_PTR, r._CLASS_IN))
zc.send(out)
time.sleep(0.5)
info = ServiceInfo(type_, registration_name)
info.load_from_cache(zc)
assert info.addresses == [socket.inet_pton(socket.AF_INET, "1.2.3.4")]
assert info.properties == {b"version": b"1.0"}
zc.close()


class TestServiceRegistry(unittest.TestCase):
def test_only_register_once(self):
Expand Down