github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix SPN bootstrapping

Browse Source
This commit is contained in:
Daniel
2021-11-29 07:50:29 +01:00
parent 95c78eec40
commit 3bcb6f377c
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
firewall/interception.go
View File

@@ -376,26 +376,32 @@ func initialHandler(conn *network.Connection, pkt packet.Packet) {
conn.Process().Profile() != nil && conn.Process().Profile() != nil &&
conn.Process().Profile().UseSPN() { conn.Process().Profile().UseSPN() {
// Exclude requests of the SPN itself. switch {
if !captain.IsExcepted(conn.Entity.IP) { case captain.ClientBootstrapping() &&
conn.Tunneled = true conn.Process().Pid == ownPID:
// Exclude the Portmaster during SPN bootstrapping.
// Check if client is ready. case captain.IsExcepted(conn.Entity.IP) &&
if captain.ClientReady() { conn.Process().Pid == ownPID:
// Queue request in sluice. // Exclude requests of the SPN itself.
err := sluice.AwaitRequest(conn, crew.HandleSluiceRequest)
if err != nil { case captain.ClientReady():
log.Tracer(pkt.Ctx()).Warningf("failed to rqeuest tunneling: %s", err) // Queue request in sluice.
conn.Failed("failed to request tunneling", "") err := sluice.AwaitRequest(conn, crew.HandleSluiceRequest)
} else { if err != nil {
log.Tracer(pkt.Ctx()).Trace("filter: tunneling requested") log.Tracer(pkt.Ctx()).Warningf("failed to rqeuest tunneling: %s", err)
conn.Verdict = network.VerdictRerouteToTunnel conn.Failed("failed to request tunneling", "")
}
} else { } else {
// Block connection as SPN is not ready yet. log.Tracer(pkt.Ctx()).Trace("filter: tunneling requested")
log.Tracer(pkt.Ctx()).Trace("SPN not ready for tunneling") conn.Verdict = network.VerdictRerouteToTunnel
conn.Failed("SPN not ready for tunneling", "") conn.Tunneled = true
} }
default:
// Block connection as SPN is not ready yet.
log.Tracer(pkt.Ctx()).Trace("SPN not ready for tunneling")
conn.Failed("SPN not ready for tunneling", "")
} }
} }