[bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support

[bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support

[Brice Waegeneire]

This patch set closes https://issues.guix.gnu.org/45613 and
https://issues.guix.gnu.org/38341.

Brice Waegeneire (2):
  gnu: icecat: Add WebAuthn support.
  gnu: icedove: Add WebAuthn support.

 gnu/packages/gnuzilla.scm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

-- 
2.31.1

[bug#48980] [PATCH 1/2] gnu: icecat: Add WebAuthn support.

[Brice Waegeneire]

* gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
 gnu/packages/gnuzilla.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index c63809c20c..6255d56f16 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -910,6 +911,7 @@ from forcing GEXP-PROMISE."
        ;; UNBUNDLE-ME! ("nss" ,nss)
        ("shared-mime-info" ,shared-mime-info)
        ;; UNBUNDLE-ME! ("sqlite" ,sqlite)
+       ("eudev" ,eudev)
        ("unzip" ,unzip)
        ("zip" ,zip)
        ;; UNBUNDLE-ME! ("zlib" ,zlib)
@@ -1271,19 +1273,20 @@ from forcing GEXP-PROMISE."
                     (lib (string-append out "/lib"))
                     (gtk (assoc-ref inputs "gtk+"))
                     (gtk-share (string-append gtk "/share"))
-                    (mesa (assoc-ref inputs "mesa"))
-                    (mesa-lib (string-append mesa "/lib"))
-                    (pulseaudio (assoc-ref inputs "pulseaudio"))
-                    (pulseaudio-lib (string-append pulseaudio "/lib"))
-                    (libxscrnsaver (assoc-ref inputs "libxscrnsaver"))
-                    (libxscrnsaver-lib (string-append libxscrnsaver "/lib")))
+                    (ld-libs (map (lambda (lib)
+                                    (string-append (assoc-ref inputs lib)
+                                                   "/lib"))
+                              '("libxscrnsaver"
+                                "mesa"
+                                "udev"
+                                "pulseaudio"))))
                (wrap-program (car (find-files lib "^icecat$"))
                  `("XDG_DATA_DIRS" prefix (,gtk-share))
                  ;; The following line is commented out because the icecat
                  ;; package on guix has been observed to be unstable when
                  ;; using wayland, and the bundled extensions stop working.
                  ;;   `("MOZ_ENABLE_WAYLAND" = ("1"))
-                 `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,mesa-lib ,libxscrnsaver-lib)))
+                 `("LD_LIBRARY_PATH" prefix ,ld-libs))
                #t))))))
     (home-page "https://www.gnu.org/software/gnuzilla/")
     (synopsis "Entirely free browser derived from Mozilla Firefox")
-- 
2.31.1

[bug#48980] [PATCH 2/2] gnu: icedove: Add WebAuthn support.

[Brice Waegeneire]

* gnu/packages/gnuzilla.scm (icedove)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
 gnu/packages/gnuzilla.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 6255d56f16..a6f0e61b12 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1541,10 +1541,12 @@ standards of the IceCat project.")
                     (gtk (assoc-ref inputs "gtk+"))
                     (gtk-share (string-append gtk "/share"))
                     (pulseaudio (assoc-ref inputs "pulseaudio"))
-                    (pulseaudio-lib (string-append pulseaudio "/lib")))
+                    (pulseaudio-lib (string-append pulseaudio "/lib"))
+                    (eudev (assoc-ref inputs "eudev"))
+                    (eudev-lib (string-append eudev "/lib")))
                (wrap-program (car (find-files lib "^icedove$"))
                  `("XDG_DATA_DIRS" prefix (,gtk-share))
-                 `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib)))
+                 `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib)))
                #t))))))
     (inputs
      `(("bzip2" ,bzip2)
@@ -1580,6 +1582,7 @@ standards of the IceCat project.")
        ("pulseaudio" ,pulseaudio)
        ("sqlite" ,sqlite)
        ("startup-notification" ,startup-notification)
+       ("eudev" ,eudev)
        ("unzip" ,unzip)
        ("zip" ,zip)
        ("zlib" ,zlib)))
-- 
2.31.1

