Merge branch 'anubis' into 'main'

anubis : modularisation

See merge request nounous/nixos!100
merge-requests/48/merge
Lyes Saadi 2026-11-11 12:57:05 +01:00
commit c8dac2d45d
4 changed files with 263 additions and 259 deletions

View File

@ -5,86 +5,17 @@
}: }:
let let
formatJSON = pkgs.formats.json { };
formatYAML = pkgs.formats.yaml { };
inherit (lib.crans) fetchFromCrans; inherit (lib.crans) fetchFromCrans;
antiBot = formatYAML.generate "antibot.yaml" [ anubisChallenge = [
{
name = "whitelist-crans";
action = "ALLOW";
remote_addresses = [
"185.230.79.0/22"
"2a0c:700::/32"
"46.105.102.188/32"
"2001:41d0:2:d5bc::/128"
];
}
{
# On refuse les bots qui font souvent de la merde.
# https://github.com/TecharoHQ/anubis/blob/main/data/bots/_deny-pathological.yaml
import = "(data)/bots/_deny-pathological.yaml";
}
{
# allow google-inspection pour indexer les pages
name = "google-inspection-tool";
action = "ALLOW";
user_agent_regex = ".*Google-InspectionTool.*";
}
{
# On autorise les indexers des moteurs de recherche.
# https://github.com/TecharoHQ/anubis/blob/main/data/crawlers/_allow-good.yaml
import = "(data)/crawlers/_allow-good.yaml";
}
{
# On autorise l'accès à favicon, robots.txt, well-known, ...
# https://github.com/TecharoHQ/anubis/blob/main/data/common/keep-internet-working.yaml
import = "(data)/common/keep-internet-working.yaml";
}
{
# On refuse si userAgent = ""
# https://github.com/TecharoHQ/anubis/blob/main/data/common/rfc-violations.yaml
import = "(data)/common/rfc-violations.yaml";
}
{
# On bloque les AI aggressivement (bots/agent, training et user search par IA)
# https://github.com/TecharoHQ/anubis/blob/main/data/meta/ai-block-aggressive.yaml
import = "(data)/meta/ai-block-aggressive.yaml";
}
];
anubisChallenge = formatJSON.generate "anubis_challenge.json" {
"bots" = [
{
import = "${antiBot}";
}
{ {
name = "challenge-other"; name = "challenge-other";
path_regex = "^*"; path_regex = "^*";
action = "CHALLENGE"; action = "CHALLENGE";
} }
]; ];
};
anubisAllowOther = formatJSON.generate "anubis_allow.json" { anubisPerso = [
"bots" = [
{
import = "${antiBot}";
}
{
name = "allow-other";
path_regex = "^*";
action = "ALLOW";
}
];
};
anubisPerso = formatJSON.generate "anubis_perso.json" {
"bots" = [
{
import = "${antiBot}";
}
{ {
name = "allow-public"; name = "allow-public";
path_regex = "^/[a-zA-Z0-9_-]*/public/.*"; path_regex = "^/[a-zA-Z0-9_-]*/public/.*";
@ -105,22 +36,14 @@ let
path_regex = "^/geneau/.*"; path_regex = "^/geneau/.*";
action = "ALLOW"; action = "ALLOW";
} }
{
import = "${antiBot}";
}
{ {
name = "challenge-other"; name = "challenge-other";
path_regex = "^.*"; path_regex = "^.*";
action = "CHALLENGE"; action = "CHALLENGE";
} }
]; ];
};
anubisMirrors = formatJSON.generate "anubis_mirrors.json" { anubisMirrors = [
"bots" = [
{
import = "${antiBot}";
}
{ {
name = "deny-other"; name = "deny-other";
path_regex = ".*cdimage-.*"; path_regex = ".*cdimage-.*";
@ -137,13 +60,8 @@ let
action = "CHALLENGE"; action = "CHALLENGE";
} }
]; ];
};
anubisWiki = formatJSON.generate "anubis_wiki.json" { anubisWiki = [
"bots" = [
{
import = "${antiBot}";
}
{ {
name = "allow-mediawiki-images"; name = "allow-mediawiki-images";
path_regex = "^/w/images/.*"; path_regex = "^/w/images/.*";
@ -160,7 +78,6 @@ let
action = "CHALLENGE"; action = "CHALLENGE";
} }
]; ];
};
installPartySite = pkgs.python3Packages.buildPythonApplication { installPartySite = pkgs.python3Packages.buildPythonApplication {
name = "site-install-party"; name = "site-install-party";
@ -212,12 +129,12 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
"eclat" = { "eclat" = {
anubisConfig = "${anubisMirrors}"; anubisConfig = anubisMirrors;
httpOnly = true; httpOnly = true;
proxyPass = "172.16.10.104"; proxyPass = "172.16.10.104";
}; };
"eclats" = { "eclats" = {
anubisConfig = "${anubisMirrors}"; anubisConfig = anubisMirrors;
proxyPass = "172.16.10.104"; proxyPass = "172.16.10.104";
}; };
"element".proxyPass = "172.16.10.118"; "element".proxyPass = "172.16.10.118";
@ -239,7 +156,7 @@ in
serverAliases = [ "re2o" ]; serverAliases = [ "re2o" ];
}; };
"install-party" = { "install-party" = {
anubisConfig = "${anubisChallenge}"; anubisConfig = anubisChallenge;
serveLocalFiles = "${installPartySite}/site"; serveLocalFiles = "${installPartySite}/site";
serverAliases = [ serverAliases = [
"i-p" "i-p"
@ -248,20 +165,20 @@ in
]; ];
}; };
"lists" = { "lists" = {
anubisConfig = "${anubisChallenge}"; anubisConfig = anubisChallenge;
proxyPass = "172.16.10.110"; proxyPass = "172.16.10.110";
}; };
"mediawiki" = { "mediawiki" = {
anubisConfig = "${anubisWiki}"; anubisConfig = anubisWiki;
proxyPass = "172.16.10.144"; proxyPass = "172.16.10.144";
serverAliases = [ "mediakiwi" ]; serverAliases = [ "mediakiwi" ];
}; };
"mirrors" = { "mirrors" = {
anubisConfig = "${anubisMirrors}"; anubisConfig = anubisMirrors;
proxyPass = "172.16.10.104"; proxyPass = "172.16.10.104";
}; };
"mirror" = { "mirror" = {
anubisConfig = "${anubisMirrors}"; anubisConfig = anubisMirrors;
httpOnly = true; httpOnly = true;
proxyPass = "172.16.10.104"; proxyPass = "172.16.10.104";
}; };
@ -278,7 +195,7 @@ in
]; ];
}; };
"perso" = { "perso" = {
anubisConfig = "${anubisPerso}"; anubisConfig = anubisPerso;
proxyPass = "172.16.10.31"; proxyPass = "172.16.10.31";
serverAliases = [ "clubs" ]; serverAliases = [ "clubs" ];
}; };
@ -302,7 +219,7 @@ in
serverAliases = [ "roundcube" ]; serverAliases = [ "roundcube" ];
}; };
"wiki" = { "wiki" = {
anubisConfig = "${anubisChallenge}"; anubisConfig = anubisChallenge;
proxyPass = "172.16.10.161"; proxyPass = "172.16.10.161";
serverAliases = [ "wikipedia" ]; serverAliases = [ "wikipedia" ];
}; };

