Merge commit 'd1102d5b6f'

trivionomicon/modules/athena-bccr/sys.nix

@@ -6,17 +6,20 @@
   ...
 }: let
   athena = pkgs.${doctrine.prefix}.athena-bccr.${cfg.release};
+  inherit (athena) vendor;
 in {
   environment = {
-    etc = {
+    etc =
-      "Athena".source = "${athena.ase-pkcs11}/etc/Athena";
+      {
+        "pkcs11/modules/${vendor}".text = ''
+          module: ${athena.pkcs11-module}
+        '';
+      }
+      // lib.optionalAttrs (vendor == "athena") {
+        "Athena".source = "${athena.card-driver}/etc/Athena";
+      };
 
-      "pkcs11/modules/asep11".text = ''
+    systemPackages = [athena.card-driver];
-        module: ${athena.libasep11}
-      '';
-    };
-
-    systemPackages = [athena.ase-pkcs11];
   };
 
   security = {

trivionomicon/pkgs/athena-bccr/default.nix

@@ -2,7 +2,7 @@
   callPackage,
   lib,
 }: let
-  latest = "deb64-rev26";
+  latest = "deb64-rev26.2";
 
   releases = lib.mapAttrs (name: release: release // {name = name;}) (import ./releases.nix);
 
@@ -16,15 +16,16 @@
     };
 
   pkgsForRelease = release: let
-    ase-pkcs11 = unwrapped.ase-idprotect.lib;
+    inherit (unwrapped) card-driver bccr-cacerts;
-    libasep11 = "${ase-pkcs11}/lib/x64-athena/libASEP11.so";
+
     unwrapped = overrideUnwrapped {inherit release;} {};
+    pkcs11-module = "${card-driver.lib}/${card-driver.pkcs11-path}";
   in {
-    inherit ase-pkcs11 libasep11;
+    inherit card-driver bccr-cacerts pkcs11-module;
-    inherit (unwrapped) ase-idprotect bccr-cacerts;
+    inherit (release) vendor;
 
     gaudi = callPackage ./gaudi-env.nix {inherit unwrapped;};
-    firmador = callPackage ./firmador.nix {inherit libasep11;};
+    firmador = callPackage ./firmador.nix {inherit pkcs11-module;};
   };
 in
   lib.mapAttrs (_: pkgsForRelease) (releases // {latest = releases.${latest};})

trivionomicon/pkgs/athena-bccr/firmador.nix

@@ -5,7 +5,7 @@
   maven,
   openjdk,
   wrapGAppsHook3,
-  libasep11 ? null,
+  pkcs11-module ? null,
 }: let
   jdk = openjdk.override {
     enableJavaFX = true;
@@ -34,8 +34,8 @@ in
       wrapGAppsHook3
     ];
 
-    postPatch = lib.optionalString (libasep11 != null) ''
+    postPatch = lib.optionalString (pkcs11-module != null) ''
-      sed -i 's@/usr/lib/x64-athena/libASEP11.so@${libasep11}@g' src/main/java/cr/libre/firmador/signers/CRSigner.java
+      sed -i 's@/usr/lib/x64-athena/libASEP11.so@${pkcs11-module}@g' src/main/java/cr/libre/firmador/signers/CRSigner.java
     '';
 
     installPhase = ''

trivionomicon/pkgs/athena-bccr/gaudi-env.nix

@@ -12,7 +12,7 @@ in
     name = "gaudi";
 
     targetPkgs = pkgs: [
-      unwrappedWithGaudi.ase-idprotect.lib
+      unwrappedWithGaudi.card-driver.lib
       unwrappedWithGaudi.gaudi
 
       (writeShellScriptBin "launch-gaudi" ''

trivionomicon/pkgs/athena-bccr/releases.nix

@@ -2,11 +2,26 @@
   "deb64-rev26" = {
     # nix hash convert --hash-algo sha256 --from base16 --to sri $(sha256sum sfd_ClientesLinux_DEB64_Rev26.zip | cut -d' ' -f1)
     hash = "sha256-ZPWP9TqJQ5coJAPzUSiaXKVItBWlqFM4smCjOf+gqQM=";
+    filename = "sfd_ClientesLinux_DEB64_Rev26.zip";
     basename = "sfd_ClientesLinux_DEB64_Rev26";
+    vendor = "athena";
 
     srcPaths = {
       gaudi = "Firma Digital/Agente GAUDI/agente-gaudi_20.0_amd64.deb";
       idprotect = "Firma Digital/PinTool/IDProtect PINTool 7.24.02/DEB/idprotectclient_7.24.02-0_amd64.deb";
     };
   };
+
+  "deb64-rev26.2" = {
+    # nix hash convert --hash-algo sha256 --from base16 --to sri $(sha256sum sfd_ClientesLinux_DEB64_Ubuntu24_rev26_02 | cut -d' ' -f1)
+    hash = "sha256-DNzP0YRnuUbfKLhi7JeQCirdGx4kM7ROqHDkTuVs0mA=";
+    filename = "sfd_ClientesLinux_DEB64_Ubuntu24_rev26_02.zip";
+    basename = "sfd_ClientesLinux_DEB64_Ubuntu24_26_02";
+    vendor = "idopte";
+
+    srcPaths = {
+      gaudi = "Firma Digital/Agente GAUDI/agente-gaudi_27.0_amd64.deb";
+      idopte = "Firma Digital/Idopte/Idopte_6.23.44.0_ubun24_amd64.deb";
+    };
+  };
 }

trivionomicon/pkgs/athena-bccr/unwrapped.nix

@@ -5,11 +5,11 @@
   gaudiHash ? null,
   ...
 }: let
