mirror of
https://github.com/apernet/OpenGFW.git
synced 2024-12-22 08:59:21 +08:00
Reapply "Merge pull request #132 from eddc005/feat-pcap"
This reverts commit 2ac8783eb6
.
This commit is contained in:
parent
3ec5456e86
commit
8cab86b924
6
.github/workflows/check.yaml
vendored
6
.github/workflows/check.yaml
vendored
@ -23,6 +23,9 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
go-version: 'stable'
|
go-version: 'stable'
|
||||||
|
|
||||||
|
- name: Install pcap
|
||||||
|
run: sudo apt install -y libpcap-dev
|
||||||
|
|
||||||
- run: go vet ./...
|
- run: go vet ./...
|
||||||
|
|
||||||
- name: staticcheck
|
- name: staticcheck
|
||||||
@ -44,4 +47,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
go-version: 'stable'
|
go-version: 'stable'
|
||||||
|
|
||||||
|
- name: Install pcap
|
||||||
|
run: sudo apt install -y libpcap-dev
|
||||||
|
|
||||||
- run: go test ./...
|
- run: go test ./...
|
||||||
|
3
.github/workflows/release.yaml
vendored
3
.github/workflows/release.yaml
vendored
@ -24,6 +24,9 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
go-version: "1.22"
|
go-version: "1.22"
|
||||||
|
|
||||||
|
- name: Install pcap
|
||||||
|
run: sudo apt install -y libpcap-dev
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
env:
|
env:
|
||||||
GOOS: ${{ matrix.goos }}
|
GOOS: ${{ matrix.goos }}
|
||||||
|
36
cmd/root.go
36
cmd/root.go
@ -43,6 +43,7 @@ var logger *zap.Logger
|
|||||||
// Flags
|
// Flags
|
||||||
var (
|
var (
|
||||||
cfgFile string
|
cfgFile string
|
||||||
|
pcapFile string
|
||||||
logLevel string
|
logLevel string
|
||||||
logFormat string
|
logFormat string
|
||||||
)
|
)
|
||||||
@ -118,6 +119,7 @@ func init() {
|
|||||||
|
|
||||||
func initFlags() {
|
func initFlags() {
|
||||||
rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file")
|
rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file")
|
||||||
|
rootCmd.PersistentFlags().StringVarP(&pcapFile, "pcap", "p", "", "pcap file (optional)")
|
||||||
rootCmd.PersistentFlags().StringVarP(&logLevel, "log-level", "l", envOrDefaultString(appLogLevelEnv, "info"), "log level")
|
rootCmd.PersistentFlags().StringVarP(&logLevel, "log-level", "l", envOrDefaultString(appLogLevelEnv, "info"), "log level")
|
||||||
rootCmd.PersistentFlags().StringVarP(&logFormat, "log-format", "f", envOrDefaultString(appLogFormatEnv, "console"), "log format")
|
rootCmd.PersistentFlags().StringVarP(&logFormat, "log-format", "f", envOrDefaultString(appLogFormatEnv, "console"), "log format")
|
||||||
}
|
}
|
||||||
@ -167,6 +169,7 @@ type cliConfig struct {
|
|||||||
IO cliConfigIO `mapstructure:"io"`
|
IO cliConfigIO `mapstructure:"io"`
|
||||||
Workers cliConfigWorkers `mapstructure:"workers"`
|
Workers cliConfigWorkers `mapstructure:"workers"`
|
||||||
Ruleset cliConfigRuleset `mapstructure:"ruleset"`
|
Ruleset cliConfigRuleset `mapstructure:"ruleset"`
|
||||||
|
Replay cliConfigReplay `mapstructure:"replay"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type cliConfigIO struct {
|
type cliConfigIO struct {
|
||||||
@ -177,6 +180,10 @@ type cliConfigIO struct {
|
|||||||
RST bool `mapstructure:"rst"`
|
RST bool `mapstructure:"rst"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type cliConfigReplay struct {
|
||||||
|
Realtime bool `mapstructure:"realtime"`
|
||||||
|
}
|
||||||
|
|
||||||
type cliConfigWorkers struct {
|
type cliConfigWorkers struct {
|
||||||
Count int `mapstructure:"count"`
|
Count int `mapstructure:"count"`
|
||||||
QueueSize int `mapstructure:"queueSize"`
|
QueueSize int `mapstructure:"queueSize"`
|
||||||
@ -197,17 +204,30 @@ func (c *cliConfig) fillLogger(config *engine.Config) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *cliConfig) fillIO(config *engine.Config) error {
|
func (c *cliConfig) fillIO(config *engine.Config) error {
|
||||||
nfio, err := io.NewNFQueuePacketIO(io.NFQueuePacketIOConfig{
|
var ioImpl io.PacketIO
|
||||||
QueueSize: c.IO.QueueSize,
|
var err error
|
||||||
ReadBuffer: c.IO.ReadBuffer,
|
if pcapFile != "" {
|
||||||
WriteBuffer: c.IO.WriteBuffer,
|
// Setup IO for pcap file replay
|
||||||
Local: c.IO.Local,
|
logger.Info("replaying from pcap file", zap.String("pcap file", pcapFile))
|
||||||
RST: c.IO.RST,
|
ioImpl, err = io.NewPcapPacketIO(io.PcapPacketIOConfig{
|
||||||
})
|
PcapFile: pcapFile,
|
||||||
|
Realtime: c.Replay.Realtime,
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
// Setup IO for nfqueue
|
||||||
|
ioImpl, err = io.NewNFQueuePacketIO(io.NFQueuePacketIOConfig{
|
||||||
|
QueueSize: c.IO.QueueSize,
|
||||||
|
ReadBuffer: c.IO.ReadBuffer,
|
||||||
|
WriteBuffer: c.IO.WriteBuffer,
|
||||||
|
Local: c.IO.Local,
|
||||||
|
RST: c.IO.RST,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return configError{Field: "io", Err: err}
|
return configError{Field: "io", Err: err}
|
||||||
}
|
}
|
||||||
config.IO = nfio
|
config.IO = ioImpl
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,12 +58,17 @@ func (e *engine) UpdateRuleset(r ruleset.Ruleset) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e *engine) Run(ctx context.Context) error {
|
func (e *engine) Run(ctx context.Context) error {
|
||||||
|
workerCtx, workerCancel := context.WithCancel(ctx)
|
||||||
|
defer workerCancel() // Stop workers
|
||||||
|
|
||||||
|
// Register IO shutdown
|
||||||
ioCtx, ioCancel := context.WithCancel(ctx)
|
ioCtx, ioCancel := context.WithCancel(ctx)
|
||||||
defer ioCancel() // Stop workers & IO
|
e.io.SetCancelFunc(ioCancel)
|
||||||
|
defer ioCancel() // Stop IO
|
||||||
|
|
||||||
// Start workers
|
// Start workers
|
||||||
for _, w := range e.workers {
|
for _, w := range e.workers {
|
||||||
go w.Run(ioCtx)
|
go w.Run(workerCtx)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Register IO callback
|
// Register IO callback
|
||||||
@ -85,6 +90,8 @@ func (e *engine) Run(ctx context.Context) error {
|
|||||||
return err
|
return err
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
return nil
|
return nil
|
||||||
|
case <-ioCtx.Done():
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,6 +48,9 @@ type PacketIO interface {
|
|||||||
ProtectedDialContext(ctx context.Context, network, address string) (net.Conn, error)
|
ProtectedDialContext(ctx context.Context, network, address string) (net.Conn, error)
|
||||||
// Close closes the packet IO.
|
// Close closes the packet IO.
|
||||||
Close() error
|
Close() error
|
||||||
|
// SetCancelFunc gives packet IO access to context cancel function, enabling it to
|
||||||
|
// trigger a shutdown
|
||||||
|
SetCancelFunc(cancelFunc context.CancelFunc) error
|
||||||
}
|
}
|
||||||
|
|
||||||
type ErrInvalidPacket struct {
|
type ErrInvalidPacket struct {
|
||||||
|
@ -281,6 +281,11 @@ func (n *nfqueuePacketIO) Close() error {
|
|||||||
return n.n.Close()
|
return n.n.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// nfqueue IO does not issue shutdown
|
||||||
|
func (n *nfqueuePacketIO) SetCancelFunc(cancelFunc context.CancelFunc) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (n *nfqueuePacketIO) setupNft(local, rst, remove bool) error {
|
func (n *nfqueuePacketIO) setupNft(local, rst, remove bool) error {
|
||||||
rules, err := generateNftRules(local, rst)
|
rules, err := generateNftRules(local, rst)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
130
io/pcap.go
Normal file
130
io/pcap.go
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
package io
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"hash/crc32"
|
||||||
|
"net"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/google/gopacket"
|
||||||
|
"github.com/google/gopacket/pcap"
|
||||||
|
)
|
||||||
|
|
||||||
|
var _ PacketIO = (*pcapPacketIO)(nil)
|
||||||
|
|
||||||
|
type pcapPacketIO struct {
|
||||||
|
pcap *pcap.Handle
|
||||||
|
lastTime *time.Time
|
||||||
|
ioCancel context.CancelFunc
|
||||||
|
config PcapPacketIOConfig
|
||||||
|
|
||||||
|
dialer *net.Dialer
|
||||||
|
}
|
||||||
|
|
||||||
|
type PcapPacketIOConfig struct {
|
||||||
|
PcapFile string
|
||||||
|
Realtime bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewPcapPacketIO(config PcapPacketIOConfig) (PacketIO, error) {
|
||||||
|
handle, err := pcap.OpenOffline(config.PcapFile)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &pcapPacketIO{
|
||||||
|
pcap: handle,
|
||||||
|
lastTime: nil,
|
||||||
|
ioCancel: nil,
|
||||||
|
config: config,
|
||||||
|
dialer: &net.Dialer{},
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *pcapPacketIO) Register(ctx context.Context, cb PacketCallback) error {
|
||||||
|
go func() {
|
||||||
|
packetSource := gopacket.NewPacketSource(p.pcap, p.pcap.LinkType())
|
||||||
|
for packet := range packetSource.Packets() {
|
||||||
|
p.wait(packet)
|
||||||
|
|
||||||
|
networkLayer := packet.NetworkLayer()
|
||||||
|
if networkLayer != nil {
|
||||||
|
src, dst := networkLayer.NetworkFlow().Endpoints()
|
||||||
|
endpoints := []string{src.String(), dst.String()}
|
||||||
|
sort.Strings(endpoints)
|
||||||
|
id := crc32.Checksum([]byte(strings.Join(endpoints, ",")), crc32.IEEETable)
|
||||||
|
|
||||||
|
cb(&pcapPacket{
|
||||||
|
streamID: id,
|
||||||
|
timestamp: packet.Metadata().Timestamp,
|
||||||
|
data: packet.LinkLayer().LayerPayload(),
|
||||||
|
}, nil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Give the workers a chance to finish everything
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
// Stop the engine when all packets are finished
|
||||||
|
p.ioCancel()
|
||||||
|
}()
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// A normal dialer is sufficient as pcap IO does not mess up with the networking
|
||||||
|
func (p *pcapPacketIO) ProtectedDialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
||||||
|
return p.dialer.DialContext(ctx, network, address)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *pcapPacketIO) SetVerdict(pkt Packet, v Verdict, newPacket []byte) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *pcapPacketIO) SetCancelFunc(cancelFunc context.CancelFunc) error {
|
||||||
|
p.ioCancel = cancelFunc
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *pcapPacketIO) Close() error {
|
||||||
|
p.pcap.Close()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Intentionally slow down the replay
|
||||||
|
// In realtime mode, this is to match the timestamps in the capture
|
||||||
|
func (p *pcapPacketIO) wait(packet gopacket.Packet) error {
|
||||||
|
if !p.config.Realtime {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if p.lastTime == nil {
|
||||||
|
p.lastTime = &packet.Metadata().Timestamp
|
||||||
|
} else {
|
||||||
|
t := packet.Metadata().Timestamp.Sub(*p.lastTime)
|
||||||
|
time.Sleep(t)
|
||||||
|
p.lastTime = &packet.Metadata().Timestamp
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var _ Packet = (*pcapPacket)(nil)
|
||||||
|
|
||||||
|
type pcapPacket struct {
|
||||||
|
streamID uint32
|
||||||
|
timestamp time.Time
|
||||||
|
data []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *pcapPacket) StreamID() uint32 {
|
||||||
|
return p.streamID
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *pcapPacket) Timestamp() time.Time {
|
||||||
|
return p.timestamp
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *pcapPacket) Data() []byte {
|
||||||
|
return p.data
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user