[bug#48980] [PATCH 2/2] gnu: icedove: Add WebAuthn support.

[Jonathan Brielmaier]

Hi Brice,

does Webauthn have any use case in Thunderbird? do you use it?

Am 12.06.21 um 23:19 schrieb Brice Waegeneire:
> * gnu/packages/gnuzilla.scm (icedove)[inputs]: Add eudev.
> [phases]: Add eudev to the wrapper.

[bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support

[Brice Waegeneire]

Hello Jonathan,

Jonathan Brielmaier <jonathan.brielmaier@web.de> writes:

> does Webauthn have any use case in Thunderbird? do you use it?

I don't need U2F support in Icecdove. Before working on this patch I too
didn't knew Icedove was missing U2F support.  But glanccing at nixpkgs
repo I have found a closed bug¹ about that; there you can see someone
needed two factor authorization to login into its account.

¹ https://github.com/NixOS/nixpkgs/issues/87642

Cheers,
- Brice

[bug#48980] [PATCH v2 1/2] gnu: icecat: Add WebAuthn support.

[Brice Waegeneire]

* gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
 gnu/packages/gnuzilla.scm | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

Rebased.

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index a997fc1c73..84feab777e 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -910,6 +911,7 @@ from forcing GEXP-PROMISE."
        ;; UNBUNDLE-ME! ("nss" ,nss)
        ("shared-mime-info" ,shared-mime-info)
        ;; UNBUNDLE-ME! ("sqlite" ,sqlite)
+       ("eudev" ,eudev)
        ("unzip" ,unzip)
        ("zip" ,zip)
        ;; UNBUNDLE-ME! ("zlib" ,zlib)
@@ -1271,24 +1273,21 @@ from forcing GEXP-PROMISE."
                     (lib (string-append out "/lib"))
                     (gtk (assoc-ref inputs "gtk+"))
                     (gtk-share (string-append gtk "/share"))
-                    (mesa (assoc-ref inputs "mesa"))
-                    (mesa-lib (string-append mesa "/lib"))
-                    (pulseaudio (assoc-ref inputs "pulseaudio"))
-                    (pulseaudio-lib (string-append pulseaudio "/lib"))
-                    (libxscrnsaver (assoc-ref inputs "libxscrnsaver"))
-                    (libxscrnsaver-lib (string-append libxscrnsaver "/lib"))
-                    (mit-krb5 (assoc-ref inputs "mit-krb5"))
-                    (mit-krb5-lib (string-append mit-krb5 "/lib")))
+                    (ld-libs (map (lambda (lib)
+                                    (string-append (assoc-ref inputs lib)
+                                                   "/lib"))
+                              '("libxscrnsaver"
+                                "mesa"
+                                "mit-krb5"
+                                "udev"
+                                "pulseaudio"))))
                (wrap-program (car (find-files lib "^icecat$"))
                  `("XDG_DATA_DIRS" prefix (,gtk-share))
                  ;; The following line is commented out because the icecat
                  ;; package on guix has been observed to be unstable when
                  ;; using wayland, and the bundled extensions stop working.
                  ;;   `("MOZ_ENABLE_WAYLAND" = ("1"))
-                 `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib
-                                             ,mesa-lib
-                                             ,libxscrnsaver-lib
-                                             ,mit-krb5-lib)))
+                 `("LD_LIBRARY_PATH" prefix ,ld-libs))
                #t))))))
     (home-page "https://www.gnu.org/software/gnuzilla/")
     (synopsis "Entirely free browser derived from Mozilla Firefox")
-- 
2.31.1

[bug#48980] [PATCH v2 2/2] gnu: icedove: Add WebAuthn support.

[Brice Waegeneire]

* gnu/packages/gnuzilla.scm (icedove)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
 gnu/packages/gnuzilla.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 84feab777e..053d4f1822 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1542,10 +1542,12 @@ standards of the IceCat project.")
                     (gtk (assoc-ref inputs "gtk+"))
                     (gtk-share (string-append gtk "/share"))
                     (pulseaudio (assoc-ref inputs "pulseaudio"))
-                    (pulseaudio-lib (string-append pulseaudio "/lib")))
+                    (pulseaudio-lib (string-append pulseaudio "/lib"))
+                    (eudev (assoc-ref inputs "eudev"))
+                    (eudev-lib (string-append eudev "/lib")))
                (wrap-program (car (find-files lib "^icedove$"))
                  `("XDG_DATA_DIRS" prefix (,gtk-share))
-                 `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib)))
+                 `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib)))
                #t))))))
     (inputs
      `(("bzip2" ,bzip2)
@@ -1581,6 +1583,7 @@ standards of the IceCat project.")
        ("pulseaudio" ,pulseaudio)
        ("sqlite" ,sqlite)
        ("startup-notification" ,startup-notification)
+       ("eudev" ,eudev)
        ("unzip" ,unzip)
        ("zip" ,zip)
        ("zlib" ,zlib)))
-- 
2.31.1

[bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support

[Jonathan Brielmaier]

I pushed the icedove patch as a807d849219c34d45310634ef0cfc94ad9b7025a,
for the icecat one I would wait on Marks opinion...

[bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support

[Brice Waegeneire]

Hello Mark,

Could you take a look at this patch adding U2F support to icecat ?

Jonathan Brielmaier <jonathan.brielmaier@web.de> writes:

> I pushed the icedove patch as a807d849219c34d45310634ef0cfc94ad9b7025a,
> for the icecat one I would wait on Marks opinion...

Cheers,
- Brice

[bug#48980] [PATCH 0/2] icecat, icedove: Add U2F and WebAuthn support

[Mark H Weaver]

Hi Brice,

Brice Waegeneire <brice@waegenei.re> writes:
> Could you take a look at this patch adding U2F support to icecat ?

Thanks for this, but I see a problem.  The new input has key "eudev":

> @@ -910,6 +911,7 @@ from forcing GEXP-PROMISE."
>         ;; UNBUNDLE-ME! ("nss" ,nss)
>         ("shared-mime-info" ,shared-mime-info)
>         ;; UNBUNDLE-ME! ("sqlite" ,sqlite)
> +       ("eudev" ,eudev)
>         ("unzip" ,unzip)
>         ("zip" ,zip)
>         ;; UNBUNDLE-ME! ("zlib" ,zlib)

but the code added to the 'wrap-program' phase looks for key "udev":

> +                    (ld-libs (map (lambda (lib)
> +                                    (string-append (assoc-ref inputs lib)
> +                                                   "/lib"))
> +                              '("libxscrnsaver"
> +                                "mesa"
> +                                "mit-krb5"
> +                                "udev"
> +                                "pulseaudio"))))

I don't see how this can work.  Did you test it?

     Regards,
       Mark

-- 
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about <https://stallmansupport.org>.

[bug#49362] [PATCH v3] gnu: icecat: Add WebAuthn support.

[Brice Waegeneire]

* gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev.
[phases]: Add eudev to the wrapper.
---
 gnu/packages/gnuzilla.scm | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

I remember having testing one version of this patch successfully, in
retrospect it probably wasn't the one sent.  I have tested this version
specificly with success in regards to WebAuth, trough the Yubico test website.

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 6ec920141a..d118ae48e4 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -910,6 +911,7 @@ from forcing GEXP-PROMISE."
        ;; UNBUNDLE-ME! ("nss" ,nss)
        ("shared-mime-info" ,shared-mime-info)
        ;; UNBUNDLE-ME! ("sqlite" ,sqlite)
+       ("eudev" ,eudev)
        ("unzip" ,unzip)
        ("zip" ,zip)
        ;; UNBUNDLE-ME! ("zlib" ,zlib)
@@ -1271,24 +1273,21 @@ from forcing GEXP-PROMISE."
                     (lib (string-append out "/lib"))
                     (gtk (assoc-ref inputs "gtk+"))
                     (gtk-share (string-append gtk "/share"))
-                    (mesa (assoc-ref inputs "mesa"))
-                    (mesa-lib (string-append mesa "/lib"))
-                    (pulseaudio (assoc-ref inputs "pulseaudio"))
-                    (pulseaudio-lib (string-append pulseaudio "/lib"))
-                    (libxscrnsaver (assoc-ref inputs "libxscrnsaver"))
-                    (libxscrnsaver-lib (string-append libxscrnsaver "/lib"))
-                    (mit-krb5 (assoc-ref inputs "mit-krb5"))
-                    (mit-krb5-lib (string-append mit-krb5 "/lib")))
+                    (ld-libs (map (lambda (lib)
+                                    (string-append (assoc-ref inputs lib)
+                                                   "/lib"))
+                              '("libxscrnsaver"
+                                "mesa"
+                                "mit-krb5"
+                                "eudev"
+                                "pulseaudio"))))
                (wrap-program (car (find-files lib "^icecat$"))
                  `("XDG_DATA_DIRS" prefix (,gtk-share))
                  ;; The following line is commented out because the icecat
                  ;; package on guix has been observed to be unstable when
                  ;; using wayland, and the bundled extensions stop working.
                  ;;   `("MOZ_ENABLE_WAYLAND" = ("1"))
-                 `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib
-                                             ,mesa-lib
-                                             ,libxscrnsaver-lib
-                                             ,mit-krb5-lib)))
+                 `("LD_LIBRARY_PATH" prefix ,ld-libs))
                #t))))))
     (home-page "https://www.gnu.org/software/gnuzilla/")
     (synopsis "Entirely free browser derived from Mozilla Firefox")
-- 
2.31.1

bug#49362: [PATCH v3] gnu: icecat: Add WebAuthn support.

[Brice Waegeneire]

Brice Waegeneire <brice@waegenei.re> writes:

> * gnu/packages/gnuzilla.scm (icecat)[inputs]: Add eudev.
> [phases]: Add eudev to the wrapper.

I pushed this a month or so ago as commit
bccfcef473da6d91f2c2cd444227721013570918.