-  inherit (release) srcPaths;
+  inherit (release) srcPaths vendor;
 
   src = requireFile {
     url = "https://soportefirmadigital.com";
-    name = "${release.basename}.zip";
+    name = release.filename;
 
     inherit (release) hash;
   };
@@ -42,7 +42,7 @@
         '';
       }
       // lib.removeAttrs args ["stdenv" "dpkg" "unzip" "srcPath" "nativeBuildInputs"]);
-in {
+
   ase-idprotect = {
     autoPatchelfHook,
     dpkg,
@@ -89,138 +89,200 @@ in {
       preFixup = ''
         patchelf --set-rpath $lib/lib/x64-athena $out/bin/*
       '';
+
+      passthru.pkcs11-path = "lib/x64-athena/libASEP11.so";
     };
 
-  gaudi = {
+  scmiddleware = {
     autoPatchelfHook,
     dpkg,
-    makeWrapper,
+    glib,
-    openjdk,
+    gtk3,
-    pkgs,
+    libappindicator-gtk3,
+    libnotify,
+    openssl,
+    pcsclite,
     stdenv,
     unzip,
-    writeShellScriptBin,
+    webkitgtk_4_1,
-    update-gaudi,
     ...
-  }: let
+  }:
-    jdk = openjdk.override {
+    moduleFromDeb "idopte-scmiddleware" {
-      enableJavaFX = true;
-      openjfx_jdk = pkgs."openjfx${lib.head (lib.splitString "." openjdk.version)}".override {withWebKit = true;};
-    };
-
-    fakeSudo = writeShellScriptBin "sudo" "";
-    gaudiUpdate = gaudiUpdateSrc {inherit update-gaudi;};
-  in
-    moduleFromDeb "gaudi" {
       inherit dpkg stdenv unzip;
-      srcPath = srcPaths.gaudi;
+      srcPath = srcPaths.idopte;
+
+      buildInputs = [
+        glib
+        gtk3
+        libappindicator-gtk3
+        libnotify
+        openssl
+        pcsclite
+        stdenv.cc.cc.lib
+        webkitgtk_4_1
+      ];
 
       nativeBuildInputs = [
         autoPatchelfHook
-        jdk
-        makeWrapper
       ];
 
-      preBuild = lib.optionalString (gaudiHash != null) ''
+      outputs = ["out" "lib"];
-        unzip -o ${gaudiUpdate} -d opt/Agente-GAUDI/lib/app
-      '';
-
-      buildPhase = ''
-        runHook preBuild
-
-        install -m755 -d $out/{bin,opt/Firmador-BCCR/lib}
-        cp -r opt/Agente-GAUDI/lib/app $out/opt/Firmador-BCCR/lib/app
-
-        # Preserves the original filename and avoids <hash>-LaunchGaudi.java
-        ln -s ${./LaunchGaudi.java} LaunchGaudi.java
-
-        javac \
-          -cp opt/Agente-GAUDI/lib/app/bccr-firma-fva-clienteMultiplataforma.jar \
-          -d $out/opt/Firmador-BCCR/lib/app \
-          LaunchGaudi.java
-
-        runHook postBuild
-      '';
 
       installPhase = ''
         runHook preInstall
 
-        install -m755 -d $out/{share,opt/Firmador-BCCR/lib/runtime/lib}
+        install -m755 -d $out/bin $lib/{etc,lib/SCMiddleware}
-        install -m755 -D opt/Agente-GAUDI/bin/Agente-GAUDI $out/opt/Firmador-BCCR/bin/Agente-GAUDI
+        install -m755 usr/lib/SCMiddleware/{idocachesrv,SCManager} $out/bin
-        install -m755 -D opt/Agente-GAUDI/lib/libapplauncher.so $out/opt/Firmador-BCCR/lib/libapplauncher.so
+        install -m755 usr/lib/SCMiddleware/*.so $lib/lib/SCMiddleware
-
+        cp -r etc/id* $lib/etc
-        ln -s ../opt/Firmador-BCCR/lib/app $out/share/java
-        ln -s Firmador-BCCR $out/opt/Agente-GAUDI
-        ln -s ${jdk}/lib/openjdk/lib/libjli.so $out/opt/Firmador-BCCR/lib/runtime/lib/libjli.so
-
-        makeWrapper ${jdk}/bin/java $out/bin/gaudi \
-          --prefix PATH : ${fakeSudo}/bin \
-          --add-flags "-cp $out/share/java:$out/share/java/bccr-firma-fva-clienteMultiplataforma.jar" \
-          --add-flags "-Djavax.net.ssl.trustStore=$out/opt/Firmador-BCCR/lib/app/bccr.cacerts" \
-          --add-flags "LaunchGaudi"
 
         runHook postInstall
       '';
-    };
 
-  bccr-cacerts = {
+      preFixup = ''
-    openssl,
+        patchelf --set-rpath $lib/lib/SCMiddleware $lib/lib/SCMiddleware/* $out/bin/*
-    stdenv,
-    unzip,
-    ...
-  }:
-    stdenv.mkDerivation {
-      pname = "bccr-cacerts";
-      version = release.name;
-
-      inherit src;
-
-      nativeBuildInputs = [
-        openssl
-        unzip
-      ];
-
-      installPhase = ''
-        cp -r Firma\ Digital/Certificados $out
-        openssl x509 -in $out/CA\ RAIZ\ NACIONAL\ -\ COSTA\ RICA\ v2.crt -out $out/root-ca.pem -text
       '';
+
+      passthru.pkcs11-path = "lib/SCMiddleware/libidop11.so";
     };
+in
+  {
+    gaudi = {
+      autoPatchelfHook,
+      dpkg,
+      makeWrapper,
+      openjdk,
+      pkgs,
+      stdenv,
+      unzip,
+      writeShellScriptBin,
+      update-gaudi,
+      ...
+    }: let
+      jdk = openjdk.override {
+        enableJavaFX = true;
+        openjfx_jdk = pkgs."openjfx${lib.head (lib.splitString "." openjdk.version)}".override {withWebKit = true;};
+      };
 
-  update-gaudi = {
+      fakeSudo = writeShellScriptBin "sudo" "";
-    wget,
+      gaudiUpdate = gaudiUpdateSrc {inherit update-gaudi;};
-    writeShellScript,
+    in
-    zip,
+      moduleFromDeb "gaudi" {
-    bccr-cacerts,
+        inherit dpkg stdenv unzip;
-    ...
+        srcPath = srcPaths.gaudi;
-  }:
-    writeShellScript "update-gaudi" ''
-      set -o errexit
-      set -o pipefail
-      set -o nounset
 
-      temp_dir="$(mktemp -d)"
+        nativeBuildInputs = [
-      trap 'cd / && rm -rf -- "$temp_dir"' EXIT
+          autoPatchelfHook
-      cd "$temp_dir"
+          jdk
+          makeWrapper
+        ];
 
-      PATH="${lib.makeBinPath [wget zip]}:$PATH"
+        preBuild = lib.optionalString (gaudiHash != null) ''
-      ca_cert="${bccr-cacerts}/root-ca.pem"
+          unzip -o ${gaudiUpdate} -d opt/Agente-GAUDI/lib/app
-      base_url="https://www.firmadigital.go.cr/Bccr.Firma.Fva.Actualizador.ClienteFirmadorJava//recursosLiberica17/actualizador"
+        '';
 
-      wget --ca-certificate="$ca_cert" "$base_url/bccr.cacerts"
+        buildPhase = ''
-      wget --ca-certificate="$ca_cert" "$base_url/config.properties"
+          runHook preBuild
-      wget --ca-certificate="$ca_cert" "$base_url/bccr-firma-fva-clienteMultiplataforma.jar"
-      wget --ca-certificate="$ca_cert" "$base_url/ServicioActualizadorClienteBCCR.jar"
 
-      # https://gist.github.com/stokito/c588b8d6a6a0aee211393d68eea678f2
+          install -m755 -d $out/{bin,opt/Firmador-BCCR/lib}
-      TZ=UTC find . -exec touch --no-dereference -a -m -t 198002010000.00 {} +
+          cp -r opt/Agente-GAUDI/lib/app $out/opt/Firmador-BCCR/lib/app
-      zip_path="$PWD/gaudi-update-${release.name}.zip"
-      TZ=UTC zip -q --move --recurse-paths --symlinks -X "$zip_path" .
-      TZ=UTC touch -a -m -t 198002010000.00 "$zip_path"
 
-      set -x
+          # Preserves the original filename and avoids <hash>-LaunchGaudi.java
-      nix-store --add-fixed sha256 "$zip_path"
+          ln -s ${./LaunchGaudi.java} LaunchGaudi.java
-      set +x
 
-      echo -e "\ngaudiHash: $(nix-hash --to-sri --type sha256 $(sha256sum "$zip_path" | cut -d' ' -f1))"
+          javac \
-    '';
+            -cp opt/Agente-GAUDI/lib/app/bccr-firma-fva-clienteMultiplataforma.jar \
-}
+            -d $out/opt/Firmador-BCCR/lib/app \
+            LaunchGaudi.java
+
+          runHook postBuild
+        '';
+
+        installPhase = ''
+          runHook preInstall
+
+          install -m755 -d $out/{share,opt/Firmador-BCCR/lib/runtime/lib}
+          install -m755 -D opt/Agente-GAUDI/bin/Agente-GAUDI $out/opt/Firmador-BCCR/bin/Agente-GAUDI
+          install -m755 -D opt/Agente-GAUDI/lib/libapplauncher.so $out/opt/Firmador-BCCR/lib/libapplauncher.so
+
+          ln -s ../opt/Firmador-BCCR/lib/app $out/share/java
+          ln -s Firmador-BCCR $out/opt/Agente-GAUDI
+          ln -s ${jdk}/lib/openjdk/lib/libjli.so $out/opt/Firmador-BCCR/lib/runtime/lib/libjli.so
+
+          makeWrapper ${jdk}/bin/java $out/bin/gaudi \
+            --prefix PATH : ${fakeSudo}/bin \
+            --add-flags "-cp $out/share/java:$out/share/java/bccr-firma-fva-clienteMultiplataforma.jar" \
+            --add-flags "-Djavax.net.ssl.trustStore=$out/opt/Firmador-BCCR/lib/app/bccr.cacerts" \
+            --add-flags "LaunchGaudi"
+
+          runHook postInstall
+        '';
+      };
+
+    bccr-cacerts = {
+      openssl,
+      stdenv,
+      unzip,
+      ...
+    }:
+      stdenv.mkDerivation {
+        pname = "bccr-cacerts";
+        version = release.name;
+
+        inherit src;
+
+        nativeBuildInputs = [
+          openssl
+          unzip
+        ];
+
+        installPhase = ''
+          cp -r Firma\ Digital/Certificados $out
+          openssl x509 -in $out/CA\ RAIZ\ NACIONAL\ -\ COSTA\ RICA\ v2.crt -out $out/root-ca.pem -text
+        '';
+      };
+
+    update-gaudi = {
+      wget,
+      writeShellScript,
+      zip,
+      bccr-cacerts,
+      ...
+    }:
+      writeShellScript "update-gaudi" ''
+        set -o errexit
+        set -o pipefail
+        set -o nounset
+
+        temp_dir="$(mktemp -d)"
+        trap 'cd / && rm -rf -- "$temp_dir"' EXIT
+        cd "$temp_dir"
+
+        PATH="${lib.makeBinPath [wget zip]}:$PATH"
+        ca_cert="${bccr-cacerts}/root-ca.pem"
+        base_url="https://www.firmadigital.go.cr/Bccr.Firma.Fva.Actualizador.ClienteFirmadorJava//recursosLiberica17/actualizador"
+
+        wget --ca-certificate="$ca_cert" "$base_url/bccr.cacerts"
+        wget --ca-certificate="$ca_cert" "$base_url/config.properties"
+        wget --ca-certificate="$ca_cert" "$base_url/bccr-firma-fva-clienteMultiplataforma.jar"
+        wget --ca-certificate="$ca_cert" "$base_url/ServicioActualizadorClienteBCCR.jar"
+
+        # https://gist.github.com/stokito/c588b8d6a6a0aee211393d68eea678f2
+        TZ=UTC find . -exec touch --no-dereference -a -m -t 198002010000.00 {} +
+        zip_path="$PWD/gaudi-update-${release.name}.zip"
+        TZ=UTC zip -q --move --recurse-paths --symlinks -X "$zip_path" .
+        TZ=UTC touch -a -m -t 198002010000.00 "$zip_path"
+
+        set -x
+        nix-store --add-fixed sha256 "$zip_path"
+        set +x
+
+        echo -e "\ngaudiHash: $(nix-hash --to-sri --type sha256 $(sha256sum "$zip_path" | cut -d' ' -f1))"
+      '';
+  }
+  // lib.optionalAttrs (vendor == "athena") {
+    card-driver = ase-idprotect;
+  }
+  // lib.optionalAttrs (vendor == "idopte") {
+    card-driver = scmiddleware;
+  }