Add networking.hosts and .hostFiles from nixos #939

ibizaman · 2024-04-22T22:32:30Z

This code was taken nearly verbatim from
https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/config/networking.nix

The few changes were related to making the default /etc/hosts match the Apple's stock one. This implied no 127.0.0.2 and forcing the IPV6 ::1 entry.

willemml · 2024-05-05T19:01:52Z

Possible duplicate of #807? (my PR is older and doesn't have tests though, so maybe this should be preferred)

ibizaman · 2024-05-07T00:36:17Z

Sorry @willemml I missed your PR. I didn’t intend to duplicate work.

secana · 2024-08-19T06:14:55Z

This PR seems fine but is blocked as a review is required. How can we help to get it merged?

niklasravnsborg · 2024-08-30T19:30:49Z

Oh this would be awesome :)

Enzime

Can you rebase this PR?

modules/networking/default.nix

tests/networking-hosts.nix

ibizaman · 2024-09-03T22:51:38Z

@Enzime rebasing is done. I tried to do the hash thing but I think I got it wrong.

I did cp /etc/hosts hosts, edited the file to remove the modifications I made, then sha256sum hosts and that's the hash I used. I suppose the hash is wrong though? Could someone provide me with the hash of a stock /etc/hosts file?

emilazy · 2024-09-03T23:00:59Z

It looks right to me:

emily@yuyuko ~> cat /etc/hosts
##
# Host Database
#
# localhost is used to configure the loopback interface
# when the system is booting.  Do not change this entry.
##
127.0.0.1	localhost
255.255.255.255	broadcasthost
::1             localhost
emily@yuyuko ~> shasum -a 256 /etc/hosts
c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da  /etc/hosts

emilazy · 2024-09-03T23:01:30Z

However the file in doc/ seems to be missing the trailing newline.

ibizaman · 2024-09-04T02:50:57Z

@emilazy good catch! Indeed:

Without the newline:

$ sha256sum doc/known-files/c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da
1b6fb3e08d41ae31b6bfe1f66fecf3ef53e302047993f6235570bc9391f291bb  doc/known-files/c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da

With:

$ sha256sum doc/known-files/c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da
c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da  doc/known-files/c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da

Enzime · 2024-09-04T03:16:31Z

Looks like the tests are broken now

ibizaman · 2024-09-04T04:39:17Z

@Enzime indeed 😞 I have two questions related to the two failures I see.

How can I fix the /etc/hosts file exists issue? Does the error now come from me including a wrong /etc/hosts file? How can I print the /etc/hosts file from CI?

I looked and looked at the test output and can’t see the error printed out. How can I run the tests locally if I use flakes? I tried a few command line incantations but I can’t seem to make it right.

Enzime · 2024-11-07T02:00:47Z

The ability to run the tests through a flake interface will be added in #1140, until that's merged you can run your test locally with nix-build release.nix -A tests.networking-hosts

I've accessed the GitHub runner through tmate (I suspect only maintainers have access but I'm not sure, it's the last step in the install-against-stable and install-against-unstable jobs that runs if the job failed) and extracted the /etc/hosts file:

$ cat /etc/hosts
##
# Host Database
#
# localhost is used to configure the loopback interface
# when the system is booting.  Do not change this entry.
##
127.0.0.1	localhost
255.255.255.255	broadcasthost
::1             localhost
192.168.64.25 Mac-1730942908330.local Mac-1730942908330
192.168.64.25 Mac-1730942908330.local Mac-1730942908330
$ shasum -a 256 /etc/hosts
31ce667128143b67ac1e7c3b64fda0891d4ff011259c48e6c9bdbd704bc29118  /etc/hosts

I suspect that every GitHub Mac will have a different /etc/hosts so you'll most likely need to update these lines to generate a hash of /etc/hosts and set environment.etc.hosts.knownSha256Sums = [ ... ] like is already done with nix.conf:

nix-darwin/.github/workflows/test.yml

Lines 143 to 146 in 98e7dba

    
                     nixConfHash=$(shasum -a 256 /etc/nix/nix.conf | cut -d ' ' -f 1) 
        
                     /usr/bin/sed -i.bak \ 
        
                       "s/# nix.package = pkgs.nix;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ];/" \ 
        
                       flake.nix

Enzime · 2024-11-07T02:01:16Z

Also if you could rebase this PR that would be great, let us know if you're still interested in working on this PR

emilazy · 2024-11-07T02:40:02Z

Probably simplest to just move the config files out of the way rather than hashing them.

Enzime · 2024-11-07T02:43:31Z

In the case of nix.conf I chose to hash it because of access-tokens and the changes get reflected immediately when I last tested but that should be fine for /etc/hosts

