Skip to content

fix(dns): detect disabled IPv6 support in DNS pinning - #44475

Merged
Altahrim merged 1 commit into
masterfrom
fix/disabled-ipv6
Mar 26, 2024
Merged

fix(dns): detect disabled IPv6 support in DNS pinning#44475
Altahrim merged 1 commit into
masterfrom
fix/disabled-ipv6

Conversation

@Altahrim

@AltahrimAltahrim commented Mar 26, 2024•
edited
Loading

Copy link
Copy Markdown
Collaborator

Summary

If IPv6 isn't supported (PHP compiled with --disable-ipv6 flag), don't try to resolve AAAA records

Checklist

@AltahrimAltahrim added bug 2. developing Work in progress php Pull requests that update Php code labels Mar 26, 2024
@AltahrimAltahrim self-assigned this Mar 26, 2024
@AltahrimAltahrim added 2. developing Work in progress 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 26, 2024
@Altahrim
Altahrim requested review from a team, ArtificialOwl, kesselb, nfebe and sorbaugh and removed request for a teamMarch 26, 2024 10:46
@AltahrimAltahrim added this to the Nextcloud 29 milestone Mar 26, 2024
@kesselb

kesselb commented Mar 26, 2024

Copy link
Copy Markdown
Contributor

Thank you 👍

Looks good to me. We may want to use the error suppress operator, like https://github.com/symfony/symfony/blob/78c6ceb5cd0560346b6765849f142c1c451fd1a8/src/Symfony/Component/HttpFoundation/IpUtils.php#L127

@Altahrim
Altahrim marked this pull request as ready for review March 26, 2024 10:51
@AltahrimAltahrim removed the 2. developing Work in progress label Mar 26, 2024
@Altahrim

Altahrim commented Mar 26, 2024

Copy link
Copy Markdown
CollaboratorAuthor

Actually, we could reuse the whole line…
socket is probably loaded in most installation and I think this test should be faster

@Altahrim
fix(dns): detect disabled IPv6 support in DNS pinning
7e4be1f
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
@Altahrim
Altahrim requested a review from kesselbMarch 26, 2024 11:05
@AltahrimAltahrim mentioned this pull request Mar 26, 2024
Merged
@Altahrim
Altahrim requested a review from come-ncMarch 26, 2024 16:03
@Altahrim
Altahrim enabled auto-merge March 26, 2024 16:03
come-nc
come-nc approved these changes Mar 26, 2024
View reviewed changes

@come-nccome-nc left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤷

@Altahrim
Altahrim merged commit f8d1487 into masterMar 26, 2024
@Altahrim
Altahrim deleted the fix/disabled-ipv6 branch March 26, 2024 17:14
@AltahrimAltahrim removed the 3. to review Waiting for reviews label Mar 26, 2024
@lkraavlkraav mentioned this pull request Jun 24, 2026
Open
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@come-nccome-nccome-nc approved these changes
@ArtificialOwlArtificialOwlAwaiting requested review from ArtificialOwlArtificialOwl is a code owner automatically assigned from nextcloud/server-backend
@nfebenfebeAwaiting requested review from nfebenfebe is a code owner automatically assigned from nextcloud/server-backend
@sorbaughsorbaughAwaiting requested review from sorbaughsorbaugh is a code owner automatically assigned from nextcloud/server-backend
@kesselbkesselbAwaiting requested review from kesselb

Assignees

@AltahrimAltahrim

Labels

bugphpPull requests that update Php code

Projects

None yet

Milestone

Nextcloud 29

Development

Successfully merging this pull request may close these issues.

[Bug]: RuntimeException: Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".

3 participants

@Altahrim@kesselb@come-nc