From aad1622b85f1ae0267978143fc69a6412b78f433 Mon Sep 17 00:00:00 2001 From: CFC4N Date: Tue, 28 May 2024 21:29:24 +0800 Subject: [PATCH] user: format clientRandom string in gotls module Signed-off-by: CFC4N --- user/module/probe_gotls.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/user/module/probe_gotls.go b/user/module/probe_gotls.go index 1fcc62bc6..e4968a85d 100644 --- a/user/module/probe_gotls.go +++ b/user/module/probe_gotls.go @@ -242,28 +242,30 @@ func (g *GoTLSProbe) saveMasterSecret(secretEvent *event.MasterSecretGotlsEvent) return } - // TODO 保存多个lable 整组里？？？ + // 保存到多个lable 整组里 // save to file - var b string + var b, cr string var e error - b = fmt.Sprintf("%s %02x %02x\n", label, clientRandom, secret) + cr = fmt.Sprintf("%02x", clientRandom) + b = fmt.Sprintf("%s %s %02x\n", label, cr, secret) + switch g.eBPFProgramType { case TlsCaptureModelTypeKeylog: var l int l, e = g.keylogger.WriteString(b) if e != nil { - g.logger.Warn().Err(e).Str("clientRandom", clientRandom).Msg("save masterSecrets to keylog error") + g.logger.Warn().Err(e).Str("clientRandom", cr).Msg("save masterSecrets to keylog error") return } - g.logger.Info().Str("clientRandom", clientRandom).Str("label", label).Int("bytes", l).Msg("save CLIENT_RANDOM success") + g.logger.Info().Str("clientRandom", cr).Str("label", label).Int("bytes", l).Msg("save CLIENT_RANDOM success") case TlsCaptureModelTypePcap: e = g.savePcapngSslKeyLog([]byte(b)) if e != nil { - g.logger.Warn().Err(e).Str("clientRandom", clientRandom).Msg("save masterSecrets to pcapNG error") + g.logger.Warn().Err(e).Str("clientRandom", cr).Msg("save masterSecrets to pcapNG error") return } default: - g.logger.Warn().Str("clientRandom", clientRandom).Uint8("eBPFProgramType", uint8(g.eBPFProgramType)).Msg("unhandled default case with eBPF Program type") + g.logger.Warn().Str("clientRandom", cr).Uint8("eBPFProgramType", uint8(g.eBPFProgramType)).Msg("unhandled default case with eBPF Program type") } }