Skip to content

luci-mod-network: Add flag for address_as_local #7957

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
Merged
systemcrash merged 1 commit into from
Nov 18, 2025
Merged

luci-mod-network: Add flag for address_as_local #7957

systemcrash merged 1 commit into from
Nov 18, 2025

Conversation

@markozajc
Copy link
Contributor

@markozajc markozajc commented Sep 24, 2025

See openwrt/openwrt#18610 for more information. These pull requests should be merged together.

  • This PR is not from my main or master branch 💩, but a separate branch ✅

  • Each commit has a valid ✒️ Signed-off-by: <[email protected]> row (via git commit --signoff)

  • Each commit and PR title has a valid 📝 <package name>: title first line subject for packages

  • Incremented 🆙 any PKG_VERSION in the Makefile

  • Tested on: ramips/mt7621, OpenWrt 24.10.2, Firefox ✅

  • ( Preferred ) Mention: @ the original code author for feedback

  • ( Preferred ) Screenshot or mp4 of changes:
    image

  • ( Optional ) Closes: e.g. openwrt/luci#issue-number

  • ( Optional ) Depends on: e.g. dnsmasq: prevent upstream resolution of addresses openwrt#18610

  • Description: Adds a toggle for the behaviour described in dnsmasq: prevent upstream resolution of addresses openwrt#18610. The toggle defaults to off (old behaviour) to avoid breaking existing workflows.

markozajc added a commit to markozajc/openwrt that referenced this pull request Sep 24, 2025
@markozajc
dnsmasq: prevent upstream resolution of addresses
7b5811a 
`list address` entries in /etc/config/dhcp are sometimes (I'm not sure
about the exact conditions) passed to upstream resolver, bypassing local
resolution. Adding them (minus the IP) to --local prevents this. In the
configuration, this means that

    # /etc/config/dhcp
    list address '/hello.com/world.com/1.2.3.4'
    list address '/foo.com/bar.com/4.3.2.1'

which previously translated into

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    address=/foo.com/bar.com/4.3.2.1

now becomes

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    local=/hello.com/world.com/
    address=/foo.com/bar.com/4.3.2.1
    local=/foo.com/bar.com/

This behaviour is controlled by the `address_as_local` boolean option, which
defaults to false (old behaviour). openwrt/luci#7957 adds support for this flag
to LuCI.

A workaround for a small list of domains is to add them to `option local`,
but this is very tedious to do for every `list address` entry and dnsmasq
limits this option to 1024 characters.

Signed-off-by: Marko Zajc <[email protected]>
markozajc added a commit to markozajc/openwrt that referenced this pull request Sep 24, 2025
@markozajc
dnsmasq: prevent upstream resolution of addresses
7fa06b6 
`list address` entries in /etc/config/dhcp are sometimes (I'm not sure
about the exact conditions) passed to upstream resolver, bypassing local
resolution. Adding them (minus the IP) to --local prevents this. In the
configuration, this means that

    # /etc/config/dhcp
    list address '/hello.com/world.com/1.2.3.4'
    list address '/foo.com/bar.com/4.3.2.1'

which previously translated into

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    address=/foo.com/bar.com/4.3.2.1

now becomes

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    local=/hello.com/world.com/
    address=/foo.com/bar.com/4.3.2.1
    local=/foo.com/bar.com/

This behaviour is controlled by the `address_as_local` boolean option, which
defaults to false (old behaviour). openwrt/luci#7957 adds support for this flag
to LuCI.

A workaround for a small list of domains is to add them to `option local`,
but this is very tedious to do for every `list address` entry and dnsmasq
limits this option to 1024 characters.

Signed-off-by: Marko Zajc <[email protected]>
@markozajc markozajc mentioned this pull request Sep 24, 2025
Merged
@systemcrash systemcrash added the depends on PR in other repo PR depends on PR in sister repo e.g. openwrt/packags label Sep 29, 2025
@efahl
Copy link
Contributor

efahl commented Oct 10, 2025

Tested on 24.10.3, LGTM for main and 24.10 backport...

$ cat /etc/config/dhcp
...
config dnsmasq
...
        option address_as_local '1'

markozajc added a commit to markozajc/openwrt that referenced this pull request Oct 22, 2025
@markozajc
dnsmasq: prevent upstream resolution of addresses
0d4a970 
`list address` entries in /etc/config/dhcp are sometimes (I'm not sure
about the exact conditions) passed to upstream resolver, bypassing local
resolution. Adding them (minus the IP) to --local prevents this. In the
configuration, this means that

    # /etc/config/dhcp
    list address '/hello.com/world.com/1.2.3.4'
    list address '/foo.com/bar.com/4.3.2.1'