View File

@ -0,0 +1,133 @@
{
config,
lib,
pkgs,
...
}:
let
inherit (lib)
types
mkEnableOption
mkIf
mkOption
;
cfg = config.crans.anubis;
in
{
options.crans.anubis = {
enable = mkEnableOption "Configuration d’Anubis du Crans.";
useRedis = mkEnableOption "Utilisation de Redis pour sauvegarder les challenges";
instances = mkOption {
type = types.attrsOf (
types.submodule {
options = {
hostname = mkOption {
type = types.str;
example = "wiki.crans.org";
description = ''
Hostname to redirect to.
'';
};
bind = mkOption {
type = types.str;
example = "/run/anubis/anubis-wiki/socket.sock";
description = ''
Where Anubis should listen
'';
};
bots = mkOption {
type = types.listOf types.attrs;
description = ''
Anubis bot policy.
'';
};
};
}
);
};
};
config = mkIf cfg.enable {
age.secrets.anubis-secret = mkIf cfg.enable {
file = ../../secrets/reverseproxy/anubis-secret.age;
owner = "anubis";
};
services.anubis = {
defaultOptions.group = "nginx";
instances = lib.mapAttrs (name: conf: {
enable = true;
policy = {
settings = {
statusCodes = {
CHALLENGE = 200;
DENY = 403;
};
logging = {
sink = "stdio";
level = "WARN";
};
store =
let
redCfg = config.services.redis.servers.anubis;
in
mkIf cfg.useRedis {
backend = "valkey";
parameters.url = "redis://${redCfg.bind}:${toString redCfg.port}/0";
};
};
extraBots = [
{
name = "whitelist-crans";
action = "ALLOW";
remote_addresses = [
"185.230.79.0/22"
"2a0c:700::/32"
"46.105.102.188/32"
"2001:41d0:2:d5bc::/128"
];
}
{
# https://github.com/TecharoHQ/anubis/blob/main/data/botPolicies.yaml
import = "(data)/meta/default-config.yaml";
}
{
# On refuse si userAgent = ""
# https://github.com/TecharoHQ/anubis/blob/main/data/common/rfc-violations.yaml
import = "(data)/common/rfc-violations.yaml";
}
]
++ conf.bots;
# Inclus via l’import de default-config.yaml. Et on préfére mettre le
# whitelist Crans avant.
useDefaultBotRules = false;
};
settings = {
BIND = conf.bind;
BIND_NETWORK = "unix";
METRIC_BIND = "/run/anubis/anubis-${name}/metrics.sock";
TARGET = " "; # Subrequest authentification.
COOKIE_DOMAIN = conf.hostname;
# XXX: Impossible de mettre en commun les challenges inter-sites ?
COOKIE_PREFIX = "anubis-${conf.hostname}";
REDIRECT_DOMAINS = conf.hostname;
SOCKET_MODE = "0660";
# Secret partagé entre les instances
ED25519_PRIVATE_KEY_HEX_FILE = config.age.secrets.anubis-secret.path;
};
}) cfg.instances;
};
services.redis = {
# Meilleure licence que Redis
package = pkgs.valkey;
servers.anubis = {
enable = cfg.useRedis;
bind = "127.0.0.1";
port = 6379;
databases = 1;
};
};
};
}

