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

Improve api firewall bypass

Browse Source
This commit is contained in:
Daniel
2019-08-09 17:16:56 +02:00
parent fc8fab1a03
commit 0a5981c657
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
firewall/api.go
View File

@@ -23,9 +23,8 @@ import (
var (
dataRoot *utils.DirStructure
apiAddressSet bool
apiIP net.IP
apiPort uint16
apiPortSet bool
apiPort uint16
)
func prepAPIAuth() error {
@@ -35,11 +34,13 @@ func prepAPIAuth() error {
func startAPIAuth() {
var err error
apiIP, apiPort, err = parseHostPort(apiListenAddress())
_, apiPort, err = parseHostPort(apiListenAddress())
if err != nil {
log.Warningf("firewall: failed to parse API address for improved api auth mechanism: %s", err)
return
}
apiAddressSet = true
apiPortSet = true
log.Tracef("firewall: api port set to %d", apiPort)
}
func apiAuthenticator(s *http.Server, r *http.Request) (grantAccess bool, err error) {

4
firewall/firewall.go
View File

@@ -111,8 +111,8 @@ func handlePacket(pkt packet.Packet) {
}
// allow api access, if address was parsed successfully
if apiAddressSet {
if (pkt.Info().DstPort == apiPort && pkt.Info().Dst.Equal(apiIP)) || (pkt.Info().SrcPort == apiPort && pkt.Info().Src.Equal(apiIP)) {
if apiPortSet {
if (pkt.Info().DstPort == apiPort || pkt.Info().SrcPort == apiPort) && pkt.Info().Src.Equal(pkt.Info().Dst) {
log.Debugf("accepting api connection: %s", pkt)
pkt.PermanentAccept()
return