which previously translated into

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    address=/foo.com/bar.com/4.3.2.1

now becomes

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    local=/hello.com/world.com/
    address=/foo.com/bar.com/4.3.2.1
    local=/foo.com/bar.com/

This behaviour is controlled by the `address_as_local` boolean option, which
defaults to false (old behaviour). openwrt/luci#7957 adds support for this flag
to LuCI.

A workaround for a small list of domains is to add them to `option local`,
but this is very tedious to do for every `list address` entry and dnsmasq
limits this option to 1024 characters.

Signed-off-by: Marko Zajc <[email protected]>
@markozajc markozajc force-pushed the patch/dnsmasq-local-resolve branch from deab95e to 24503fe Compare October 22, 2025 21:40
@systemcrash
Copy link
Contributor

systemcrash commented Oct 22, 2025

Can you add the commit message from the openwrt repo here also? Then it's more understandable why this setting should exist - its rationale if you will.

@markozajc
Copy link
Contributor Author

markozajc commented Oct 23, 2025

Sure,

`list address` entries in /etc/config/dhcp are sometimes (I'm not sure
about the exact conditions) passed to upstream resolver, bypassing local
resolution. Adding them (minus the IP) to --local prevents this. In the
configuration, this means that

    # /etc/config/dhcp
    list address '/hello.com/world.com/1.2.3.4'
    list address '/foo.com/bar.com/4.3.2.1'

which previously translated into

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    address=/foo.com/bar.com/4.3.2.1

now becomes

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    local=/hello.com/world.com/
    address=/foo.com/bar.com/4.3.2.1
    local=/foo.com/bar.com/

This behaviour is controlled by the `address_as_local` boolean option, which
defaults to false (old behaviour). https://github.com/openwrt/luci/pull/7957 adds support for this flag
to LuCI.

A workaround for a small list of domains is to add them to `option local`,
but this is very tedious to do for every `list address` entry and dnsmasq
limits this option to 1024 characters.

@systemcrash
Copy link
Contributor

systemcrash commented Oct 23, 2025

… to the commit

@markozajc
Copy link
Contributor Author

markozajc commented Oct 23, 2025

Ah, right.

@markozajc markozajc force-pushed the patch/dnsmasq-local-resolve branch from 24503fe to 59688c6 Compare October 23, 2025 16:09
openwrt-bot pushed a commit to openwrt/openwrt that referenced this pull request Nov 7, 2025
@markozajc @robimarko
dnsmasq: prevent upstream resolution of addresses
38753de 
`list address` entries in /etc/config/dhcp are sometimes (I'm not sure
about the exact conditions) passed to upstream resolver, bypassing local
resolution. Adding them (minus the IP) to --local prevents this. In the
configuration, this means that

    # /etc/config/dhcp
    list address '/hello.com/world.com/1.2.3.4'
    list address '/foo.com/bar.com/4.3.2.1'

which previously translated into

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    address=/foo.com/bar.com/4.3.2.1

now becomes

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    local=/hello.com/world.com/
    address=/foo.com/bar.com/4.3.2.1
    local=/foo.com/bar.com/

This behaviour is controlled by the `address_as_local` boolean option, which
defaults to false (old behaviour). openwrt/luci#7957 adds support for this flag
to LuCI.

A workaround for a small list of domains is to add them to `option local`,
but this is very tedious to do for every `list address` entry and dnsmasq
limits this option to 1024 characters.

Signed-off-by: Marko Zajc <[email protected]>
Link: #18610
Signed-off-by: Robert Marko <[email protected]>
@markozajc markozajc marked this pull request as ready for review November 7, 2025 14:31
Vladdrako pushed a commit to Vladdrako/openwrt that referenced this pull request Nov 8, 2025
@markozajc @Vladdrako
dnsmasq: prevent upstream resolution of addresses
d21510c 
`list address` entries in /etc/config/dhcp are sometimes (I'm not sure
about the exact conditions) passed to upstream resolver, bypassing local
resolution. Adding them (minus the IP) to --local prevents this. In the
configuration, this means that

    # /etc/config/dhcp
    list address '/hello.com/world.com/1.2.3.4'
    list address '/foo.com/bar.com/4.3.2.1'

which previously translated into

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    address=/foo.com/bar.com/4.3.2.1

