Refactor key fetching and validation logic

ubuntu-to-mint-convert-v3.sh

@@ -301,37 +301,38 @@ mint_repo_key_write_to() {
     :
   else
     # 3) Fallback: fetch armored key over HTTPS/HTTP and dearmor
-info "Keyserver blocked; fetching key over HTTPS from Ubuntu keyserver..."
+    info "Keyserver blocked; fetching key over HTTPS from Ubuntu keyserver..."
-local armored="$gnupghome/linuxmint-repo.asc"
+    local armored="$gnupghome/linuxmint-repo.asc"
 
-if ! curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${keyid}" -o "$armored"; then
+    if ! curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${keyid}" -o "$armored"; then
       curl -fsSL "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${keyid}" -o "$armored" \
         || die "Unable to fetch Mint repo key via keyserver or HTTPS fallback."
-fi
+    fi
 
-# Sanity: ensure it's a PGP public key block
+    # Sanity: ensure it's a PGP public key block (avoid proxy HTML portals)
-grep -q "BEGIN PGP PUBLIC KEY BLOCK" "$armored" || die "Downloaded key is not a PGP public key block (proxy portal/HTML?)"
+    grep -q "BEGIN PGP PUBLIC KEY BLOCK" "$armored" \
+      || die "Downloaded key is not a PGP public key block (proxy portal/HTML?)"
 
-# Validate: the expected keyid appears in the key block (pub OR sub)
+    # Validate: the expected keyid appears in the key block (pub OR sub)
-local found="no"
+    local found="no"
-while IFS= read -r kid; do
+    while IFS= read -r kid; do
       if [[ "${kid^^}" == "${keyid^^}" ]]; then
         found="yes"
         break
       fi
-done < <(gpg --batch --with-colons --show-keys "$armored" | awk -F: '$1=="pub"||$1=="sub"{print $5}')
+    done < <(gpg --batch --with-colons --show-keys "$armored" | awk -F: '$1=="pub"||$1=="sub"{print $5}')
 
-[[ "$found" == "yes" ]] || die "Fetched key does not contain expected keyid ${keyid^^}"
+    [[ "$found" == "yes" ]] || die "Fetched key does not contain expected keyid ${keyid^^}"
 
-# (Optional) extra guard: make sure the UID looks like Linux Mint repo key
+    # Optional guard: check UID contains expected label
-if ! gpg --batch --with-colons --show-keys "$armored" | awk -F: '$1=="uid"{print $10}' | grep -qi "Linux Mint Repository Signing Key"; then
+    if ! gpg --batch --with-colons --show-keys "$armored" | awk -F: '$1=="uid"{print $10}' | grep -qi "Linux Mint Repository Signing Key"; then
-  warn "Keyid matched but UID did not match expected Mint repo UID; review /tmp key block if concerned."
+      warn "Keyid matched but UID did not match expected Mint repo UID; review the downloaded key if concerned."
-fi
+    fi
 
-gpg --batch --dearmor -o "$out_keyring" "$armored"
+    gpg --batch --dearmor -o "$out_keyring" "$armored"
-chmod 644 "$out_keyring"
+    chmod 644 "$out_keyring"
-rm -rf "$gnupghome"
+    rm -rf "$gnupghome"
-return 0
+    return 0
   fi
 
   # If we got here, gpg received the key into temp keyring; export+dearmor
@@ -340,7 +341,6 @@ return 0
   rm -rf "$gnupghome"
 }
 
-
 mint_repo_key_install() {
   local keyring="/usr/share/keyrings/linuxmint-repo.gpg"
   info "Installing Linux Mint repo signing key into ${keyring}"
@@ -381,22 +381,40 @@ write_mint_pinning_system() {
   info "Writing conservative APT pinning to ${pref}"
 
   cat > "$pref" <<'EOF'
+# Default: do NOT prefer Mint for everything.
 Package: *
-Pin: origin "packages.linuxmint.com"
+Pin: release o=LinuxMint
 Pin-Priority: 100
 
+# Prefer Mint for Mint tooling
 Package: mint* mintsources* mintupdate* mintsystem* mintstick* mintmenu* mintlocale* mintdrivers* mintreport* mintwelcome*
-Pin: origin "packages.linuxmint.com"
+Pin: release o=LinuxMint
 Pin-Priority: 700
 
-Package: cinnamon* nemo* muffin* cjs* xapp* slick-greeter* lightdm* pix* xviewer* mint-themes* mint-y-icons* mint-x-icons*
+# Prefer Mint for Cinnamon/Nemo stack (apps)
-Pin: origin "packages.linuxmint.com"
+Package: cinnamon* nemo* muffin* cjs* slick-greeter* lightdm* pix* xviewer* mint-themes* mint-y-icons* mint-x-icons*
-Pin-Priority: 700
+Pin: release o=LinuxMint
+Pin-Priority: 900
+
+# Prefer Mint for XApp stack (critical deps for mintreport + nemo/cinnamon)
+Package: python3-xapp* python-xapp* libxapp* gir1.2-xapp* xapps* xapps-common xapp-symbolic-icons xapp-status-icon
+Pin: release o=LinuxMint
+Pin-Priority: 1001
+
+# Prefer Mint for Cinnamon/Nemo libraries that must match exact versions
+Package: libnemo-extension1* nemo-data*
+Pin: release o=LinuxMint
+Pin-Priority: 1001
+
+Package: libcinnamon-control-center1* libcinnamon-menu-3-0* libcinnamon-desktop4* cinnamon-desktop-data* cinnamon-control-center-data* cinnamon-l10n*
+Pin: release o=LinuxMint
+Pin-Priority: 1001
 EOF
 
   ok "Pinning written."
 }
 
+
 disable_thirdparty_sources_system() {
   local backup_dir="$1"
   local disabled_dir="${backup_dir}/disabled-sources"
@@ -404,15 +422,26 @@ disable_thirdparty_sources_system() {
 
   info "Disabling 3rd-party sources into: ${disabled_dir}"
   shopt -s nullglob
+
+  local allow_re='(crowdstrike|falcon|globalprotect|paloalto|pan(gp)?|cortex|prisma)'
+
   for f in /etc/apt/sources.list.d/*.list /etc/apt/sources.list.d/*.sources; do
     [[ "$(basename "$f")" == "official-package-repositories.list" ]] && continue
+
+    # Preserve known security/VPN vendor repos
+    if echo "$(basename "$f")" | grep -Eiq "$allow_re" || grep -Eiq "$allow_re" "$f"; then
+      info "Preserving vendor repo: $f"
+      continue
+    fi
+
     mv -v "$f" "${disabled_dir}/" || true
   done
-  shopt -u nullglob
 
+  shopt -u nullglob
   ok "Third-party sources disabled (restorable via rollback)."
 }
 
+
 backup_system_state() {
   local backup_dir="/root/ubuntu-to-mint-backup-$(date +%Y%m%d-%H%M%S)"
   mkdir -p "$backup_dir"