From ad289b3cb9abfc65d188362078b255e5b1d6d615 Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Mon, 6 Jan 2025 17:34:31 +0000
Subject: Use python-requests-2.28 with openconnect-sso for UTHSC VPN.
---
topics/deploy/uthsc-vpn.scm | 50 ++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 47 insertions(+), 3 deletions(-)
(limited to 'topics/deploy/uthsc-vpn.scm')
diff --git a/topics/deploy/uthsc-vpn.scm b/topics/deploy/uthsc-vpn.scm
index 2976bc1..73cb48b 100644
--- a/topics/deploy/uthsc-vpn.scm
+++ b/topics/deploy/uthsc-vpn.scm
@@ -1,6 +1,10 @@
-(use-modules ((gnu packages guile-xyz) #:select (guile-ini guile-lib guile-smc))
+(use-modules ((gnu packages python-web) #:select (python-requests python-urllib3))
+ ((gnu packages guile-xyz) #:select (guile-ini guile-lib guile-smc))
((gnu packages vpn) #:select (openconnect-sso vpn-slice))
- (guix gexp))
+ (guix build-system python)
+ (guix download)
+ (guix gexp)
+ (guix packages))
;; Put in the hosts you are interested in here.
(define %hosts
@@ -19,6 +23,46 @@
(call-with-output-file #$output
(cut scm->ini #$scm #:port <>))))))
+(define python-urllib3-1.26
+ (package
+ (inherit python-urllib3)
+ (version "1.26.15")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "urllib3" version))
+ (sha256
+ (base32
+ "01dkqv0rsjqyw4wrp6yj8h3bcnl7c678qkj845596vs7p4bqff4a"))))
+ (build-system python-build-system)))
+
+(define python-requests-2.28
+ (package
+ (inherit python-requests)
+ (name "python-requests")
+ (version "2.28.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "requests" version))
+ (sha256
+ (base32
+ "10vrr7bijzrypvms3g2sgz8vya7f9ymmcv423ikampgy0aqrjmbw"))))
+ (build-system python-build-system)
+ (arguments (list #:tests? #f))
+ (native-inputs (list))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs python-requests)
+ (replace "python-urllib3" python-urllib3-1.26)))))
+
+;; Login to the UTHSC VPN fails with an SSLV3_ALERT_HANDSHAKE_FAILURE
+;; on newer python-requests.
+(define openconnect-sso-uthsc
+ (package
+ (inherit openconnect-sso)
+ (inputs
+ (modify-inputs (package-inputs openconnect-sso)
+ (replace "python-requests" python-requests-2.28)))))
+
(define uthsc-vpn
(with-imported-modules '((guix build utils))
#~(begin
@@ -36,7 +80,7 @@
("Options" . "UnsafeLegacyRenegotiation")))))
(setenv "REQUESTS_CA_BUNDLE"
#$(local-file "uthsc-certificate.pem"))
- (invoke #$(file-append openconnect-sso "/bin/openconnect-sso")
+ (invoke #$(file-append openconnect-sso-uthsc "/bin/openconnect-sso")
"--server" "uthscvpn1.uthsc.edu"
"--authgroup" "UTHSC"
"--"
--
cgit v1.2.3