From patchwork Sun Jan 28 22:07:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 59541 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4A20427BBE9; Sun, 28 Jan 2024 22:08:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0DB1927BBE2 for ; Sun, 28 Jan 2024 22:08:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUDJj-0004US-OW; Sun, 28 Jan 2024 17:07:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rUDJi-0004Tu-EQ for guix-patches@gnu.org; Sun, 28 Jan 2024 17:07:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rUDJi-0004km-5m for guix-patches@gnu.org; Sun, 28 Jan 2024 17:07:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rUDJp-0002ib-Py for guix-patches@gnu.org; Sun, 28 Jan 2024 17:08:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68787] [PATCH] services: block-facebook-hosts: Use proper unroutable addresses. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jan 2024 22:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68787 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68787@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170647965810407 (code B ref -1); Sun, 28 Jan 2024 22:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jan 2024 22:07:38 +0000 Received: from localhost ([127.0.0.1]:58509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUDJR-0002hn-QX for submit@debbugs.gnu.org; Sun, 28 Jan 2024 17:07:38 -0500 Received: from lists.gnu.org ([2001:470:142::17]:36476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUDJP-0002ha-97 for submit@debbugs.gnu.org; Sun, 28 Jan 2024 17:07:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rUDJB-0004NW-7l for guix-patches@gnu.org; Sun, 28 Jan 2024 17:07:21 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rUDJ9-0004XU-UK; Sun, 28 Jan 2024 17:07:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=BJ014YZudsy1AoPYYWUTdjw6z8Hc6eabfvN9Ja9/P4o=; b=C4l/BZY0Yq6u2F TlghZqdg3mWAt1MbCwz81SRmVLL37kfIkFyr9BrF4EDSSJJ/QU5OWS7seSySSc4eqTxXZnRP7OljI bEwI5ue2GX/FaLvI/vp8xLlrm723PHan03MYzivIceSoLXsaWXXYVK/u1X4yd5EDZLvW4JxFxegVR X9Ku894rBYsUaRXLNLjwyEUIINM3zNgrqn/MeB2ZanaNSEFXUFOzwg+hYmEWryt5+iE40ixy2GR1o 4GxQVvfoHIubb0OBb/83dB+wpL4UIG0DaUDZc0fTodesRt2xWOB31fHH9GvkTx8sRJNINBmDYy/vm mk4Axm0t2PGWowmMSvFQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 28 Jan 2024 23:07:09 +0100 Message-ID: <3edc7a8a89dbc39d36c47e600a3384cf2d96adc4.1706479616.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This is safer and more appropriate than redirecting to localhost. * gnu/services/networking.scm (%unroutable-ipv4, %unroutable-ipv6): New variables. (facebook-host-aliases): Use them. Change-Id: Idd4b1fec903c52d542d177a52fec1814eded4119 --- gnu/services/networking.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) base-commit: 65dc2d40cb113382fb98796f1d04099f28cab355 diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 495d049728..8e64e529ab 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2023 Ludovic Courtès +;;; Copyright © 2013-2024 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018, 2020 Efraim Flashner ;;; Copyright © 2016 John Darrington @@ -270,6 +270,14 @@ (define-module (gnu services networking) ;;; ;;; Code: +(define %unroutable-ipv4 + ;; Unroutable address, as per . + "203.0.113.1") + +(define %unroutable-ipv6 + ;; Unroutable address, as per . + "0100::") + (define facebook-host-aliases ;; This is the list of known Facebook hosts to be added to /etc/hosts if you ;; are to block it. @@ -282,7 +290,8 @@ (define facebook-host-aliases (append-map (lambda (name) (map (lambda (addr) (host addr name)) - (list "127.0.0.1" "::1"))) domains))) + (list %unroutable-ipv4 %unroutable-ipv6))) + domains))) (define-deprecated %facebook-host-aliases block-facebook-hosts-service-type