Skip to content

knot-resolver: add luaPackages.psl #305154

Merged
vcunat merged 2 commits intoNixOS:masterfrom
SuperSandro2000:kresd-psl
May 25, 2024
Merged

knot-resolver: add luaPackages.psl #305154
vcunat merged 2 commits intoNixOS:masterfrom
SuperSandro2000:kresd-psl

Conversation

@SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Apr 18, 2024

Description of changes

This basically adds support for policy.slice_randomize_psl()

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. label Apr 18, 2024
@SuperSandro2000 SuperSandro2000 requested a review from vcunat April 18, 2024 22:12
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 18, 2024
vcunat
vcunat previously requested changes Apr 19, 2024
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

It won't build for me

$ nix build -f. luajitPackages.psl

       > Error: Could not find header file for PSL
       >   No file libpsl.h in /nix/store/3gc64ag4cav0y40pk5zd75cs58q25a9l-wrap-lua-hook/include
       >   No file libpsl.h in /nix/store/h523pxxyypw7bk977kirhdzjjv52gzcs-luajit-2.1.1693350652/include
       >   No file libpsl.h in /nix/store/xfc3kaxwvya9i0589b8gn9cnr2h6ah2p-libpsl-0.21.5-bin/include
       > You may have to install PSL in your system and/or pass PSL_DIR or PSL_INCDIR to the luarocks command.
       > Example: luarocks install psl PSL_DIR=/usr/local

@vcunat
Copy link
Member

vcunat commented Apr 19, 2024

Note: it's been unclear for us whether that randomized approach improves privacy or makes it worse. We haven't implemented support for this in the knot-resolver 6.x configuration model so far, BTW.

@SuperSandro2000
Copy link
Member Author

The other alternative, to send all requests to all servers, would generate more traffic and we use it more to spread the requests somewhat to all servers.

@SuperSandro2000
Copy link
Member Author

SuperSandro2000 commented Apr 19, 2024

I've test this on 23.11 and funnily I think #292260 broke the naive lua approach. pkgconfig file seems correct.

@vcunat
Copy link
Member

vcunat commented Apr 19, 2024

I'm not aware of such an alternative that increases traffic amount.

@vcunat
Copy link
Member

vcunat commented Apr 19, 2024

Now it looks good to me. Though the http module won't work until fixes in PR #303527 (guarded by eval error now).

@SuperSandro2000
Copy link
Member Author

I'm not aware of such an alternative that increases traffic amount.

I might have mixed that up with dnsmasq 😅 I did to many DNS things yesterday

@SuperSandro2000 SuperSandro2000 force-pushed the kresd-psl branch 2 times, most recently from 9adde29 to ab3fd44 Compare April 19, 2024 10:57
@vcunat
Copy link
Member

vcunat commented Apr 20, 2024

You broke this again. luarocksConfig.variables needs to be used, not luarocksConfig.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 3, 2024
@SuperSandro2000
Copy link
Member Author

You broke this again. luarocksConfig.variables needs to be used, not luarocksConfig.

🤦🏼

@SuperSandro2000 SuperSandro2000 removed the 2.status: merge conflict This PR has merge conflicts with the target branch label May 14, 2024
@SuperSandro2000 SuperSandro2000 requested a review from vcunat May 14, 2024 12:42
@SuperSandro2000
Copy link
Member Author

Can we merge this?

@vcunat vcunat dismissed their stale review May 25, 2024 06:46

resolved

@vcunat vcunat merged commit 5330e9d into NixOS:master May 25, 2024
@github-actions
Copy link
Contributor

Successfully created backport PR for release-24.05:

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

Labels

6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants