From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 14 17:33:57 2021 Received: (at 51216) by debbugs.gnu.org; 14 Oct 2021 21:33:57 +0000 Received: from localhost ([127.0.0.1]:37233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mb8MP-0004kt-8i for submit@debbugs.gnu.org; Thu, 14 Oct 2021 17:33:57 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:37696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mb8MM-0004kB-IA for 51216@debbugs.gnu.org; Thu, 14 Oct 2021 17:33:55 -0400 Received: by mail-wr1-f47.google.com with SMTP id e12so22760111wra.4 for <51216@debbugs.gnu.org>; Thu, 14 Oct 2021 14:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=da1LKgqJdQZT5gfIhnwBtSEI9OUgIxaMI4gcrTXMa+g=; b=eTHrukkLq0ru3Fkhzje8FodFT8QzoraM0394eiaUtx/Q9vgg0JNlExQQ2YC9c6pAMc vptjnyHSxFbAihQMO1OKoHFgn6rAjPd58uFV+NRZSipOtHdSbeHpPykdKA9Fe+fm6u80 FtCak5Rq6T/hvykQkuauohadahx4fRZbkQK2jSb1W+hn5trr3Mj+5gJk4KK6N2WimsHq Z0MJNv2B3398o4cSOWsPq+4atiqXrHKQsOdcSIAWLPJ24r71D86Ka/MKAaOXVUTGltS5 AVa3ABKDZk7vb/KVyoTX43HeEmSW2lwW75RT5wpjIFgc3uoQutvPF2LrB2efjmXyGXDg 75tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=da1LKgqJdQZT5gfIhnwBtSEI9OUgIxaMI4gcrTXMa+g=; b=hF1K4jJMLLh9fqsuFYQQFQmqrKLf3+myrDmPCaZQ+a4NO6xnUq8YzsoNCTqwKahpy2 sBLOWqrCCZMjGfFr5LzZVddi9Z9h/AiLVitc7qpZCIKtBJQqC+NEym9kcOdAdXbRxFbk 4wUQezllbBI4q+onI8HSVFbBY+wMeehMOSiVt5uHjtTqxB9Qknk2mm4MnN7Qfi0G1BfD Fg+mib5EAalRZSnLTKhmwnHIadtkWb/K3ooMbKv8kj2upZDA32nUCfcecSS5wQ4UIO95 B2pJdYfQV0LqGz9+k4lUdRemHS9isVM+1jGJsUcVeAJHc7ATPj61LBePFn+PikyQ7WDv hUcQ== X-Gm-Message-State: AOAM531/2XU5Tf6/CqRLrG4jCWesxAw1i1d9nGwHhcpLtRRJK9PSVqwY Zw8YRwsp9/EXaaf51qRR/JTE6Yd2o3I= X-Google-Smtp-Source: ABdhPJxvF69zod7dXl1qThBdpuFzItq6d33s1u6zPpw5bb7KFOgjjxHv5hvL6XjfWDiaOXSaOIVTEg== X-Received: by 2002:adf:e584:: with SMTP id l4mr9414890wrm.173.1634247228510; Thu, 14 Oct 2021 14:33:48 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.117]) by smtp.gmail.com with ESMTPSA id k27sm3205993wms.21.2021.10.14.14.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 14:33:48 -0700 (PDT) From: zimoun To: 51216@debbugs.gnu.org Subject: [PATCH 1/1] swh: Allows token from Software Heritage authentication service. Date: Thu, 14 Oct 2021 23:33:46 +0200 Message-Id: <20211014213346.3270670-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The token is provided using the environment variable GUIX_SWH_TOKEN. * guix/swh.scm (swh-token): New variable. (http-get*, http-post*): Use it. --- guix/swh.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zimon.toutoune[at]gmail.com) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.47 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.47 listed in list.dnswl.org] X-Debbugs-Envelope-To: 51216 Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) The token is provided using the environment variable GUIX_SWH_TOKEN. * guix/swh.scm (swh-token): New variable. (http-get*, http-post*): Use it. --- guix/swh.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/guix/swh.scm b/guix/swh.scm index 5c41685a24..38a4af723a 100644 --- a/guix/swh.scm +++ b/guix/swh.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -153,12 +154,30 @@ (define url url (string-append url "/"))) +;; Token from an account to the Software Heritage Authentication service +;; +(define swh-token + (match (getenv "GUIX_SWH_TOKEN") + (#f #f) + ((? string-null? s) #f) + ((? string? s) (string->symbol s)))) + ;; XXX: Work around a bug in Guile 3.0.2 where #:verify-certificate? would ;; be ignored (). (define* (http-get* uri #:rest rest) - (apply http-request uri #:method 'GET rest)) + (apply http-request uri #:method 'GET + #:headers + (if swh-token + `((authorization . (Bearer ,swh-token))) + '()) + rest)) (define* (http-post* uri #:rest rest) - (apply http-request uri #:method 'POST rest)) + (apply http-request uri #:method 'POST + #:headers + (if swh-token + `((authorization . (Bearer ,swh-token))) + '()) + rest)) (define %date-regexp ;; Match strings like "2014-11-17T22:09:38+01:00" or -- 2.32.0