now becomes

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    local=/hello.com/world.com/
    address=/foo.com/bar.com/4.3.2.1
    local=/foo.com/bar.com/

This behaviour is controlled by the `address_as_local` boolean option, which
defaults to false (old behaviour). openwrt/luci#7957 adds support for this flag
to LuCI.

A workaround for a small list of domains is to add them to `option local`,
but this is very tedious to do for every `list address` entry and dnsmasq
limits this option to 1024 characters.

Signed-off-by: Marko Zajc <[email protected]>
Link: openwrt#18610
Signed-off-by: Robert Marko <[email protected]>
Lienol pushed a commit to Lienol/openwrt that referenced this pull request Nov 8, 2025
@markozajc @Lienol
dnsmasq: prevent upstream resolution of addresses
400d301 
`list address` entries in /etc/config/dhcp are sometimes (I'm not sure
about the exact conditions) passed to upstream resolver, bypassing local
resolution. Adding them (minus the IP) to --local prevents this. In the
configuration, this means that

    # /etc/config/dhcp
    list address '/hello.com/world.com/1.2.3.4'
    list address '/foo.com/bar.com/4.3.2.1'

which previously translated into

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    address=/foo.com/bar.com/4.3.2.1

now becomes

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    local=/hello.com/world.com/
    address=/foo.com/bar.com/4.3.2.1
    local=/foo.com/bar.com/

This behaviour is controlled by the `address_as_local` boolean option, which
defaults to false (old behaviour). openwrt/luci#7957 adds support for this flag
to LuCI.

A workaround for a small list of domains is to add them to `option local`,
but this is very tedious to do for every `list address` entry and dnsmasq
limits this option to 1024 characters.

Signed-off-by: Marko Zajc <[email protected]>
Link: openwrt/openwrt#18610
Signed-off-by: Robert Marko <[email protected]>
@MkQtS
Copy link
Contributor

MkQtS commented Nov 11, 2025

@systemcrash this can be merged now

@markozajc
luci-mod-network: Add flag for address_as_local
6fdd6e3 
'Addresses' option entries in the general tab of DHCP and DNS settings are
sometimes (I'm not sure about the exact conditions) passed to upstream resolver,
bypassing local resolution.

A workaround for a small list of domains is to add them to 'Resolve these
locally' option, but this is very tedious to do, and dnsmasq limits it to 1024
characters.

openwrt/openwrt#18610 adds behaviour to add addresses to the local resolution
list automatically, and this commit adds a flag to LuCI to control that.

Signed-off-by: Marko Zajc <[email protected]>
@markozajc markozajc force-pushed the patch/dnsmasq-local-resolve branch from 59688c6 to 6fdd6e3 Compare November 11, 2025 10:21
danpawlik pushed a commit to danpawlik/openwrt that referenced this pull request Nov 13, 2025
@markozajc @danpawlik
dnsmasq: prevent upstream resolution of addresses
05c82f1 
`list address` entries in /etc/config/dhcp are sometimes (I'm not sure
about the exact conditions) passed to upstream resolver, bypassing local
resolution. Adding them (minus the IP) to --local prevents this. In the
configuration, this means that

    # /etc/config/dhcp
    list address '/hello.com/world.com/1.2.3.4'
    list address '/foo.com/bar.com/4.3.2.1'

which previously translated into

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    address=/foo.com/bar.com/4.3.2.1

now becomes

    # /var/etc/dnsmasq.conf.*
    address=/hello.com/world.com/1.2.3.4
    local=/hello.com/world.com/
    address=/foo.com/bar.com/4.3.2.1
    local=/foo.com/bar.com/

This behaviour is controlled by the `address_as_local` boolean option, which
defaults to false (old behaviour). openwrt/luci#7957 adds support for this flag
to LuCI.

A workaround for a small list of domains is to add them to `option local`,
but this is very tedious to do for every `list address` entry and dnsmasq
limits this option to 1024 characters.

Signed-off-by: Marko Zajc <[email protected]>
Link: openwrt#18610
Signed-off-by: Robert Marko <[email protected]>
@systemcrash systemcrash merged commit 2a2f2d4 into openwrt:master Nov 18, 2025
6 checks passed
@systemcrash
Copy link
Contributor

systemcrash commented Nov 18, 2025

Merged. Thanks for your patience @markozajc !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@systemcrash systemcrash systemcrash left review comments

Assignees

No one assigned

Labels

depends on PR in other repo PR depends on PR in sister repo e.g. openwrt/packags

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@markozajc @efahl @systemcrash @MkQtS