Skip to content

firefox: support for PKCS#11 modules in wrapper #92251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 2 commits into from
Jul 25, 2020
Merged

firefox: support for PKCS#11 modules in wrapper #92251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49dba9c
firefox: support for PKCS#11 modules in wrapper
chvp Jul 4, 2020
194d749
eid-mw: update description to mention pkcs11Modules in firefox wrapper
chvp Jul 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pkgs/applications/networking/browsers/firefox/wrapper.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ let
, nameSuffix ? ""
, icon ? browserName
, extraNativeMessagingHosts ? []
, pkcs11Modules ? []
, forceWayland ? false
, useGlvnd ? true
, cfg ? config.${browserName} or {}
Expand Down Expand Up @@ -74,7 +75,8 @@ let
++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
++ lib.optional (config.pulseaudio or true) libpulseaudio;
++ lib.optional (config.pulseaudio or true) libpulseaudio
++ pkcs11Modules;
gtk_modules = [ libcanberra-gtk2 ];

in stdenv.mkDerivation {
Expand Down Expand Up @@ -154,6 +156,11 @@ let
ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/*
done

mkdir -p $out/lib/mozilla/pkcs11-modules
for ext in ${toString pkcs11Modules}; do
ln -sLt $out/lib/mozilla/pkcs11-modules $ext/lib/mozilla/pkcs11-modules/*
done

# For manpages, in case the program supplies them
mkdir -p $out/nix-support
echo ${browser} > $out/nix-support/propagated-user-env-packages
Expand Down
12 changes: 5 additions & 7 deletions pkgs/tools/security/eid-mw/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@ stdenv.mkDerivation rec {

eid-viewer is also installed.

**TO FIX:**
The procedure below did not work for me, I had to install the .so directly in firefox as instructed at
https://eid.belgium.be/en/log-eid#7507
and specify
/run/current-system/sw/lib/libbeidpkcs11.so
as the path to the module.

This package only installs the libraries. To use eIDs in Firefox or
Chromium, the eID Belgium add-on must be installed.
This package only installs the libraries. To use eIDs in NSS-compatible
Expand All @@ -83,6 +76,11 @@ stdenv.mkDerivation rec {
Before uninstalling this package, it is a very good idea to run
~$ eid-nssdb [--system] remove
and remove all ~/.pki and/or /etc/pki directories no longer needed.

The above procedure doesn't seem to work in Firefox. You can override the
firefox wrapper to add this derivation to the PKCS#11 modules, like so:

firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }
'';
platforms = platforms.linux;
maintainers = with maintainers; [ bfortz ];
Expand Down