View File

@ -3,6 +3,7 @@
{ {
imports = [ imports = [
./acme.nix ./acme.nix
./anubis.nix
./nginx.nix ./nginx.nix
./restic.nix ./restic.nix
./reverseproxy.nix ./reverseproxy.nix

View File

@ -72,19 +72,10 @@ in
}; };
anubisConfig = mkOption { anubisConfig = mkOption {
type = types.nullOr types.str; type = types.nullOr (types.listOf types.attrs);
default = null; default = null;
description = '' description = ''
Chemin du fichier de configuration Configuration pour anubis
'';
example = "/var/www/anubis.conf";
};
anubisOpenGraph = mkOption {
type = types.bool;
default = true;
description = ''
Activer openGraph pour l'indexation et l'embedding
''; '';
}; };
@ -126,13 +117,13 @@ in
}; };
}; };
config = { config = mkIf cfg.enable {
systemd.services = lib.mapAttrs (vhostName: vhostConfig: { systemd.services = lib.mapAttrs (vhostName: vhostConfig: {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
}) cfg.virtualHosts; }) cfg.virtualHosts;
# On fait un certificat commun pour tous les hosts # On fait un certificat commun pour tous les hosts
security.acme.certs."all.crans.all" = mkIf cfg.enable { security.acme.certs."all.crans.all" = {
domain = "*.crans.${mainTld}"; domain = "*.crans.${mainTld}";
dnsProvider = "rfc2136"; dnsProvider = "rfc2136";
# Contient le serveur à contacter avec le protocole # Contient le serveur à contacter avec le protocole
@ -160,45 +151,18 @@ in
}; };
}; };
age.secrets.anubis-secret = mkIf cfg.enable { # On active Anubis
file = ../../secrets/reverseproxy/anubis-secret.age; crans.anubis = {
owner = "anubis";
};
services = mkIf cfg.enable {
anubis = {
defaultOptions.group = "nginx";
instances = lib.mapAttrs (
vhostName: vhostConfig:
let
hostname = mkHostName vhostName mainTld;
in
mkIf (vhostConfig.anubisConfig != null) {
enable = true; enable = true;
settings = { useRedis = true;
BIND = "/run/anubis/anubis-${vhostName}/socket.sock"; instances = lib.mapAttrs (vhostName: vhostConfig: {
BIND_NETWORK = "unix"; hostname = mkHostName vhostName mainTld;
METRICS_BIND = "/run/anubis/anubis-${vhostName}/anubis-${vhostName}-metrics.sock"; bind = "/run/anubis/anubis-${vhostName}/socket.sock";
TARGET = "unix:///run/nginx/nginx-${vhostName}.sock"; bots = vhostConfig.anubisConfig;
COOKIE_DOMAIN = hostname; }) (lib.filterAttrs (_: c: c.anubisConfig != null) cfg.virtualHosts);
# TODO: db pour mettre en commun les token.
# Transitoirement on les sépare
COOKIE_PREFIX = "anubis-${vhostName}";
REDIRECT_DOMAINS = hostname;
SOCKET_MODE = "0660";
# Secret partagé entre les instances
ED25519_PRIVATE_KEY_HEX_FILE = config.age.secrets.anubis-secret.path;
# OpenGraph config
OG_PASSTHROUGH = vhostConfig.anubisOpenGraph;
OG_EXPIRY_TIME = "24h";
OG_CACHE_CONSIDER_HOST = true;
# Policy config
POLICY_FNAME = vhostConfig.anubisConfig;
};
}
) cfg.virtualHosts;
}; };
services = {
logrotate.settings = logrotate.settings =
let let
# https://github.com/NixOS/nixpkgs/blob/nixos-26.05/nixos/modules/services/web-servers/nginx/default.nix # https://github.com/NixOS/nixpkgs/blob/nixos-26.05/nixos/modules/services/web-servers/nginx/default.nix
@ -239,32 +203,6 @@ in
acmeRoot = null; acmeRoot = null;
}; };
# Conf pour l’hôte en entrée
entryExtraConf = {
extraConfig = ''
set_real_ip_from 172.16.0.0/16;
set_real_ip_from fd00::/56;
real_ip_header X-Real-Ip;
'';
}
// sslConf;
# Conf supplémentaire pour le proxy principal
vhostExtraConf =
if vhostConfig.anubisConfig != null then
# Il reçoit les requêtes d’Anubis
{
listen = [
{ addr = "unix:/run/nginx/nginx-${vhostName}.sock"; }
];
extraConfig = ''
set_real_ip_from unix:;
real_ip_header X-Real-IP;
'';
}
else
# Il est en entrée
entryExtraConf;
logHostConf = '' logHostConf = ''
access_log /var/log/nginx/host/${vhostName}/access.log; access_log /var/log/nginx/host/${vhostName}/access.log;
error_log /var/log/nginx/host/${vhostName}/error.log; error_log /var/log/nginx/host/${vhostName}/error.log;
@ -285,37 +223,52 @@ in
in in
{ {
# Configuration du service à proxy. # Configuration du service à proxy.
"${vhostName}" = vhostExtraConf // { "${vhostName}" = sslConf // {
serverName = hostname; serverName = hostname;
locations."/" = mkIf (vhostConfig.proxyPass != null) {
proxyPass = "http://${vhostConfig.proxyPass}"; # Site statiques et alias
proxyWebsockets = vhostConfig.proxyWebsockets;
};
root = vhostConfig.serveLocalFiles; root = vhostConfig.serveLocalFiles;
globalRedirect = vhostConfig.globalRedirect; globalRedirect = vhostConfig.globalRedirect;
extraConfig = vhostExtraConf.extraConfig + logHostConf; locations = {
}; # Entrée site, via proxy
"/" = mkIf (vhostConfig.proxyPass != null) {
# Entrée d’Anubis proxyPass = "http://${vhostConfig.proxyPass}";
"${vhostName}-anubis" = mkIf (vhostConfig.anubisConfig != null) (
entryExtraConf
// rec {
serverName = hostname;
locations."/" = {
proxyPass = "http://unix:/run/anubis/anubis-${vhostName}/socket.sock";
proxyWebsockets = vhostConfig.proxyWebsockets; proxyWebsockets = vhostConfig.proxyWebsockets;
}; extraConfig = lib.optionalString (vhostConfig.anubisConfig != null) ''
locations."/.within.website/x/cmd/anubis/api/honeypot/" = locations."/" // { auth_request /.within.website/x/cmd/anubis/api/check;
extraConfig = '' error_page 401 = @redirectToAnubis;
add_header 'X-Robots-Tag' 'noindex,nofollow' always;
''; '';
}; };
extraConfig = entryExtraConf.extraConfig + '' # Anubis
"/.within.website/" = mkIf (vhostConfig.anubisConfig != null) {
# https://anubis.techaro.lol/docs/admin/configuration/subrequest-auth/
proxyPass = "http://unix:/run/anubis/anubis-${vhostName}/socket.sock";
extraConfig = ''
proxy_pass_request_body off;
proxy_set_header content-length "";
add_header 'X-Robots-Tag' 'noindex,nofollow' always;
auth_request off;
access_log /var/log/nginx/anubis/access.log; access_log /var/log/nginx/anubis/access.log;
error_log /var/log/nginx/anubis/error.log; error_log /var/log/nginx/anubis/error.log;
''; '';
} };
); "@redirectToAnubis" = mkIf (vhostConfig.anubisConfig != null) {
extraConfig = ''
return 307 /.within.website/?redir=$scheme://$host$request_uri;
auth_request off;
access_log /var/log/nginx/anubis/access.log;
error_log /var/log/nginx/anubis/error.log;
'';
};
};
extraConfig = ''
set_real_ip_from 172.16.0.0/16;
set_real_ip_from fd00::/56;
real_ip_header X-Real-Ip;
''
+ logHostConf;
};
} }
# Les alias # Les alias
// lib.mergeAttrsList ( // lib.mergeAttrsList (