Teebor-Choka · 2024-11-27T08:35:16Z

I'd love this functionality, any ETA on finalizing this PR and merging it, please?

Enzime · 2024-11-27T08:43:02Z

There hasn't been @ibizaman in 3 weeks so if you're interested in picking up the work, feel free to take the changes in this PR and rebase them on top of master as well as adding the changes mentioned in #939 (comment)

Teebor-Choka · 2024-11-27T09:35:23Z

There hasn't been @ibizaman in 3 weeks so if you're interested in picking up the work, feel free to take the changes in this PR and rebase them on top of master as well as adding the changes mentioned in #939 (comment)

I'm afraid I'm not at the skill level of debugging and developing nix components at this point, just a happy user.

ibizaman · 2024-11-27T16:09:08Z

Sorry about the hiatus. I’ll pick this up this week. But of course I don’t mind if someone beats me to it 😛

ibizaman · 2024-12-04T07:40:01Z

Well it seems I did a bad job rebasing 😅 more rebasing incoming.

.github/workflows/test.yml

ibizaman · 2024-12-04T09:49:34Z

I'm not sure where the issue comes from. I tried to reproduce locally but I don't have more log output. Any idea?

tests/networking-hosts.nix

Enzime · 2024-12-04T14:39:21Z

tests/networking-hosts.nix

+      cat $file
+      echo "'$(grep '127.0.0.1' $file | head -n1)'"


Suggested change

cat $file

echo "'$(grep '127.0.0.1' $file | head -n1)'"

Should be unnecessary with set -v, not sure if it'll output the value that file gets set to or if you need to use set -x instead

Enzime · 2024-12-04T21:34:23Z

tests/networking-hosts.nix

+      echo "'$(grep '127.0.0.1' $file | head -n1)'"
+      exit 1
+    fi
+    if [[ ! $(grep '127.0.0.1' $file | tail -n1) =~ my.super.host$ ]]; then


Suggested change

if [[ ! $(grep '127.0.0.1' $file | tail -n1) =~ my.super.host$ ]]; then

grep '127.0.0.1' $file | tail -n1 | grep 'my.super.host$'

set -e should be enabled so if you can construct these as a single chain of commands then if statements shouldn't necessary

I verified and indeed if I meddle with the second grep, like replacing host with hst, the test fails.

Enzime

Can you squash all the commits into one commit with a commit message like:

networking: add `hosts` option for managing `/etc/hosts`

Enzime · 2024-12-05T22:42:48Z

tests/networking-hosts.nix

+    if ! grep '127.0.0.1' $file | head -n1 | grep localhost$; then
+      exit 1
+    fi


Suggested change

if ! grep '127.0.0.1' $file | head -n1 | grep localhost$; then

exit 1

fi

grep '127.0.0.1' $file | head -n1 | grep localhost$

The if !; then exit isn't necessary

Enzime · 2024-12-05T22:44:41Z

modules/networking/default.nix

