From 809f0b58baeed33171247b160c003917f261b86c Mon Sep 17 00:00:00 2001
From: Jared Allard <jaredallard@users.noreply.github.com>
Date: Sat, 10 Feb 2024 11:13:21 -0800
Subject: [PATCH] app-admin/1password: fix extension+signing

---
 app-admin/1password/1password-8.10.24.ebuild | 25 +++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/app-admin/1password/1password-8.10.24.ebuild b/app-admin/1password/1password-8.10.24.ebuild
index 6c735a8..dcf6d77 100644
--- a/app-admin/1password/1password-8.10.24.ebuild
+++ b/app-admin/1password/1password-8.10.24.ebuild
@@ -39,18 +39,37 @@ src_install() {
   mkdir -p "${D}/opt/1Password/"
   cp -ar "${S}/${PN}-"**"/"* "${D}/opt/1Password/" || die "Install failed!"
 
-  chgrp onepassword "${D}/opt/1Password/1Password-BrowserSupport"
+  # Fill in policy kit file with a list of (the first 10) human users of
+  # the system.
+  mkdir -p "${D}/usr/share/polkit-1/actions/"
+  export POLICY_OWNERS
+  POLICY_OWNERS="$(cut -d: -f1,3 /etc/passwd | grep -E ':[0-9]{4}$' | cut -d: -f1 | head -n 10 | sed 's/^/unix-user:/' | tr '\n' ' ')"
+  eval "cat <<EOF
+$(cat "${D}/opt/1Password/com.1password.1Password.policy.tpl")
+EOF" >"${D}/usr/share/polkit-1/actions/com.1password.1Password.policy"
+  chmod 644 "${D}/usr/share/polkit-1/actions/com.1password.1Password.policy"
+
   dosym /opt/1Password/1password /usr/bin/1password
   dosym /opt/1Password/op-ssh-sign /usr/bin/op-ssh-sign
 
   domenu "${FILESDIR}/1password.desktop"
   newicon "${D}/opt/1Password/resources/icons/hicolor/512x512/apps/1password.png" "${PN}.png"
+
+  dodoc "${D}/opt/1Password/resources/custom_allowed_browsers"
 }
 
 pkg_postinst() {
+  # chrome-sandbox requires the setuid bit to be specifically set.
+  # See https://github.com/electron/electron/issues/17972
   chmod 4755 /opt/1Password/chrome-sandbox
-  chmod 6755 /opt/1Password/1Password-KeyringHelper
-  chmod 2755 /opt/1Password/1Password-BrowserSupport
+
+  # The binary requires setuid so it may interact with the Kernel keyring facilities
+  chmod u+s /opt/1Password/1Password-KeyringHelper
+  chmod g+s /opt/1Password/1Password-KeyringHelper
+
+  # This gives no extra permissions to the binary. It only hardens it against environmental tampering.
+  chgrp onepassword /opt/1Password/1Password-BrowserSupport
+  chmod g+s /opt/1Password/1Password-BrowserSupport
 
   xdg_pkg_postinst
 }