Update org import paths

This commit is contained in:
Daniel 2019-07-02 15:12:31 +02:00
parent 619e11d8e1
commit 9741bc412e
108 changed files with 274 additions and 274 deletions

38
Gopkg.lock generated
View file

@ -4,7 +4,7 @@
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:636265d7c62365795e14a5d323a48db1409795adf96241bea7335d054f9d1879" digest = "1:636265d7c62365795e14a5d323a48db1409795adf96241bea7335d054f9d1879"
name = "github.com/Safing/portbase" name = "github.com/safing/portbase"
packages = [ packages = [
"api", "api",
"config", "config",
@ -349,24 +349,24 @@
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
input-imports = [ input-imports = [
"github.com/Safing/portbase/api", "github.com/safing/portbase/api",
"github.com/Safing/portbase/config", "github.com/safing/portbase/config",
"github.com/Safing/portbase/crypto/hash", "github.com/safing/portbase/crypto/hash",
"github.com/Safing/portbase/crypto/random", "github.com/safing/portbase/crypto/random",
"github.com/Safing/portbase/database", "github.com/safing/portbase/database",
"github.com/Safing/portbase/database/dbmodule", "github.com/safing/portbase/database/dbmodule",
"github.com/Safing/portbase/database/iterator", "github.com/safing/portbase/database/iterator",
"github.com/Safing/portbase/database/query", "github.com/safing/portbase/database/query",
"github.com/Safing/portbase/database/record", "github.com/safing/portbase/database/record",
"github.com/Safing/portbase/database/storage", "github.com/safing/portbase/database/storage",
"github.com/Safing/portbase/database/storage/bbolt", "github.com/safing/portbase/database/storage/bbolt",
"github.com/Safing/portbase/info", "github.com/safing/portbase/info",
"github.com/Safing/portbase/log", "github.com/safing/portbase/log",
"github.com/Safing/portbase/modules", "github.com/safing/portbase/modules",
"github.com/Safing/portbase/notifications", "github.com/safing/portbase/notifications",
"github.com/Safing/portbase/utils", "github.com/safing/portbase/utils",
"github.com/Safing/portbase/utils/osdetail", "github.com/safing/portbase/utils/osdetail",
"github.com/Safing/portbase/utils/testutils", "github.com/safing/portbase/utils/testutils",
"github.com/agext/levenshtein", "github.com/agext/levenshtein",
"github.com/cloudflare/cfssl/crypto/pkcs7", "github.com/cloudflare/cfssl/crypto/pkcs7",
"github.com/cookieo9/resources-go", "github.com/cookieo9/resources-go",

View file

@ -1,4 +1,4 @@
ignored = ["github.com/Safing/portbase", "github.com/Safing/safing-core", "github.com/Safing/safing-core/formats/varint"] ignored = ["github.com/safing/portbase", "github.com/safing/safing-core", "github.com/safing/safing-core/formats/varint"]
[prune] [prune]
go-tests = true go-tests = true

View file

@ -32,7 +32,7 @@ If you want to know more, here are [the docs](http://docs.safing.io/).
The `pmctl` command will help you get up and running. It will bootstrap your the environment and download additional files it needs. All commands need the `--db` parameter with the database location, as this is where all the data and also the binaries live. The `pmctl` command will help you get up and running. It will bootstrap your the environment and download additional files it needs. All commands need the `--db` parameter with the database location, as this is where all the data and also the binaries live.
Just download `pmctl` from the [releases page](https://github.com/Safing/portmaster/releases) and put it somewhere comfortable. You may freely choose where you want to put the database - it needs to be the same for all commands. Here we go - run every command in a seperate terminal window: Just download `pmctl` from the [releases page](https://github.com/safing/portmaster/releases) and put it somewhere comfortable. You may freely choose where you want to put the database - it needs to be the same for all commands. Here we go - run every command in a seperate terminal window:
# start the portmaster: # start the portmaster:
sudo ./pmctl run core --db=/opt/pm_db sudo ./pmctl run core --db=/opt/pm_db
@ -48,7 +48,7 @@ Just download `pmctl` from the [releases page](https://github.com/Safing/portmas
#### Feedback #### Feedback
We'd love to know what you think, drop by on [our forum](https://discourse.safing.community/) and let us know! We'd love to know what you think, drop by on [our forum](https://discourse.safing.community/) and let us know!
If you want to report a bug, please [open an issue on Github](https://github.com/Safing/portmaster/issues/new). If you want to report a bug, please [open an issue on Github](https://github.com/safing/portmaster/issues/new).
## Documentation ## Documentation

2
build
View file

@ -54,5 +54,5 @@ if [[ $1 == "dev" ]]; then
fi fi
# build # build
BUILD_PATH="github.com/Safing/portbase/info" BUILD_PATH="github.com/safing/portbase/info"
go build $DEV -ldflags "-X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" $* go build $DEV -ldflags "-X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" $*

View file

@ -1,13 +1,13 @@
package core package core
import ( import (
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
"github.com/Safing/portbase/notifications" "github.com/safing/portbase/notifications"
// module dependencies // module dependencies
_ "github.com/Safing/portbase/database/dbmodule" _ "github.com/safing/portbase/database/dbmodule"
_ "github.com/Safing/portbase/database/storage/bbolt" _ "github.com/safing/portbase/database/storage/bbolt"
) )
func init() { func init() {

View file

@ -7,12 +7,12 @@ import (
"runtime" "runtime"
"syscall" "syscall"
"github.com/Safing/portbase/info" "github.com/safing/portbase/info"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
// include packages here // include packages here
_ "github.com/Safing/portmaster/nameserver/only" _ "github.com/safing/portmaster/nameserver/only"
) )
func main() { func main() {

View file

@ -1,8 +1,8 @@
package firewall package firewall
import ( import (
"github.com/Safing/portbase/config" "github.com/safing/portbase/config"
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
) )
var ( var (

View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"net" "net"
"github.com/Safing/portmaster/intel" "github.com/safing/portmaster/intel"
) )
func init() { func init() {

View file

@ -8,16 +8,16 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
"github.com/Safing/portmaster/firewall/inspection" "github.com/safing/portmaster/firewall/inspection"
"github.com/Safing/portmaster/firewall/interception" "github.com/safing/portmaster/firewall/interception"
"github.com/Safing/portmaster/network" "github.com/safing/portmaster/network"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
// module dependencies // module dependencies
_ "github.com/Safing/portmaster/core" _ "github.com/safing/portmaster/core"
_ "github.com/Safing/portmaster/profile" _ "github.com/safing/portmaster/profile"
) )
var ( var (

View file

@ -5,8 +5,8 @@ package inspection
import ( import (
"sync" "sync"
"github.com/Safing/portmaster/network" "github.com/safing/portmaster/network"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
) )
const ( const (

View file

@ -10,13 +10,13 @@ import (
"github.com/google/gopacket/layers" "github.com/google/gopacket/layers"
"github.com/google/gopacket/tcpassembly" "github.com/google/gopacket/tcpassembly"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/firewall/inspection" "github.com/safing/portmaster/firewall/inspection"
"github.com/Safing/portmaster/firewall/inspection/tls/tlslib" "github.com/safing/portmaster/firewall/inspection/tls/tlslib"
"github.com/Safing/portmaster/firewall/inspection/tls/verify" "github.com/safing/portmaster/firewall/inspection/tls/verify"
"github.com/Safing/portmaster/network" "github.com/safing/portmaster/network"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
) )
// TODO: // TODO:

View file

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/Safing/portmaster/firewall/inspection/tls/tlslib" "github.com/safing/portmaster/firewall/inspection/tls/tlslib"
) )
var clientHelloSample = []byte{ var clientHelloSample = []byte{

View file

@ -13,9 +13,9 @@ import (
"github.com/cloudflare/cfssl/crypto/pkcs7" "github.com/cloudflare/cfssl/crypto/pkcs7"
"github.com/Safing/portbase/crypto/hash" "github.com/safing/portbase/crypto/hash"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
) )
// Cert saves a certificate. // Cert saves a certificate.

View file

@ -12,10 +12,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/Safing/portbase/crypto/hash" "github.com/safing/portbase/crypto/hash"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
// CARevocationInfo saves Information on revokation of Certificates of a Certificate Authority. // CARevocationInfo saves Information on revokation of Certificates of a Certificate Authority.

View file

@ -14,8 +14,8 @@ import (
"golang.org/x/crypto/ocsp" "golang.org/x/crypto/ocsp"
"github.com/Safing/portbase/crypto/hash" "github.com/safing/portbase/crypto/hash"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
var ( var (

View file

@ -6,8 +6,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/Safing/portbase/crypto/hash" "github.com/safing/portbase/crypto/hash"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
) )
// useful references: // useful references:

View file

@ -2,7 +2,7 @@
package interception package interception
import "github.com/Safing/portmaster/network/packet" import "github.com/safing/portmaster/network/packet"
var ( var (
// Packets channel for feeding the firewall. // Packets channel for feeding the firewall.

View file

@ -3,12 +3,12 @@ package interception
import ( import (
"fmt" "fmt"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/notifications" "github.com/safing/portbase/notifications"
"github.com/Safing/portbase/utils/osdetail" "github.com/safing/portbase/utils/osdetail"
"github.com/Safing/portmaster/firewall/interception/windowskext" "github.com/safing/portmaster/firewall/interception/windowskext"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
"github.com/Safing/portmaster/updates" "github.com/safing/portmaster/updates"
) )
var Packets chan packet.Packet var Packets chan packet.Packet

View file

@ -7,7 +7,7 @@ package nfqueue
// import ( // import (
// "sync" // "sync"
// //
// "github.com/Safing/portmaster/network/packet" // "github.com/safing/portmaster/network/packet"
// ) // )
// //
// type multiQueue struct { // type multiQueue struct {

View file

@ -20,7 +20,7 @@ import (
"time" "time"
"unsafe" "unsafe"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
) )
var queues map[uint16]*NFQueue var queues map[uint16]*NFQueue

View file

@ -5,7 +5,7 @@ package nfqueue
import ( import (
"fmt" "fmt"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
) )
var ( var (

View file

@ -7,7 +7,7 @@ import (
"github.com/coreos/go-iptables/iptables" "github.com/coreos/go-iptables/iptables"
"github.com/Safing/portmaster/firewall/interception/nfqueue" "github.com/safing/portmaster/firewall/interception/nfqueue"
) )
// iptables -A OUTPUT -p icmp -j", "NFQUEUE", "--queue-num", "1", "--queue-bypass // iptables -A OUTPUT -p icmp -j", "NFQUEUE", "--queue-num", "1", "--queue-bypass

View file

@ -6,8 +6,8 @@ import (
"github.com/tevino/abool" "github.com/tevino/abool"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
) )
// VerdictRequest is the request structure from the Kext. // VerdictRequest is the request structure from the Kext.

View file

@ -9,8 +9,8 @@ import (
"time" "time"
"unsafe" "unsafe"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/network" "github.com/safing/portmaster/network"
"github.com/tevino/abool" "github.com/tevino/abool"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
) )

View file

@ -5,9 +5,9 @@ import (
"github.com/tevino/abool" "github.com/tevino/abool"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/network" "github.com/safing/portmaster/network"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
) )
// Packet represents an IP packet. // Packet represents an IP packet.

View file

@ -6,9 +6,9 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/firewall/interception/windowskext" "github.com/safing/portmaster/firewall/interception/windowskext"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
) )
var ( var (

View file

@ -7,15 +7,15 @@ import (
"strings" "strings"
"time" "time"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/notifications" "github.com/safing/portbase/notifications"
"github.com/Safing/portmaster/intel" "github.com/safing/portmaster/intel"
"github.com/Safing/portmaster/network" "github.com/safing/portmaster/network"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
"github.com/Safing/portmaster/profile" "github.com/safing/portmaster/profile"
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/agext/levenshtein" "github.com/agext/levenshtein"

View file

@ -4,8 +4,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/Safing/portbase/crypto/random" "github.com/safing/portbase/crypto/random"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
type portStatus struct { type portStatus struct {

View file

@ -1,8 +1,8 @@
package intel package intel
import ( import (
"github.com/Safing/portbase/config" "github.com/safing/portbase/config"
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
) )
var ( var (

View file

@ -6,8 +6,8 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
) )
var ( var (

View file

@ -5,9 +5,9 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
"github.com/Safing/portbase/utils" "github.com/safing/portbase/utils"
) )
var ( var (

View file

@ -5,11 +5,11 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
// module dependencies // module dependencies
_ "github.com/Safing/portmaster/core" _ "github.com/safing/portmaster/core"
) )
func init() { func init() {

View file

@ -4,9 +4,9 @@ import (
"os" "os"
"testing" "testing"
"github.com/Safing/portbase/database/dbmodule" "github.com/safing/portbase/database/dbmodule"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

View file

@ -13,7 +13,7 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
// DNS Classes // DNS Classes

View file

@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
) )
var ( var (

View file

@ -13,9 +13,9 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
) )
// TODO: make resolver interface for http package // TODO: make resolver interface for http package

View file

@ -11,10 +11,10 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/network/environment" "github.com/safing/portmaster/network/environment"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
) )
// Resolver holds information about an active resolver. // Resolver holds information about an active resolver.

View file

@ -4,7 +4,7 @@ import (
"errors" "errors"
"strings" "strings"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/miekg/dns" "github.com/miekg/dns"
) )

14
main.go
View file

@ -9,15 +9,15 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/Safing/portbase/info" "github.com/safing/portbase/info"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
// include packages here // include packages here
_ "github.com/Safing/portmaster/core" _ "github.com/safing/portmaster/core"
_ "github.com/Safing/portmaster/firewall" _ "github.com/safing/portmaster/firewall"
_ "github.com/Safing/portmaster/nameserver" _ "github.com/safing/portmaster/nameserver"
_ "github.com/Safing/portmaster/ui" _ "github.com/safing/portmaster/ui"
) )
var ( var (

View file

@ -9,14 +9,14 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
"github.com/Safing/portmaster/analytics/algs" "github.com/safing/portmaster/analytics/algs"
"github.com/Safing/portmaster/firewall" "github.com/safing/portmaster/firewall"
"github.com/Safing/portmaster/intel" "github.com/safing/portmaster/intel"
"github.com/Safing/portmaster/network" "github.com/safing/portmaster/network"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
) )
var ( var (

View file

@ -7,13 +7,13 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
"github.com/Safing/portmaster/analytics/algs" "github.com/safing/portmaster/analytics/algs"
"github.com/Safing/portmaster/intel" "github.com/safing/portmaster/intel"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
) )
var ( var (

View file

@ -6,10 +6,10 @@ import (
"os" "os"
"time" "time"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/notifications" "github.com/safing/portbase/notifications"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
) )
func checkForConflictingService(err error) { func checkForConflictingService(err error) {

View file

@ -5,8 +5,8 @@ package network
import ( import (
"time" "time"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
) )
var ( var (

View file

@ -10,13 +10,13 @@ import (
"sync" "sync"
"time" "time"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/intel" "github.com/safing/portmaster/intel"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
"github.com/Safing/portmaster/profile" "github.com/safing/portmaster/profile"
) )
// Communication describes a logical connection between a process and a domain. // Communication describes a logical connection between a process and a domain.

View file

@ -6,12 +6,12 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/database/iterator" "github.com/safing/portbase/database/iterator"
"github.com/Safing/portbase/database/query" "github.com/safing/portbase/database/query"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
"github.com/Safing/portbase/database/storage" "github.com/safing/portbase/database/storage"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
) )
var ( var (

View file

@ -4,7 +4,7 @@ import (
"net" "net"
"strings" "strings"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
) )
func GetAssignedAddresses() (ipv4 []net.IP, ipv6 []net.IP, err error) { func GetAssignedAddresses() (ipv4 []net.IP, ipv6 []net.IP, err error) {

View file

@ -11,7 +11,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
// TODO: find a good way to identify a network // TODO: find a good way to identify a network

View file

@ -12,8 +12,8 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
) )
// Gateways returns the currently active gateways // Gateways returns the currently active gateways

View file

@ -10,7 +10,7 @@ import (
"os" "os"
"time" "time"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
"golang.org/x/net/icmp" "golang.org/x/net/icmp"
"golang.org/x/net/ipv4" "golang.org/x/net/ipv4"

View file

@ -6,8 +6,8 @@ import (
maxminddb "github.com/oschwald/maxminddb-golang" maxminddb "github.com/oschwald/maxminddb-golang"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/updates" "github.com/safing/portmaster/updates"
) )
var ( var (

View file

@ -8,9 +8,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
) )
// FirewallHandler defines the function signature for a firewall handle function // FirewallHandler defines the function signature for a firewall handle function

View file

@ -1,7 +1,7 @@
package network package network
import ( import (
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
) )
func init() { func init() {

View file

@ -5,9 +5,9 @@ import (
"os" "os"
"time" "time"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
) )
// GetOwnComm returns the communication for the given packet, that originates from // GetOwnComm returns the communication for the given packet, that originates from

View file

@ -3,9 +3,9 @@ package network
import ( import (
"time" "time"
"github.com/Safing/portmaster/network/netutils" "github.com/safing/portmaster/network/netutils"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
) )
// Static reasons // Static reasons

View file

@ -48,5 +48,5 @@ echo "This information is useful for debugging and license compliance."
echo "Run the compiled binary with the -version flag to see the information included." echo "Run the compiled binary with the -version flag to see the information included."
# build # build
BUILD_PATH="github.com/Safing/portbase/info" BUILD_PATH="github.com/safing/portbase/info"
go build -ldflags "-X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" $* go build -ldflags "-X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" $*

View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/Safing/portmaster/updates" "github.com/safing/portmaster/updates"
) )
func getFile(identifier string) (*updates.File, error) { func getFile(identifier string) (*updates.File, error) {

View file

@ -7,9 +7,9 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/Safing/portbase/info" "github.com/safing/portbase/info"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/updates" "github.com/safing/portmaster/updates"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View file

@ -7,8 +7,8 @@ import (
"path/filepath" "path/filepath"
"runtime" "runtime"
"github.com/Safing/portbase/info" "github.com/safing/portbase/info"
"github.com/Safing/portmaster/updates" "github.com/safing/portmaster/updates"
) )
func checkForUpgrade() (update *updates.File) { func checkForUpgrade() (update *updates.File) {

View file

@ -7,9 +7,9 @@ import (
processInfo "github.com/shirou/gopsutil/process" processInfo "github.com/shirou/gopsutil/process"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/profile" "github.com/safing/portmaster/profile"
"github.com/tevino/abool" "github.com/tevino/abool"
) )

View file

@ -5,8 +5,8 @@ import (
"errors" "errors"
"net" "net"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/network/packet" "github.com/safing/portmaster/network/packet"
) )
// Errors // Errors

View file

@ -1,7 +1,7 @@
package process package process
import ( import (
"github.com/Safing/portmaster/process/proc" "github.com/safing/portmaster/process/proc"
) )
var ( var (

View file

@ -1,7 +1,7 @@
package process package process
import ( import (
"github.com/Safing/portmaster/process/iphelper" "github.com/safing/portmaster/process/iphelper"
) )
var ( var (

View file

@ -5,7 +5,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/Safing/portmaster/process/iphelper" "github.com/safing/portmaster/process/iphelper"
) )
func main() { func main() {

View file

@ -4,10 +4,10 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/database/query" "github.com/safing/portbase/database/query"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/profile" "github.com/safing/portmaster/profile"
) )
var ( var (

View file

@ -10,7 +10,7 @@ import (
"sync" "sync"
"syscall" "syscall"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
var ( var (

View file

@ -13,7 +13,7 @@ import (
"sync" "sync"
"unicode" "unicode"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
/* /*

View file

@ -12,9 +12,9 @@ import (
processInfo "github.com/shirou/gopsutil/process" processInfo "github.com/shirou/gopsutil/process"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/profile" "github.com/safing/portmaster/profile"
) )
var ( var (

View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/utils/osdetail" "github.com/safing/portbase/utils/osdetail"
) )
// IsUser returns whether the process is run by a normal user. // IsUser returns whether the process is run by a normal user.

View file

@ -10,7 +10,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
var ( var (

View file

@ -4,7 +4,7 @@ import (
"context" "context"
"sync" "sync"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
var ( var (

View file

@ -1,7 +1,7 @@
package profile package profile
import ( import (
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
) )
// core:profiles/user/12345-1234-125-1234-1235 // core:profiles/user/12345-1234-125-1234-1235

View file

@ -1,7 +1,7 @@
package profile package profile
import ( import (
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
) )
func makeDefaultGlobalProfile() *Profile { func makeDefaultGlobalProfile() *Profile {

View file

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/Safing/portmaster/intel" "github.com/safing/portmaster/intel"
) )
// Endpoints is a list of permitted or denied endpoints. // Endpoints is a list of permitted or denied endpoints.

View file

@ -4,7 +4,7 @@ import (
"net" "net"
"testing" "testing"
"github.com/Safing/portbase/utils/testutils" "github.com/safing/portbase/utils/testutils"
) )
func testEndpointDomainMatch(t *testing.T, ep *EndpointPermission, domain string, expectedResult EPResult) { func testEndpointDomainMatch(t *testing.T, ep *EndpointPermission, domain string, expectedResult EPResult) {

View file

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
) )
// Flags are used to quickly add common attributes to profiles // Flags are used to quickly add common attributes to profiles

View file

@ -3,7 +3,7 @@ package profile
import ( import (
"testing" "testing"
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
) )
func TestProfileFlags(t *testing.T) { func TestProfileFlags(t *testing.T) {

View file

@ -9,7 +9,7 @@ package profile
// "regexp" // "regexp"
// "strings" // "strings"
// //
// "github.com/Safing/portbase/log" // "github.com/safing/portbase/log"
// ) // )
// //
// type Framework struct { // type Framework struct {

View file

@ -4,7 +4,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/Safing/portbase/utils" "github.com/safing/portbase/utils"
) )
// GetPathIdentifier returns the identifier from the given path // GetPathIdentifier returns the identifier from the given path

View file

@ -6,8 +6,8 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
"github.com/Safing/portbase/utils" "github.com/safing/portbase/utils"
) )
// ProfileIndex links an Identifier to Profiles // ProfileIndex links an Identifier to Profiles

View file

@ -1,13 +1,13 @@
package index package index
import ( import (
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/database/query" "github.com/safing/portbase/database/query"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
"github.com/Safing/portmaster/profile" "github.com/safing/portmaster/profile"
) )
// FIXME: listen for profile changes and update the index // FIXME: listen for profile changes and update the index

View file

@ -1,7 +1,7 @@
package matching package matching
import ( import (
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
) )
// core:profiles/user/12345-1234-125-1234-1235 // core:profiles/user/12345-1234-125-1234-1235

View file

@ -3,8 +3,8 @@ package matcher
import ( import (
"strings" "strings"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
"github.com/Safing/portmaster/profile" "github.com/safing/portmaster/profile"
) )
// CheckFingerprints checks what fingerprints match and returns the total score. // CheckFingerprints checks what fingerprints match and returns the total score.

View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
"github.com/Safing/portmaster/profile" "github.com/safing/portmaster/profile"
) )
// GetIdentificationPath returns the identifier for the given process (linux edition). // GetIdentificationPath returns the identifier for the given process (linux edition).

View file

@ -3,7 +3,7 @@ package matcher
import ( import (
"testing" "testing"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
) )
func TestGetIdentifierLinux(t *testing.T) { func TestGetIdentifierLinux(t *testing.T) {

View file

@ -4,10 +4,10 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/process" "github.com/safing/portmaster/process"
"github.com/Safing/portmaster/profile" "github.com/safing/portmaster/profile"
"github.com/Safing/portmaster/profile/index" "github.com/safing/portmaster/profile/index"
) )
// GetProfileSet finds a local profile. // GetProfileSet finds a local profile.

View file

@ -1,10 +1,10 @@
package profile package profile
import ( import (
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
// module dependencies // module dependencies
_ "github.com/Safing/portmaster/core" _ "github.com/safing/portmaster/core"
) )
var ( var (

View file

@ -7,8 +7,8 @@ import (
uuid "github.com/satori/go.uuid" uuid "github.com/satori/go.uuid"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
) )
var ( var (

View file

@ -5,7 +5,7 @@ import (
"net" "net"
"sync" "sync"
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
) )
var ( var (

View file

@ -5,8 +5,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/Safing/portbase/utils/testutils" "github.com/safing/portbase/utils/testutils"
"github.com/Safing/portmaster/status" "github.com/safing/portmaster/status"
) )
var ( var (

View file

@ -3,7 +3,7 @@ package profile
import ( import (
"sync" "sync"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
) )
var ( var (

View file

@ -4,9 +4,9 @@ import (
"strings" "strings"
"sync/atomic" "sync/atomic"
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/database/query" "github.com/safing/portbase/database/query"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
func initUpdateListener() error { func initUpdateListener() error {

View file

@ -1,9 +1,9 @@
package status package status
import ( import (
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/database/query" "github.com/safing/portbase/database/query"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
) )
const ( const (

View file

@ -1,7 +1,7 @@
package status package status
import ( import (
"github.com/Safing/portbase/config" "github.com/safing/portbase/config"
) )
type ( type (

View file

@ -1,12 +1,12 @@
package status package status
import ( import (
"github.com/Safing/portbase/database" "github.com/safing/portbase/database"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
// module dependencies // module dependencies
_ "github.com/Safing/portmaster/core" _ "github.com/safing/portmaster/core"
) )
var ( var (

View file

@ -3,7 +3,7 @@ package status
import ( import (
"sync/atomic" "sync/atomic"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
// autopilot automatically adjusts the security level as needed // autopilot automatically adjusts the security level as needed

View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/Safing/portbase/database/record" "github.com/safing/portbase/database/record"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
var ( var (

View file

@ -1,6 +1,6 @@
package threats package threats
import ( import (
_ "github.com/Safing/portmaster/threats/arp" _ "github.com/safing/portmaster/threats/arp"
_ "github.com/Safing/portmaster/threats/portscan" _ "github.com/safing/portmaster/threats/portscan"
) )

View file

@ -5,7 +5,7 @@ import (
"os" "os"
"strings" "strings"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
) )
const ( const (

View file

@ -1,8 +1,8 @@
package ui package ui
import ( import (
"github.com/Safing/portbase/api" "github.com/safing/portbase/api"
"github.com/Safing/portbase/modules" "github.com/safing/portbase/modules"
) )
func init() { func init() {

View file

@ -13,9 +13,9 @@ import (
resources "github.com/cookieo9/resources-go" resources "github.com/cookieo9/resources-go"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/Safing/portbase/api" "github.com/safing/portbase/api"
"github.com/Safing/portbase/log" "github.com/safing/portbase/log"
"github.com/Safing/portmaster/updates" "github.com/safing/portmaster/updates"
) )
var ( var (

Some files were not shown because too many files have changed in this diff Show more