+
+    environment.etc.hosts = {
+      knownSha256Hashes = [
+        "c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da"


Can you add a comment explaining where you got this file from, like the macOS version you're running

Enzime · 2024-12-05T22:46:13Z

.github/workflows/test.yml

+        etcHostsHash=$(shasum -a 256 /etc/hosts | cut -d ' ' -f 1)
+        /usr/bin/sed -i.bak \
+          "s/# programs.fish.enable = true;/nix.settings.access-tokens = [ \"github.com=\${{ secrets.GITHUB_TOKEN }}\" ]; environment.etc.\"nix\/nix.conf\".knownSha256Hashes = [ \"$nixConfHash\" ]; environment.etc.hosts.knownSha256Hashes = [ \"$etcHostsHash\" ];/" \


Looks like these commands should be indented more

Samasaur1 · 2024-12-20T22:25:43Z

The comment in the default /etc/hosts file

# localhost is used to configure the loopback interface
# when the system is booting.  Do not change this entry.

does make me a little apprehensive about symlinking this into place instead of copying it.

Teebor-Choka · 2025-01-15T02:16:41Z

Almost there!

ibizaman mentioned this pull request Aug 16, 2024

Option to configure /etc/hosts file #1035

Open

Enzime requested changes Sep 3, 2024

View reviewed changes

modules/networking/default.nix Outdated Show resolved Hide resolved

tests/networking-hosts.nix Outdated Show resolved Hide resolved

ibizaman force-pushed the networking_hosts branch from 851b145 to 274963a Compare September 3, 2024 22:44

ibizaman force-pushed the networking_hosts branch from 2f5b93f to fbc45cf Compare December 4, 2024 07:35

ibizaman force-pushed the networking_hosts branch from fbc45cf to 00274c8 Compare December 4, 2024 07:48

ibizaman added 4 commits December 4, 2024 08:50

add networking.hosts and .hostFiles from nixos

c2fa6da

switch to knownSha256Hashes

7125163

add more tests

1189bcd

add missing newline

e764318

Enzime requested changes Dec 4, 2024

View reviewed changes

.github/workflows/test.yml Outdated Show resolved Hide resolved

ibizaman force-pushed the networking_hosts branch from 00274c8 to a65c078 Compare December 4, 2024 07:58

generate hash for tests

3161f9b

ibizaman force-pushed the networking_hosts branch from a65c078 to 3161f9b Compare December 4, 2024 08:27

Enzime reviewed Dec 4, 2024

View reviewed changes

tests/networking-hosts.nix Show resolved Hide resolved

fix test

8955dc6

ibizaman requested a review from Enzime December 4, 2024 12:32

Enzime requested changes Dec 4, 2024

View reviewed changes

refactor tests

66a580c

Enzime requested changes Dec 5, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add networking.hosts and .hostFiles from nixos #939

Add networking.hosts and .hostFiles from nixos #939

ibizaman commented Apr 22, 2024 •

edited

Loading

willemml commented May 5, 2024 •

edited

Loading

ibizaman commented May 7, 2024

secana commented Aug 19, 2024

niklasravnsborg commented Aug 30, 2024

Enzime left a comment

ibizaman commented Sep 3, 2024 •

edited

Loading

emilazy commented Sep 3, 2024

emilazy commented Sep 3, 2024

ibizaman commented Sep 4, 2024

Enzime commented Sep 4, 2024

ibizaman commented Sep 4, 2024 •

edited

Loading

Enzime commented Nov 7, 2024

Enzime commented Nov 7, 2024

emilazy commented Nov 7, 2024

Enzime commented Nov 7, 2024

Teebor-Choka commented Nov 27, 2024

Enzime commented Nov 27, 2024

Teebor-Choka commented Nov 27, 2024

ibizaman commented Nov 27, 2024

ibizaman commented Dec 4, 2024

ibizaman commented Dec 4, 2024

Enzime Dec 4, 2024

Enzime Dec 4, 2024

ibizaman Dec 5, 2024

Enzime left a comment

Enzime Dec 5, 2024

Enzime Dec 5, 2024

Enzime Dec 5, 2024

Samasaur1 commented Dec 20, 2024

Teebor-Choka commented Jan 15, 2025

	if [[ ! $(grep '127.0.0.1' $file \| tail -n1) =~ my.super.host$ ]]; then
	grep '127.0.0.1' $file \| tail -n1 \| grep 'my.super.host$'

Add networking.hosts and .hostFiles from nixos #939

Are you sure you want to change the base?

Add networking.hosts and .hostFiles from nixos #939

Conversation

ibizaman commented Apr 22, 2024 • edited Loading

willemml commented May 5, 2024 • edited Loading

ibizaman commented May 7, 2024

secana commented Aug 19, 2024

niklasravnsborg commented Aug 30, 2024

Enzime left a comment

Choose a reason for hiding this comment

ibizaman commented Sep 3, 2024 • edited Loading

emilazy commented Sep 3, 2024

emilazy commented Sep 3, 2024

ibizaman commented Sep 4, 2024

Enzime commented Sep 4, 2024

ibizaman commented Sep 4, 2024 • edited Loading

Enzime commented Nov 7, 2024

Enzime commented Nov 7, 2024

emilazy commented Nov 7, 2024

Enzime commented Nov 7, 2024

Teebor-Choka commented Nov 27, 2024

Enzime commented Nov 27, 2024

Teebor-Choka commented Nov 27, 2024

ibizaman commented Nov 27, 2024

ibizaman commented Dec 4, 2024

ibizaman commented Dec 4, 2024

Enzime Dec 4, 2024

Choose a reason for hiding this comment

Enzime Dec 4, 2024

Choose a reason for hiding this comment

ibizaman Dec 5, 2024

Choose a reason for hiding this comment

Enzime left a comment

Choose a reason for hiding this comment

Enzime Dec 5, 2024

Choose a reason for hiding this comment

Enzime Dec 5, 2024

Choose a reason for hiding this comment

Enzime Dec 5, 2024

Choose a reason for hiding this comment

Samasaur1 commented Dec 20, 2024

Teebor-Choka commented Jan 15, 2025

ibizaman commented Apr 22, 2024 •

edited

Loading

willemml commented May 5, 2024 •

edited

Loading

ibizaman commented Sep 3, 2024 •

edited

Loading

ibizaman commented Sep 4, 2024 •

edited

Loading