From 17102e1372eb0c410cadfcbe1865547f74ecfbf6 Mon Sep 17 00:00:00 2001 From: Will Date: Fri, 4 Aug 2023 19:55:02 -0400 Subject: [PATCH 1/9] Update README.md - Architecture Linked Twice The link for Architecture is listed twice and the first under further readings was 404 now found anyways. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 3ee3ae07..26f0ba21 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,6 @@ Portmaster is a privacy suite for your desktop OS. #### Further Readings: -- [Portmaster Architecture Overview](https://wiki.safing.io/en/Portmaster/Architecture/Overview) - [SPN Whitepaper](https://safing.io/files/whitepaper/Gate17.pdf) ## Documentation @@ -96,4 +95,3 @@ All details and guides live in the dedicated [wiki](https://wiki.safing.io/) - [VPN Compatibility](https://wiki.safing.io/en/Portmaster/App/Compatibility#vpn-compatibly) - [Software Compatibility](https://wiki.safing.io/en/Portmaster/App/Compatibility) - [Architecture](https://wiki.safing.io/en/Portmaster/Architecture) - From ce3d81067ffef18270ea24d20628dc087f68a606 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 22 Dec 2023 14:26:44 +0100 Subject: [PATCH 2/9] Update deps --- go.mod | 16 +++++++++------- go.sum | 48 ++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index 72c2f627..6bc12678 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( github.com/miekg/dns v1.1.57 github.com/mitchellh/go-server-timing v1.0.1 github.com/oschwald/maxminddb-golang v1.12.0 - github.com/safing/jess v0.3.2 - github.com/safing/portbase v0.18.7-0.20231218160927-7631b9d28afe + github.com/safing/jess v0.3.3 + github.com/safing/portbase v0.18.9 github.com/safing/portmaster-android/go v0.0.0-20230830120134-3226ceac3bec github.com/safing/spn v0.7.4 github.com/shirou/gopsutil v3.21.11+incompatible @@ -39,7 +39,7 @@ require ( github.com/tevino/abool v1.2.0 github.com/umahmood/haversine v0.0.0-20151105152445-808ab04add26 github.com/vincent-petithory/dataurl v1.0.0 - golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 + golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 golang.org/x/net v0.19.0 golang.org/x/sync v0.5.0 golang.org/x/sys v0.15.0 @@ -48,7 +48,7 @@ require ( ) require ( - github.com/VictoriaMetrics/metrics v1.25.3 // indirect + github.com/VictoriaMetrics/metrics v1.29.0 // indirect github.com/aead/ecdh v0.2.0 // indirect github.com/aead/serpent v0.0.0-20160714141033-fba169763ea6 // indirect github.com/alessio/shellescape v1.4.2 // indirect @@ -73,6 +73,7 @@ require ( github.com/hashicorp/errwrap v1.1.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/native v1.1.0 // indirect + github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mdlayher/netlink v1.7.2 // indirect github.com/mdlayher/socket v0.5.0 // indirect @@ -101,16 +102,17 @@ require ( github.com/x448/float16 v0.8.4 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect github.com/zalando/go-keyring v0.2.3 // indirect + github.com/zeebo/blake3 v0.2.3 // indirect go.etcd.io/bbolt v1.3.8 // indirect - golang.org/x/crypto v0.16.0 // indirect + golang.org/x/crypto v0.17.0 // indirect golang.org/x/image v0.14.0 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.16.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gvisor.dev/gvisor v0.0.0-20231215062520-cd4a40b584a5 // indirect - modernc.org/libc v1.37.5 // indirect + gvisor.dev/gvisor v0.0.0-20231222013827-149350e5c428 // indirect + modernc.org/libc v1.38.0 // indirect modernc.org/mathutil v1.6.0 // indirect modernc.org/memory v1.7.2 // indirect modernc.org/sqlite v1.28.0 // indirect diff --git a/go.sum b/go.sum index cd302e16..490d2dc6 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIo github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/VictoriaMetrics/metrics v1.25.3 h1:Zcxyj8JbAB6CQU51Er3D7RBRupcP55DevVQi9cFqo2Q= -github.com/VictoriaMetrics/metrics v1.25.3/go.mod h1:ZKmlI+QN6b9LUC0OiHNp2LiGQGlBy4U1re6Slooln1o= +github.com/VictoriaMetrics/metrics v1.29.0 h1:3qC+jcvymGJaQKt6wsXIlJieVFQwD/par9J1Bxul+Mc= +github.com/VictoriaMetrics/metrics v1.29.0/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8= github.com/Xuanwo/go-locale v1.1.0 h1:51gUxhxl66oXAjI9uPGb2O0qwPECpriKQb2hl35mQkg= github.com/Xuanwo/go-locale v1.1.0/go.mod h1:UKrHoZB3FPIk9wIG2/tVSobnHgNnceGSH3Y8DY5cASs= github.com/aead/ecdh v0.2.0 h1:pYop54xVaq/CEREFEcukHRZfTdjiWvYIsZDXXrBapQQ= @@ -79,8 +79,8 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw github.com/golang/gddo v0.0.0-20180823221919-9d8ff1c67be5/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f h1:16RtHeWGkJMc80Etb8RPCcKevXGldr57+LOyZt8zOlg= github.com/golang/gddo v0.0.0-20210115222349-20d68f94ee1f/go.mod h1:ijRvpgDJDI262hYq/IQVYgf8hd8IHUs93Ol0kvMBAx4= -github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= -github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= +github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68= +github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/lint v0.0.0-20170918230701-e5d664eb928e/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= @@ -142,6 +142,9 @@ github.com/jsimonetti/rtnetlink v0.0.0-20210525051524-4cc836578190/go.mod h1:NmK github.com/jsimonetti/rtnetlink v0.0.0-20211022192332-93da33804786/go.mod h1:v4hqbTdfQngbVSZJVWUhGE/lbTFf9jb+ygmNUDQMuOs= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= +github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= +github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -207,12 +210,10 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f github.com/rot256/pblind v0.0.0-20231024115251-cd3f239f28c1 h1:vfAp3Jbca7Vt8axzmkS5M/RtFJmj0CKmrtWAlHtesaA= github.com/rot256/pblind v0.0.0-20231024115251-cd3f239f28c1/go.mod h1:2x8fbm9T+uTl919COhEVHKGkve1DnkrEnDbtGptZuW8= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/safing/jess v0.3.2 h1:d21+sautJlfTKcwgm6/TohUf0F8DL27Lug2XHBOBqvY= -github.com/safing/jess v0.3.2/go.mod h1:N1Qiw9YBDHSVilocPEWHoGIEi+DvtmGds76rUhAyctU= -github.com/safing/portbase v0.18.6 h1:uMZOG4C0K61QJE7I4fI+55r1I/eV42TJdI1xA02U1yo= -github.com/safing/portbase v0.18.6/go.mod h1:qhhLjrr5iEGU9r7RZ6hJdtulOeycJ0d0jq95ZxGJ9Hs= -github.com/safing/portbase v0.18.7-0.20231218160927-7631b9d28afe h1:JphzTgtBrWwdS4i8g8TJByv8fV1zDvsdh0irf5bx2uQ= -github.com/safing/portbase v0.18.7-0.20231218160927-7631b9d28afe/go.mod h1:qhhLjrr5iEGU9r7RZ6hJdtulOeycJ0d0jq95ZxGJ9Hs= +github.com/safing/jess v0.3.3 h1:0U0bWdO0sFCgox+nMOqISFrnJpVmi+VFOW1xdX6q3qw= +github.com/safing/jess v0.3.3/go.mod h1:t63qHB+4xd1HIv9MKN/qI2rc7ytvx7d6l4hbX7zxer0= +github.com/safing/portbase v0.18.9 h1:j+ToHKQz0U2+Tx4jMP7QPky/H0R4uY6qUM+lIJlO6ks= +github.com/safing/portbase v0.18.9/go.mod h1:Qrh3ck+7VZloFmnozCs9Hj8godhJAi55cmiDiC7BwTc= github.com/safing/portmaster-android/go v0.0.0-20230830120134-3226ceac3bec h1:oSJY1seobofPwpMoJRkCgXnTwfiQWNfGMCPDfqgAEfg= github.com/safing/portmaster-android/go v0.0.0-20230830120134-3226ceac3bec/go.mod h1:abwyAQrZGemWbSh/aCD9nnkp0SvFFf/mGWkAbOwPnFE= github.com/safing/spn v0.7.4 h1:wAE17yWOgL/lEwluRXRj1gM08bhyg1f7GQHKuP3aNSw= @@ -286,16 +287,22 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zalando/go-keyring v0.2.3 h1:v9CUu9phlABObO4LPWycf+zwMG7nlbb3t/B5wa97yms= github.com/zalando/go-keyring v0.2.3/go.mod h1:HL4k+OXQfJUWaMnqyuSOc0drfGPX2b51Du6K+MRgZMk= +github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY= +github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= +github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg= +github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ= +github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= +github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 h1:qCEDpW1G+vcj3Y7Fy52pEM1AWm3abj8WimGYejI3SC4= -golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 h1:+iq7lrkxmFNBM7xx+Rae2W6uyPfhPeDWD+n+JgppptE= +golang.org/x/exp v0.0.0-20231219180239-dc181d75b848/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4= golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= @@ -366,6 +373,7 @@ golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= @@ -397,8 +405,8 @@ google.golang.org/api v0.0.0-20170921000349-586095a6e407/go.mod h1:4mhQ8q/RsB7i+ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -408,12 +416,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gvisor.dev/gvisor v0.0.0-20231215062520-cd4a40b584a5 h1:/tJBYxR5QOOgZxdn4Ug6ikzua1Brenl+ZEUZBjfuRJU= -gvisor.dev/gvisor v0.0.0-20231215062520-cd4a40b584a5/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk= +gvisor.dev/gvisor v0.0.0-20231222013827-149350e5c428 h1:UvBO2UZXf0d1zWJsfD8Robnxa2lyGm8Vnb+Nou5b1no= +gvisor.dev/gvisor v0.0.0-20231222013827-149350e5c428/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk= honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= honnef.co/go/tools v0.2.2/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= -modernc.org/libc v1.37.5 h1:IDpTjKpyMYFenZ7DkOr6Jswhn79yxsXeWHi/4DaFDBA= -modernc.org/libc v1.37.5/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE= +modernc.org/libc v1.38.0 h1:o4Lpk0zNDSdsjfEXnF1FGXWQ9PDi1NOdWcLP5n13FGo= +modernc.org/libc v1.38.0/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE= modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4= modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo= modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E= From 7df3e1fcf7f0cd7e1fa234d711008548c32b1cd0 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 22 Dec 2023 18:09:16 +0100 Subject: [PATCH 3/9] Update SPN dep --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6bc12678..dfbd0547 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/safing/jess v0.3.3 github.com/safing/portbase v0.18.9 github.com/safing/portmaster-android/go v0.0.0-20230830120134-3226ceac3bec - github.com/safing/spn v0.7.4 + github.com/safing/spn v0.7.5 github.com/shirou/gopsutil v3.21.11+incompatible github.com/spf13/cobra v1.8.0 github.com/spkg/zipfs v0.7.1 @@ -48,7 +48,7 @@ require ( ) require ( - github.com/VictoriaMetrics/metrics v1.29.0 // indirect + github.com/VictoriaMetrics/metrics v1.29.1 // indirect github.com/aead/ecdh v0.2.0 // indirect github.com/aead/serpent v0.0.0-20160714141033-fba169763ea6 // indirect github.com/alessio/shellescape v1.4.2 // indirect diff --git a/go.sum b/go.sum index 490d2dc6..d2608d9d 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIo github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/VictoriaMetrics/metrics v1.29.0 h1:3qC+jcvymGJaQKt6wsXIlJieVFQwD/par9J1Bxul+Mc= -github.com/VictoriaMetrics/metrics v1.29.0/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8= +github.com/VictoriaMetrics/metrics v1.29.1 h1:yTORfGeO1T0C6P/tEeT4Mf7rBU5TUu3kjmHvmlaoeO8= +github.com/VictoriaMetrics/metrics v1.29.1/go.mod h1:r7hveu6xMdUACXvB8TYdAj8WEsKzWB0EkpJN+RDtOf8= github.com/Xuanwo/go-locale v1.1.0 h1:51gUxhxl66oXAjI9uPGb2O0qwPECpriKQb2hl35mQkg= github.com/Xuanwo/go-locale v1.1.0/go.mod h1:UKrHoZB3FPIk9wIG2/tVSobnHgNnceGSH3Y8DY5cASs= github.com/aead/ecdh v0.2.0 h1:pYop54xVaq/CEREFEcukHRZfTdjiWvYIsZDXXrBapQQ= @@ -216,8 +216,8 @@ github.com/safing/portbase v0.18.9 h1:j+ToHKQz0U2+Tx4jMP7QPky/H0R4uY6qUM+lIJlO6k github.com/safing/portbase v0.18.9/go.mod h1:Qrh3ck+7VZloFmnozCs9Hj8godhJAi55cmiDiC7BwTc= github.com/safing/portmaster-android/go v0.0.0-20230830120134-3226ceac3bec h1:oSJY1seobofPwpMoJRkCgXnTwfiQWNfGMCPDfqgAEfg= github.com/safing/portmaster-android/go v0.0.0-20230830120134-3226ceac3bec/go.mod h1:abwyAQrZGemWbSh/aCD9nnkp0SvFFf/mGWkAbOwPnFE= -github.com/safing/spn v0.7.4 h1:wAE17yWOgL/lEwluRXRj1gM08bhyg1f7GQHKuP3aNSw= -github.com/safing/spn v0.7.4/go.mod h1:llkmdy3AZq5nR3a8QfUnvh3++L8DcdlLUgljBNvtL4w= +github.com/safing/spn v0.7.5 h1:WfkMs2omLrwxBWccGGG9Akx0AvsvJLG+W7rjWQpQhl4= +github.com/safing/spn v0.7.5/go.mod h1:Hg585WJuib4JI3R7Kndq/10MJPCUl1UmeJJwL3JIwdQ= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/seehuhn/fortuna v1.0.1 h1:lu9+CHsmR0bZnx5Ay646XvCSRJ8PJTi5UYJwDBX68H0= From e2226d2fadada986492ae1ff67176d780ae354da Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 22 Dec 2023 18:09:45 +0100 Subject: [PATCH 4/9] Bump core version --- cmds/portmaster-core/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmds/portmaster-core/main.go b/cmds/portmaster-core/main.go index a27dcf50..1cd4b25c 100644 --- a/cmds/portmaster-core/main.go +++ b/cmds/portmaster-core/main.go @@ -24,7 +24,7 @@ import ( func main() { // set information - info.Set("Portmaster", "1.6.3", "AGPLv3", true) + info.Set("Portmaster", "1.6.4", "AGPLv3", true) // Set default log level. log.SetLogLevel(log.WarningLevel) From 67e2dba0d5094c0601bc61b6a0ee3060fd9a43e7 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 10 Jan 2024 14:10:42 +0100 Subject: [PATCH 5/9] Use sk->sk_protocol instead of udp.pcflag to detect UDPLite protocol in eBPF --- .../ebpf/connection_listener/bpf_bpfeb.o | Bin 36560 -> 32288 bytes .../ebpf/connection_listener/bpf_bpfel.o | Bin 36560 -> 32288 bytes firewall/interception/ebpf/programs/monitor.c | 6 +++--- firewall/interception/ebpf/programs/update.sh | 0 4 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 firewall/interception/ebpf/programs/update.sh diff --git a/firewall/interception/ebpf/connection_listener/bpf_bpfeb.o b/firewall/interception/ebpf/connection_listener/bpf_bpfeb.o index e8e7cdb7b368369546e5e3dbddb1b97f06c90825..4049e6dc2ad85a000ced63e516ca94b2110e7b48 100644 GIT binary patch delta 3032 zcmY+Gdr(wW9LLYOJVan&6t}`KW6hbOrgHT*6QvWD&1lnO_=B1Jqj6~R4|Aqu%IPuD(C>He#rx~b>^YzB_xJmq zbM9f!T}DnS;RzWkP`bkByDhKsPUEnHdLep^AvjyW z?Wm@Dhe#r0RIe5Gwmrg0da4?ACh3oj_~Okjv6%FzlX~H7-m8yd*abV}TsR+HGs9&# z$r;AD*#Sz-ZfC1YnMDRoG&wohH`^&B%06@A84!wjEWYHX5cJ8-(Z*x$i<7TFVp5@e zUaLr|mU2JT#Lm(}$x%`ARX8@Y4*p3^hTAhUBG}(FR(x}gfq)!ul7S`tqeTP z0tYM>gT&?vdzk+o^8?I(pZSNF{~`0wGCyMY56~drV1WxpK=<3>Qg$6IaV6SLSQ&CR z+@F(`vyVAXF+R;W3|n&wZGFsn0>U{5DxYJ{i;VSSHIHu-^Vc#yqcysQrF;oe)wQ;M z7C5SPtL0I)XPDIuU*;7SwONk%gV;RQot7^*FmBbd^DjopQ`%Tzij*C2*V`^nLQ7Gb zd>KZIs_VD2+-;2gjJp^=$yh&cbNyYgzBsFLJ&U$5ZW3bdU^E$KGtXrQNt5@&rQ$5P z5yr4@gy@nyTPKTdg^H4OkdU8fn@_H}>K2HUG|9uzQ#{9ZjAi#gX=%B96a1xhavcnn zWHG;uiFVJ9f{XW(wpA#!DG*v^e12ZV7h><3kpwU9{L8WE^6Aobf5fA29xe z@fDr*`!3ugEO3MI&x|K6R&9*a7^{p+8P_nbXS@o+k2nJA7R$1aS*-dQv-42uF&A2F9%x zCzV_5>0;c=_%)qV^e>lNVSzKyQ(K^TA`q!{q_3uLI#Mf0ogqcA<_Jd5*1QA1L7Yn638+nLnieEEy z&K;oyX+tASry^fx+JQXIbS|zh{$d6e=&w9F5tL4tLK&cfMy9D?6VtRn3)7VEXPWXmnWp?6rYXOV=>Qdkm_Y>t zOjE(2soxdKAjKmrPW3}fQ~a{2uL8QsHjlJIFEga|sV}%ksf0e<2d+QzFfhP4!isiIqLim+=P?U delta 7288 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 Wh@;C@2RU?Gx`G0_4bklzqW=dY%k?J! diff --git a/firewall/interception/ebpf/connection_listener/bpf_bpfel.o b/firewall/interception/ebpf/connection_listener/bpf_bpfel.o index 5241f58ebd540dab34c823871c8d4fafd3b05c6e..1c31943f1e2187d77302f5ed0927928351901a05 100644 GIT binary patch delta 2866 zcmYk8ZBSHI7=X_?dijQT^fn#N{y=skC@v+o)1JHN1?OkeY%ix@YoIeVz#F6FZDk7`IFY_v7lT zgQ24_t6x7eJzKkII>xpe;)^GlF|4RX)e4Z)Zb=f+vm7@KH-W9u0hw?;+2GgDj{yw~$z8D_cEpRv8$&YEt87JcTr`j3YQqDv0pZz!w!!bv_V*rn4 z4AJ|H7&8SSEz8CS!JG9tKdAkhH8I8fHYsg{Ay+9stX+3iarYY}v6t`|S#Kv)=GYu6 z$(|JZx6H>PW9PVuQZW4K&@NvQ;5On96dr0IJ z7;^9BZ$g2`=I$l&O@!AH9@W-(COCfwGL^OFK9cCyx|Gs5^L`TA2bXg5cndtrwK-Zz zd;{SoZRYF?aeP?2nU}$N2RzDe=R>f$pao9*Q{YBHQNdPHy@hZa;V#0Pq0(>T+hLtQ zyX;jG-$u9|d2EJ$dE;XjnTcjnvkT7qv-w82iTgU>g}LTVl6?(I3fDu@>=bixENW_i zGllj12<-RU%tvE!(G3MfrTk;qUbL96hi{6qLGh>Xb?`?~6>O@om;B|?&mwg>_Qcwl zSc&okb4iTF&&HA~QyE)j6kL)F=PG7+1pd6rFzdujBJ#_~0c4B8OOPG2;NJ?LT7!sx zEE`iePeWv@WdH{rgefF0T@Lw+pG)E^jCy(HiZPC3irmd7yo~V17^`e+OjrluLxe9l z#HR07j%4|K>q?))&r7%N;t_2KQC~p z8Q$1OcM&cm93Wgncmv@k!llu-iGCJcBz~Ci2T{(@i{uv^ht8v3I8ZfLob|#NRo1L= z(sG6HFJ8D+HMjg43H?U+A>k*46MV4)*?rne3$J@}^Iv!_pCvbKQQBMPl()Ckx9tjb zgc?Jw&ayIRbxqBx6}2ns*DS1AR$aU3tDQe^ZBF|huAS(pOi<_HV!Lts-HpG?`GN%u zugYf3Tq{_c;YZOE>jdjG{4;c4t6<&47oqnMPe&ghZb2V3{BP_p?i4B;A%W?gf{hVR zM?Y)0KZmiLeS(b>Pe;FM_(S{vzOY~s;&$|F#I5Lm68D8w!5))>|!c}3)cvLT7M zJb;C`thW=F^-kilULh{)^NCwk49Mr5Jm7MCi24Qvt0Qhl-$dMsE?*L~zKyu7m#=_l zd0F30T&~|kT$K$2Bp@3GiOYsD!%yM~TF3B~ki6_4CocOh8h#b)lfM@1w&D00^>Nqm zL^n%hB7&D(+q`cnZ<}5$@qW0^Ys~QzQWwz%g?p k?CL8P^FnZ{uU!1o2={T?76M;?x#;PHW}Mo#!>NAH|EKPjSpWb4 delta 7166 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 = 6; // Set protocol for UDPLite - if(us->udp.pcflag == 0) { - udp_info->protocol = UDP; - } else { + if(sk->sk_protocol == IPPROTO_UDPLITE) { udp_info->protocol = UDPLite; + } else { + udp_info->protocol = UDP; } // Send event diff --git a/firewall/interception/ebpf/programs/update.sh b/firewall/interception/ebpf/programs/update.sh old mode 100644 new mode 100755 From 8312c7c6b51bce0e05b62c7b36e11d95db833106 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 11 Jan 2024 10:03:40 +0100 Subject: [PATCH 6/9] Add UDPLite check to ip4_datagram_connect hook --- .../ebpf/connection_listener/bpf_bpfeb.o | Bin 32288 -> 32456 bytes .../ebpf/connection_listener/bpf_bpfel.o | Bin 32288 -> 32456 bytes firewall/interception/ebpf/programs/monitor.c | 18 +++++++++++------- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/firewall/interception/ebpf/connection_listener/bpf_bpfeb.o b/firewall/interception/ebpf/connection_listener/bpf_bpfeb.o index 4049e6dc2ad85a000ced63e516ca94b2110e7b48..7c9e91d7fc08c2f663505f09277b49d41c45a58b 100644 GIT binary patch delta 2361 zcmZ9OO>7%Q6oB81f46BXH%b$S8oD&K>!P-H3Q2m1@G1xqi69yEKo1pl!3r%+QcD$T z634Q+MIwOPsYImaU@j;J4z65@6hXBT9CEZ!4>@pHsXg?-AreSbq6psGT{mxM$%weS2WMa<>`C*syuWI0OZvn*pEFNPJnr9WzK8+j=U51mLmC)T$@j)j!_Tx$Qbt%{R?Zcl%=V9r+kg)*} z>jH?M)Ij-!nC(oK|C8cKXY!M(sP}RC7*m20V~W4RnBpspDSmN}>zg#7 zv1f1-_%+HTC9S(R8A5^XDi5g z@*lz{j1RWFg@WRHd;#@@DqqhDqjTqaHC*381FhZ<2-6!ec2|X8sppT-3vo6z&TDLG zTnutOQVJR(6^$DjH#Kf)+}7CExEtU)M4W&DBD+C$OUvFkn$Y~F#(9k`jfi*4l>rYT)CnHXWma#!2IH!== zzA;W|JgM=F#utNJFy?{=gOX^ms5i{L+y6a`Eq@qnE~EW@;+$b)%QYJo3BO z@!FbFjrpj0ymVyW(rFxzO$@2{@(*HB*~{|>?_+CxdCJef9uo*?QS{s*3S!LG>uWoxr_x7gGzu#l`F9oT| F{{a{~43+=@ delta 2207 zcmZA1UuaWj6aet^eNED&otTccrr1GT|Cl5#!0O+p|!3X#YJwZ5pXC|t;&7S_I*VDCh4I-3(6r>Tt z*B2mYlKMpT&$iSl6{*I?ejBNd%>S;;+pDA1XYnuF0;>S+6##YDOfDW((dy#je_Hib z7jI-$&Ijs+#u^>#TY!)M0CmL+Fcd|PQW7`J4}AsNk9qJr{vLF&7h}2#s*`;fhinh@ zgC3-Mn3?Ky?bLq{^h6&(4knz$6VQ{?5VJk-Ip|9VFitz(0zF6djN@NGCy!yAXFiMZ z2J?p)7ntc{i;iD`&Wz*vp~Mp17?+vp02SMVpMqW;#CV&T>N~cFUV{FSE~w5N!uT&{ zT9F3xF+4xKVF{eDe=C{?#0kpJ>UaW0{{<}}osjx*e{bp!GgE(rnffi}98H+D6T|00 z7iq#AGfjvyQ-6Y)`qRwRpJAr{JTvugw7gKH358aoNE3?8G@`u9DD@j>(G=BV;lJ?X3`w~GmXtHIN7o8DGl_tL>xzc(yw3CDzI-OhRA z?u0ijoEI(#mxL?AHQ~C;Iq>ef65wsPO`i+?ANzvBVPQ)+COpfHudXl76X>*XUbrA! z60Qi>gzL=o>G18c1i9gMJCd(Jdr&wmYzfDNXIrN8LwmfHXgV#N7cK~wge$@|;m2rt zqdd@wBVND@9F$rAZnI|{Bf90z3*+A+o59Q%IqG3gzW<%u0ea0?JvfkkKMpg~)7JbL{hXTr%uKGFH=8SmJ2F3EH*WY1sjNIuev`ImI2+?pRtjm44FwbsH|Gi94>eTYvA$_&`mf33}wVbiAE z$X@!;VdQMAgFa+0qYrzi3uDcgQpO(o7<{TQArE`#-U<^`ROa`cdt$$Qhu(AV?>ql` z{^Ta5S8DaOD#rEcsrx+z-P#2j0Iq(y4Re5Y6}$J@fa);2oA=(UBuuKQdk=m(uYk_?_a-=-n^h2*YTW;@vaKzlrB+8FIf1t__GoLnv7PbIX@%qEG zjvQ8_<-w8vwc1@CygaSEt=#~jnt~SW_bc0@pM{v4%v}Y$n6(|tw(?HWC*RX?*(;7}Vw;jUrVGSwg zQ&@ldh=#25x77ZMhDqn2&^>t#1?G>?v&?OIPeYLf!dPM6`9JL7_^gH!^A7YPa~pce z`Pe~#gL4{|ncL8-&UmYb+2!Z!lAX=gd(wxUHZLseXOy>I2lbj!gBV zqJE6oqXFuBTW^qL6=;C8^9;>kQNuarC_2L&L0@5}`dMbGKe=fSs6k;fUYb;T z=HKze{--t+u)D)cwQUuE7PJ4x_v(bH+&F)RhL5{SR7_3@$CG}b8E>t4rI@MyIp(nW zVj`hJFAb$O;#Pi^3)0CE*p} zYJ)v|7c~R`HiYf6@D-qCVvY$Xg;T<5ZX6#nJb=y$7lez#CE+FE72ztgM|)ah0rG}0 z;MWT!IvVy22*-qz!YSeOrajwXW;0-&6)p%Dg-gOq!Yjhnw|>W;QSEI2ZQ5^ty(iyd zr)=j;AG$ei^Xu(X-ajlt3-(mFnU)Gu{gc(nOpix}-xnShzR>88VXQF#dEq(X1>s1v zW7kge&E&Ivy%&$e@X3=&|JHl4-n^!PjG%xZ)q0SM%r=QJ-GXtTu314Y* gXJ$ahbLRJ%58|uievsbzl;}pkq})>59~=~a1KKSN1poj5 delta 2223 zcmZA2OK1~a6ae6JZ*5Hc{c&1#OnpGqTGOI76*U#A&98`{B2`=z6q{Ho->&?C+Cv6GvAqW=5goFWcs(t z{!*E+&R%)cl-4zCKm)+J^NX#ir_<^dx@IrtbE)UJl(;HPZpE&(TtGayR%#dH-7BPgvJXwy zPJV>-b*7;^=e2n??aC=*P=7b7JAI{ z7p&irax`RFU|CATICCvJ=Xq;AK>e_WN#^3%+eKU#J-P(h{~04f+`rh;+L6L^94I6e}#pXw)>slMQO8uJ5B%N2B|4$Kk@mpX?$VKl&Bu{w;Osz2A=7v@sz+1i)YaYLWM3&rUtemp`Ue+ppxnQ9 GivIpid = __builtin_bswap32((u32)(bpf_get_current_pid_tgid() >> 32)); - // Set src and dist ports + // Set src and dst ports udp_info->sport = __builtin_bswap16(sk->__sk_common.skc_num); udp_info->dport = sk->__sk_common.skc_dport; - // Set src and dist IPs + // Set src and dst IPs udp_info->saddr[0] = __builtin_bswap32(sk->__sk_common.skc_rcv_saddr); udp_info->daddr[0] = __builtin_bswap32(sk->__sk_common.skc_daddr); // Set IP version udp_info->ipVersion = 4; - // Set protocol. No way to detect udplite for ipv4 - udp_info->protocol = UDP; + // Set protocol + if(sk->sk_protocol == IPPROTO_UDPLITE) { + udp_info->protocol = UDPLite; + } else { + udp_info->protocol = UDP; + } // Send event bpf_ringbuf_submit(udp_info, 0); @@ -154,11 +158,11 @@ int BPF_PROG(udp_v6_connect, struct sock *sk) { // Read PID (Careful: This is the Thread Group ID in kernel speak!) udp_info->pid = __builtin_bswap32((u32)(bpf_get_current_pid_tgid() >> 32)); - // Set src and dist ports + // Set src and dst ports udp_info->sport = __builtin_bswap16(sk->__sk_common.skc_num); udp_info->dport = sk->__sk_common.skc_dport; - // Set src and dist IPs + // Set src and dst IPs for(int i = 0; i < 4; i++) { udp_info->saddr[i] = __builtin_bswap32(sk->__sk_common.skc_v6_rcv_saddr.in6_u.u6_addr32[i]); } @@ -169,7 +173,7 @@ int BPF_PROG(udp_v6_connect, struct sock *sk) { // IP version udp_info->ipVersion = 6; - // Set protocol for UDPLite + // Set protocol if(sk->sk_protocol == IPPROTO_UDPLITE) { udp_info->protocol = UDPLite; } else { From ce6f39629f274b2e56a4c1fb162b07dd7488601b Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 11 Jan 2024 10:14:18 +0100 Subject: [PATCH 7/9] Update deps --- go.mod | 16 ++++++++-------- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index dfbd0547..9421ce7f 100644 --- a/go.mod +++ b/go.mod @@ -39,10 +39,10 @@ require ( github.com/tevino/abool v1.2.0 github.com/umahmood/haversine v0.0.0-20151105152445-808ab04add26 github.com/vincent-petithory/dataurl v1.0.0 - golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 - golang.org/x/net v0.19.0 - golang.org/x/sync v0.5.0 - golang.org/x/sys v0.15.0 + golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e + golang.org/x/net v0.20.0 + golang.org/x/sync v0.6.0 + golang.org/x/sys v0.16.0 gopkg.in/yaml.v3 v3.0.1 zombiezen.com/go/sqlite v1.0.0 ) @@ -104,15 +104,15 @@ require ( github.com/zalando/go-keyring v0.2.3 // indirect github.com/zeebo/blake3 v0.2.3 // indirect go.etcd.io/bbolt v1.3.8 // indirect - golang.org/x/crypto v0.17.0 // indirect - golang.org/x/image v0.14.0 // indirect + golang.org/x/crypto v0.18.0 // indirect + golang.org/x/image v0.15.0 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.16.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - gvisor.dev/gvisor v0.0.0-20231222013827-149350e5c428 // indirect - modernc.org/libc v1.38.0 // indirect + gvisor.dev/gvisor v0.0.0-20240110202538-8053cd8f0bf6 // indirect + modernc.org/libc v1.40.1 // indirect modernc.org/mathutil v1.6.0 // indirect modernc.org/memory v1.7.2 // indirect modernc.org/sqlite v1.28.0 // indirect diff --git a/go.sum b/go.sum index d2608d9d..d9fdd161 100644 --- a/go.sum +++ b/go.sum @@ -299,12 +299,12 @@ golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 h1:+iq7lrkxmFNBM7xx+Rae2W6uyPfhPeDWD+n+JgppptE= -golang.org/x/exp v0.0.0-20231219180239-dc181d75b848/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= -golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4= -golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e h1:723BNChdd0c2Wk6WOE320qGBiPtYx0F0Bbm1kriShfE= +golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= +golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= +golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -333,15 +333,15 @@ golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20170517211232-f52d1811a629/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= -golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -375,8 +375,8 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -416,12 +416,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gvisor.dev/gvisor v0.0.0-20231222013827-149350e5c428 h1:UvBO2UZXf0d1zWJsfD8Robnxa2lyGm8Vnb+Nou5b1no= -gvisor.dev/gvisor v0.0.0-20231222013827-149350e5c428/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk= +gvisor.dev/gvisor v0.0.0-20240110202538-8053cd8f0bf6 h1:Ass5FAjCCQ5WECPE9NN7ItZnKJ38i6sM8MCMNBGee5I= +gvisor.dev/gvisor v0.0.0-20240110202538-8053cd8f0bf6/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk= honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= honnef.co/go/tools v0.2.2/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY= -modernc.org/libc v1.38.0 h1:o4Lpk0zNDSdsjfEXnF1FGXWQ9PDi1NOdWcLP5n13FGo= -modernc.org/libc v1.38.0/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE= +modernc.org/libc v1.40.1 h1:ZhRylEBcj3GyQbPVC8JxIg7SdrT4JOxIDJoUon0NfF8= +modernc.org/libc v1.40.1/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE= modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4= modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo= modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E= From e9940d77a01f32cc11d3ed70e19482bdea773fc5 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 11 Jan 2024 10:14:41 +0100 Subject: [PATCH 8/9] Bump core version --- cmds/portmaster-core/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmds/portmaster-core/main.go b/cmds/portmaster-core/main.go index 1cd4b25c..517f604a 100644 --- a/cmds/portmaster-core/main.go +++ b/cmds/portmaster-core/main.go @@ -24,7 +24,7 @@ import ( func main() { // set information - info.Set("Portmaster", "1.6.4", "AGPLv3", true) + info.Set("Portmaster", "1.6.5", "AGPLv3", true) // Set default log level. log.SetLogLevel(log.WarningLevel) From f2839c274a952efbc842e0defc6ce863aa7ad7f2 Mon Sep 17 00:00:00 2001 From: Daniel Hovie Date: Fri, 23 Feb 2024 14:01:12 +0100 Subject: [PATCH 9/9] Update README.md --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 961d8b8e..84e08c08 100644 --- a/README.md +++ b/README.md @@ -87,10 +87,7 @@ Portmaster is a privacy suite for your Windows and Linux desktop. - Change routing algorithm and focus per app. - Nodes are hosted by Safing (company behind Portmaster) and the community. - Speeds are pretty decent (>100MBit/s). - -#### Further Readings: - -- [SPN Whitepaper](https://safing.io/files/whitepaper/Gate17.pdf) +- Further Reading: [SPN Whitepaper](https://safing.io/files/whitepaper/Gate17.pdf) ## Documentation