Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(experimental/gotls): support environment variable SSLKEYLOGFILE #151

Merged
merged 1 commit into from
Sep 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
make -C testdata/gohttpapp build

for i in {1..10}; do
sudo bash testdata/test_gotls_keylog.sh ./ptcpdump && exit 0 || sleep 1
sudo bash testdata/test_gotls_keylog.sh ./ptcpdump gohttpapp && exit 0 || sleep 1
done
exit 1

Expand All @@ -105,7 +105,7 @@ jobs:
make -C testdata/gohttpapp build

for i in {1..10}; do
sudo bash testdata/test_gotls_keylog_pie.sh ./ptcpdump && exit 0 || sleep 1
sudo bash testdata/test_gotls_keylog.sh ./ptcpdump gohttpapp_pie && exit 0 || sleep 1
done
exit 1

Expand All @@ -119,7 +119,7 @@ jobs:
make -C testdata/gohttpapp build

for i in {1..10}; do
sudo bash testdata/test_gotls_keylog_stripped.sh ./ptcpdump && exit 0 || sleep 1
sudo bash testdata/test_gotls_keylog.sh ./ptcpdump gohttpapp_stripped && exit 0 || sleep 1
done
exit 1

Expand All @@ -133,7 +133,7 @@ jobs:
make -C testdata/gohttpapp build

for i in {1..10}; do
sudo bash testdata/test_gotls_keylog_stripped_pie.sh ./ptcpdump && exit 0 || sleep 1
sudo bash testdata/test_gotls_keylog.sh ./ptcpdump gohttpapp_stripped_pie && exit 0 || sleep 1
done
exit 1

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ jobs:
apt update && yes | apt install -y tshark

for i in {1..10}; do
bash /host/testdata/test_gotls_keylog.sh /host/ptcpdump/ptcpdump && exit 0 || sleep 1
bash /host/testdata/test_gotls_keylog.sh /host/ptcpdump/ptcpdump gohttpapp && exit 0 || sleep 1
done
exit 1

Expand All @@ -283,7 +283,7 @@ jobs:
apt update && yes | apt install -y tshark

for i in {1..10}; do
bash /host/testdata/test_gotls_keylog_pie.sh /host/ptcpdump/ptcpdump && exit 0 || sleep 1
bash /host/testdata/test_gotls_keylog.sh /host/ptcpdump/ptcpdump gohttpapp_pie && exit 0 || sleep 1
done
exit 1

Expand All @@ -301,7 +301,7 @@ jobs:
apt update && yes | apt install -y tshark

for i in {1..10}; do
bash /host/testdata/test_gotls_keylog_stripped.sh /host/ptcpdump/ptcpdump && exit 0 || sleep 1
bash /host/testdata/test_gotls_keylog.sh /host/ptcpdump/ptcpdump gohttpapp_stripped && exit 0 || sleep 1
done
exit 1

Expand All @@ -319,6 +319,6 @@ jobs:
apt update && yes | apt install -y tshark

for i in {1..10}; do
bash /host/testdata/test_gotls_keylog_stripped_pie.sh /host/ptcpdump/ptcpdump && exit 0 || sleep 1
bash /host/testdata/test_gotls_keylog.sh /host/ptcpdump/ptcpdump gohttpapp_stripped_pie && exit 0 || sleep 1
done
exit 1
12 changes: 7 additions & 5 deletions cmd/gotls.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ func getGoKeyLogEventConsumer(opts *Options, packetWriters []writer.PacketWriter
}
}
}
if opts.writeTLSKeyLogPath != "" {
w, err := writer.NewKeyLogFileWriter(opts.writeTLSKeyLogPath)
if opts.getWriteTLSKeyLogPath() != "" {
w, err := writer.NewKeyLogFileWriter(opts.getWriteTLSKeyLogPath())
if err != nil {
return nil, err
}
Expand All @@ -45,20 +45,22 @@ func getGoKeyLogEventConsumer(opts *Options, packetWriters []writer.PacketWriter
}

func attachGoTLSHooks(opts Options, bf *bpf.BPF) error {
if len(opts.subProgArgs) == 0 {
if !opts.shouldEnableGoTLSHooks() {
log.Info("skip go tls hooks")
return nil
}

path, err := exec.LookPath(opts.subProgArgs[0])
if err != nil {
return fmt.Errorf("could not find %s in PATH", opts.subProgArgs[0])
}
if _, err := buildinfo.ReadFile(path); err != nil {
log.Debugf("skip go TLS related logics due to %+v", err)
log.Infof("skip go TLS related logics due to %+v", err)
return nil
}
elff, err := elf.Open(path)
if err != nil {
log.Debugf("skip go TLS related logics due to %+v", err)
log.Infof("skip go TLS related logics due to %+v", err)
return nil
}

Expand Down
18 changes: 18 additions & 0 deletions cmd/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"github.com/mozillazg/ptcpdump/internal/writer"
"github.com/x-way/pktdump"
"os"
"strings"
"time"

Expand Down Expand Up @@ -176,3 +177,20 @@ func (o Options) applyToStdoutWriter(w *writer.StdoutWriter) {
break
}
}

func (o Options) shouldEnableGoTLSHooks() bool {
if len(o.subProgArgs) == 0 {
return false
}
if o.getWriteTLSKeyLogPath() != "" || o.embedTLSKeyLogToPcapng {
return true
}
return false
}

func (o Options) getWriteTLSKeyLogPath() string {
if o.writeTLSKeyLogPath != "" {
return o.writeTLSKeyLogPath
}
return os.Getenv("SSLKEYLOGFILE")
}
10 changes: 6 additions & 4 deletions testdata/test_gotls_keylog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ set -xe

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
CMD="$1"
APP="${SCRIPT_DIR}/gohttpapp/gohttpapp"
APP_NAME="$(basename $2)"
APP="${SCRIPT_DIR}/gohttpapp/${APP_NAME}"
FILE_PREFIX="/tmp/ptcpdump"
KEYLOG_PATH="${FILE_PREFIX}_keylog.txt"
PCAP_FILE="${FILE_PREFIX}_keylog_01.pcap"
PCAPNG_FILE="${FILE_PREFIX}_keylog_01.pcapng"
FILE_SUFFIX="${APP_NAME}"
KEYLOG_PATH="${FILE_PREFIX}_keylog_${FILE_SUFFIX}.txt"
PCAP_FILE="${FILE_PREFIX}_keylog_${FILE_SUFFIX}.pcap"
PCAPNG_FILE="${FILE_PREFIX}_keylog_${FILE_SUFFIX}.pcapng"

function test_keylog_to_file() {
${CMD} -i any --write-keylog-file ${KEYLOG_PATH} -w ${PCAP_FILE} -- ${APP}
Expand Down
29 changes: 0 additions & 29 deletions testdata/test_gotls_keylog_pie.sh

This file was deleted.

29 changes: 0 additions & 29 deletions testdata/test_gotls_keylog_stripped.sh

This file was deleted.

29 changes: 0 additions & 29 deletions testdata/test_gotls_keylog_stripped_pie.sh

This file was deleted.

Loading