mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 06:26:14 -05:00
Add NLB troubleshooting logs for gateway testing
Log opaque crypto readiness, envelope sign/verify details with hex dumps, and richer invalid-packet diagnostics to help debug NLB ESP envelope auth against live gateways.
This commit is contained in:
1 file changed
+143
@@ -0,0 +1,143 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Yue <[email protected]>
|
||||
Date: Thu, 25 Jun 2026 23:55:00 +0800
|
||||
Subject: [PATCH 16/16] Add NLB troubleshooting logs
|
||||
|
||||
Add verbose logging for NLB opaque crypto, envelope signing/verification,
|
||||
and invalid packet diagnostics to aid live gateway testing.
|
||||
---
|
||||
--- a/gpst_nlb.c
|
||||
+++ b/gpst_nlb.c
|
||||
@@ -196,8 +196,8 @@
|
||||
GP_NLB_ENC_HS_KEY_CIPHER_LEN,
|
||||
plain, &plain_len);
|
||||
if (ret < 0) {
|
||||
- vpn_progress(vpninfo, PRG_DEBUG,
|
||||
- _("enc-hs-key TLS decipherment failed; NLB opaque crypto pending\n"));
|
||||
+ vpn_progress(vpninfo, PRG_INFO,
|
||||
+ _("enc-hs-key TLS decipherment failed; tunnel-opaque decrypt unavailable\n"));
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -234,7 +234,7 @@
|
||||
if (gp_ssl_decrypt_blob_key(vpninfo, nlb->opaque_key, nlb->opaque_key_len,
|
||||
NULL, 0, payload, payload_len, out, &out_len) < 0) {
|
||||
free(out);
|
||||
- vpn_progress(vpninfo, PRG_DEBUG,
|
||||
+ vpn_progress(vpninfo, PRG_INFO,
|
||||
_("tunnel-opaque body decipherment failed\n"));
|
||||
return 0;
|
||||
}
|
||||
@@ -251,16 +251,27 @@
|
||||
static void gp_nlb_apply_decrypted_opaque(struct openconnect_info *vpninfo,
|
||||
struct gp_nlb_config *nlb)
|
||||
{
|
||||
- if (!nlb->decrypted_opaque ||
|
||||
- nlb->decrypted_opaque_len < GP_NLB_OPAQUE_AUTH_OFF + GP_NLB_HDR_AUTH_LEN)
|
||||
+ if (!nlb->decrypted_opaque) {
|
||||
+ vpn_progress(vpninfo, PRG_DEBUG,
|
||||
+ _("NLB decrypted opaque missing; cannot extract hdr auth material\n"));
|
||||
+ return;
|
||||
+ }
|
||||
+ if (nlb->decrypted_opaque_len < GP_NLB_OPAQUE_AUTH_OFF + GP_NLB_HDR_AUTH_LEN) {
|
||||
+ vpn_progress(vpninfo, PRG_INFO,
|
||||
+ _("NLB decrypted opaque too short (%d bytes, need %d); auth material unavailable\n"),
|
||||
+ nlb->decrypted_opaque_len,
|
||||
+ GP_NLB_OPAQUE_AUTH_OFF + GP_NLB_HDR_AUTH_LEN);
|
||||
return;
|
||||
+ }
|
||||
|
||||
memcpy(nlb->hdr_auth,
|
||||
nlb->decrypted_opaque + GP_NLB_OPAQUE_AUTH_OFF,
|
||||
GP_NLB_HDR_AUTH_LEN);
|
||||
nlb->opaque_auth_ready = 1;
|
||||
vpn_progress(vpninfo, PRG_DEBUG,
|
||||
- _("NLB tunnel-opaque auth material ready\n"));
|
||||
+ _("NLB tunnel-opaque auth material ready (offset %d, %d bytes)\n"),
|
||||
+ GP_NLB_OPAQUE_AUTH_OFF, GP_NLB_HDR_AUTH_LEN);
|
||||
+ dump_buf_hex(vpninfo, PRG_DEBUG, '=', nlb->hdr_auth, GP_NLB_HDR_AUTH_LEN);
|
||||
}
|
||||
|
||||
static void gp_nlb_write_hdr(unsigned char *hdr, struct gp_nlb_config *nlb,
|
||||
@@ -287,12 +298,21 @@
|
||||
esp, esplen, mac) < 0)
|
||||
return -EINVAL;
|
||||
memcpy(hdr + GP_NLB_HDR_SIGN_LEN, mac, GP_NLB_HDR_AUTH_LEN);
|
||||
+ vpn_progress(vpninfo, PRG_DEBUG,
|
||||
+ _("NLB sign: seq=%u type=%u inner_len=%u esplen=%d mode=hmac-sha1\n"),
|
||||
+ load_be16(hdr + 4), hdr[8], load_be16(hdr + 6), esplen);
|
||||
+ dump_buf_hex(vpninfo, PRG_DEBUG, '>', hdr, GP_NLB_HDR_LEN);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (nlb->opaque_auth_ready)
|
||||
memcpy(hdr + GP_NLB_HDR_SIGN_LEN, nlb->hdr_auth, GP_NLB_HDR_AUTH_LEN);
|
||||
|
||||
+ vpn_progress(vpninfo, PRG_DEBUG,
|
||||
+ _("NLB sign: seq=%u type=%u inner_len=%u esplen=%d mode=%s\n"),
|
||||
+ load_be16(hdr + 4), hdr[8], load_be16(hdr + 6), esplen,
|
||||
+ nlb->opaque_auth_ready ? "static-opaque" : "unsigned");
|
||||
+ dump_buf_hex(vpninfo, PRG_DEBUG, '>', hdr, GP_NLB_HDR_LEN);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -304,8 +324,13 @@
|
||||
unsigned char mac[SHA1_SIZE];
|
||||
const unsigned char *expect;
|
||||
|
||||
- if (!nlb->hs_key_len)
|
||||
+ if (!nlb->hs_key_len) {
|
||||
+ vpn_progress(vpninfo, PRG_DEBUG,
|
||||
+ _("NLB verify skipped (no hs-key): seq=%u type=%u inner_len=%u esplen=%d opaque_auth=%d\n"),
|
||||
+ load_be16(hdr + 4), hdr[8], load_be16(hdr + 6), esplen,
|
||||
+ nlb->opaque_auth_ready);
|
||||
return 0;
|
||||
+ }
|
||||
|
||||
if (gp_nlb_hmac_sha1(nlb->hs_key, nlb->hs_key_len,
|
||||
hdr, GP_NLB_HDR_SIGN_LEN,
|
||||
@@ -315,9 +340,18 @@
|
||||
expect = hdr + GP_NLB_HDR_SIGN_LEN;
|
||||
if (memcmp(expect, mac, GP_NLB_HDR_AUTH_LEN)) {
|
||||
vpn_progress(vpninfo, PRG_DEBUG,
|
||||
- _("NLB envelope HMAC mismatch\n"));
|
||||
+ _("NLB envelope HMAC mismatch: seq=%u type=%u inner_len=%u esplen=%d\n"),
|
||||
+ load_be16(hdr + 4), hdr[8], load_be16(hdr + 6), esplen);
|
||||
+ dump_buf_hex(vpninfo, PRG_DEBUG, '<', (unsigned char *)expect,
|
||||
+ GP_NLB_HDR_AUTH_LEN);
|
||||
+ dump_buf_hex(vpninfo, PRG_DEBUG, '=', mac, GP_NLB_HDR_AUTH_LEN);
|
||||
+ dump_buf_hex(vpninfo, PRG_DEBUG, '>', (unsigned char *)hdr,
|
||||
+ GP_NLB_HDR_LEN);
|
||||
return -EINVAL;
|
||||
}
|
||||
+ vpn_progress(vpninfo, PRG_DEBUG,
|
||||
+ _("NLB verify ok: seq=%u type=%u inner_len=%u esplen=%d\n"),
|
||||
+ load_be16(hdr + 4), hdr[8], load_be16(hdr + 6), esplen);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -380,6 +414,11 @@
|
||||
gp_nlb_decrypt_opaque_body(vpninfo, nlb);
|
||||
}
|
||||
|
||||
+ vpn_progress(vpninfo, PRG_INFO,
|
||||
+ _("NLB crypto ready: hs_key=%d bytes opaque_key=%d bytes opaque_auth=%s decrypted_opaque=%d bytes\n"),
|
||||
+ nlb->hs_key_len, nlb->opaque_key_len,
|
||||
+ nlb->opaque_auth_ready ? "yes" : "no",
|
||||
+ nlb->decrypted_opaque_len);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -461,8 +500,10 @@
|
||||
if (magic != GP_NLB_MAGIC || type > 8 ||
|
||||
wire_len != GP_NLB_HDR_LEN + inner_len) {
|
||||
vpn_progress(vpninfo, PRG_DEBUG,
|
||||
- _("invalid tunnel packet len %d magic 0x%x type %u\n"),
|
||||
- wire_len, magic, type);
|
||||
+ _("invalid NLB tunnel packet: wire_len=%d inner_len=%u magic=0x%x type=%u (expected %d)\n"),
|
||||
+ wire_len, inner_len, magic, type,
|
||||
+ GP_NLB_HDR_LEN + inner_len);
|
||||
+ dump_buf_hex(vpninfo, PRG_DEBUG, '<', wire, GP_NLB_HDR_LEN);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user