procd: make mDNS TXT record parsing more solid #15331
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
core packages
|
Clean results here. Tested on v23.05.3. Before you merge, could you also consider another commit to tackle pr 10715 - that's been waiting for years and is a really nice cosmetic fix in this code block also. Edit: hang on... something isn't right |
|
@systemcrash mh? tell me Also can you provide the combo you are using if it's ok to give? |
|
Sorry, false alarm. All is well. zero length entries are filtered out :D |
Ansuel
added a commit
to Ansuel/openwrt
that referenced
this pull request
Apr 29, 2024
mDNS broadcast can't accept empty TXT record and would fail
registration.
Current procd_add_mdns_service checks only if the first passed arg is
empty but don't make any verification on the other args permittins
insertion of empty values in TXT record.
Example:
procd_add_mdns "blah" \
"tcp" "50" \
"1" \
"" \
"3"
Produce:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "", "3" ] } }
The middle empty TXT record should never be included as it's empty.
This can happen with scripts that make fragile parsing and include
variables even if they are empty.
Prevent this and make the TXT record more solid by checking every
provided TXT record and include only the non-empty ones.
The fixed JSON is the following:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "3" ] } }
Fixes: b0d9dcf ("procd: update to latest git HEAD")
Reported-by: Paul Donald <newtwen@gmail.com>
Link: openwrt#15331
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Ansuel
force-pushed
the
improve-mdns-parsing
branch
2 times, most recently
from
8832c49
to
864346e
Compare
Ansuel
added a commit
to Ansuel/openwrt
that referenced
this pull request
Apr 29, 2024
mDNS broadcast can't accept empty TXT record and would fail
registration.
Current procd_add_mdns_service checks only if the first passed arg is
empty but don't make any verification on the other args permittins
insertion of empty values in TXT record.
Example:
procd_add_mdns "blah" \
"tcp" "50" \
"1" \
"" \
"3"
Produce:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "", "3" ] } }
The middle empty TXT record should never be included as it's empty.
This can happen with scripts that make fragile parsing and include
variables even if they are empty.
Prevent this and make the TXT record more solid by checking every
provided TXT record and include only the non-empty ones.
The fixed JSON is the following:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "3" ] } }
Fixes: b0d9dcf ("procd: update to latest git HEAD")
Reported-by: Paul Donald <newtwen@gmail.com>
Link: openwrt#15331
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Ansuel
force-pushed
the
improve-mdns-parsing
branch
from
864346e
to
9fbc81f
Compare
Ansuel
added a commit
to Ansuel/openwrt
that referenced
this pull request
Apr 29, 2024
mDNS broadcast can't accept empty TXT record and would fail
registration.
Current procd_add_mdns_service checks only if the first passed arg is
empty but don't make any verification on the other args permittins
insertion of empty values in TXT record.
Example:
procd_add_mdns "blah" \
"tcp" "50" \
"1" \
"" \
"3"
Produce:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "", "3" ] } }
The middle empty TXT record should never be included as it's empty.
This can happen with scripts that make fragile parsing and include
variables even if they are empty.
Prevent this and make the TXT record more solid by checking every
provided TXT record and include only the non-empty ones.
The fixed JSON is the following:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "3" ] } }
Fixes: b0d9dcf ("procd: update to latest git HEAD")
Reported-by: Paul Donald <newtwen@gmail.com>
Link: openwrt#15331
Link: openwrt#15331
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Ansuel
force-pushed
the
improve-mdns-parsing
branch
2 times, most recently
from
1bc03b5
to
864346e
Compare
mDNS broadcast can't accept empty TXT record and would fail
registration.
Current procd_add_mdns_service checks only if the first passed arg is
empty but don't make any verification on the other args permittins
insertion of empty values in TXT record.
Example:
procd_add_mdns "blah" \
"tcp" "50" \
"1" \
"" \
"3"
Produce:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "", "3" ] } }
The middle empty TXT record should never be included as it's empty.
This can happen with scripts that make fragile parsing and include
variables even if they are empty.
Prevent this and make the TXT record more solid by checking every
provided TXT record and include only the non-empty ones.
The fixed JSON is the following:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "3" ] } }
Fixes: b0d9dcf ("procd: update to latest git HEAD")
Reported-by: Paul Donald <newtwen@gmail.com>
Link: openwrt#15331
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Ansuel
force-pushed
the
improve-mdns-parsing
branch
from
864346e
to
4b04304
Compare
openwrt-bot
pushed a commit
that referenced
this pull request
Apr 29, 2024
mDNS broadcast can't accept empty TXT record and would fail
registration.
Current procd_add_mdns_service checks only if the first passed arg is
empty but don't make any verification on the other args permittins
insertion of empty values in TXT record.
Example:
procd_add_mdns "blah" \
"tcp" "50" \
"1" \
"" \
"3"
Produce:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "", "3" ] } }
The middle empty TXT record should never be included as it's empty.
This can happen with scripts that make fragile parsing and include
variables even if they are empty.
Prevent this and make the TXT record more solid by checking every
provided TXT record and include only the non-empty ones.
The fixed JSON is the following:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "3" ] } }
Fixes: b0d9dcf ("procd: update to latest git HEAD")
Reported-by: Paul Donald <newtwen@gmail.com>
Link: #15331
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 4b04304)
openwrt-bot
pushed a commit
that referenced
this pull request
Apr 29, 2024
mDNS broadcast can't accept empty TXT record and would fail
registration.
Current procd_add_mdns_service checks only if the first passed arg is
empty but don't make any verification on the other args permittins
insertion of empty values in TXT record.
Example:
procd_add_mdns "blah" \
"tcp" "50" \
"1" \
"" \
"3"
Produce:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "", "3" ] } }
The middle empty TXT record should never be included as it's empty.
This can happen with scripts that make fragile parsing and include
variables even if they are empty.
Prevent this and make the TXT record more solid by checking every
provided TXT record and include only the non-empty ones.
The fixed JSON is the following:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "3" ] } }
Fixes: b0d9dcf ("procd: update to latest git HEAD")
Reported-by: Paul Donald <newtwen@gmail.com>
Link: #15331
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 4b04304)
|
Also backported to 23.05 and 22.03 :D |
pprindeville
reviewed
May 1, 2024
| [ -z "$txt" ] && continue | ||
| txt_count=$((txt_count+1)) | ||
| [ $txt_count -eq 1 ] && json_add_array txt | ||
| json_add_string "" "$txt" |
There was a problem hiding this comment.
sigh:
There was a problem hiding this comment.
@pprindeville can you better explain?
|
After the fact, but... LGTM |
Vladdrako
pushed a commit
to Vladdrako/openwrt
that referenced
this pull request
May 2, 2024
mDNS broadcast can't accept empty TXT record and would fail
registration.
Current procd_add_mdns_service checks only if the first passed arg is
empty but don't make any verification on the other args permittins
insertion of empty values in TXT record.
Example:
procd_add_mdns "blah" \
"tcp" "50" \
"1" \
"" \
"3"
Produce:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "", "3" ] } }
The middle empty TXT record should never be included as it's empty.
This can happen with scripts that make fragile parsing and include
variables even if they are empty.
Prevent this and make the TXT record more solid by checking every
provided TXT record and include only the non-empty ones.
The fixed JSON is the following:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "3" ] } }
Fixes: b0d9dcf ("procd: update to latest git HEAD")
Reported-by: Paul Donald <newtwen@gmail.com>
Link: openwrt#15331
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
@pprindeville sorry for not tagging :( i looked like a straight bug and a very safe fix |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
mDNS broadcast can't accept empty TXT record and would fail registration.
Current procd_add_mdns_service checks only if the first passed arg is empty but don't make any verification on the other args permittins insertion of empty values in TXT record.
Example:
Produce:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "", "3" ] } }The middle empty TXT record should never be included as it's empty.
This can happen with scripts that make fragile parsing and include variables even if they are empty.
Prevent this and make the TXT record more solid by checking every provided TXT record and include only the non-empty ones.
The fixed JSON is the following:
{ "blah_50": { "service": "_blah._tcp.local", "port": 50, "txt": [ "1", "3" ] } }Fixes: b0d9dcf ("procd: update to latest git HEAD")
Reported-by: Paul Donald newtwen@gmail.com