diff --git a/Gopkg.lock b/Gopkg.lock index 9c084201..68febc82 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,309 +2,194 @@ [[projects]] - branch = "master" - digest = "1:636265d7c62365795e14a5d323a48db1409795adf96241bea7335d054f9d1879" - name = "github.com/Safing/portbase" - packages = [ - "api", - "config", - "container", - "crypto/hash", - "crypto/random", - "database", - "database/accessor", - "database/dbmodule", - "database/iterator", - "database/query", - "database/record", - "database/storage", - "database/storage/bbolt", - "formats/dsd", - "formats/varint", - "info", - "log", - "modules", - "notifications", - "taskmanager", - "utils", - "utils/osdetail", - "utils/testutils", - ] - pruneopts = "" - revision = "60dbbe55e94597e23305ebb7ed1ddbb074fa25b7" - -[[projects]] - digest = "1:f82b8ac36058904227087141017bb82f4b0fc58272990a4cdae3e2d6d222644e" + digest = "1:e92f5581902c345eb4ceffdcd4a854fb8f73cf436d47d837d1ec98ef1fe0a214" name = "github.com/StackExchange/wmi" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338" version = "1.0.0" [[projects]] - digest = "1:3b186fcaa1c0b374249e76601cd4d5c8c7f0712f8ad419f2e8288c7b9e7ed520" - name = "github.com/aead/serpent" - packages = ["."] - pruneopts = "" - revision = "fba169763ea663f7496376e5cdf709e4c7504704" - version = "v0.1" - -[[projects]] - digest = "1:3c753679736345f50125ae993e0a2614da126859921ea7faeecda6d217501ce2" + digest = "1:90afd0cfdffcc3df7855160ee2954cbca286e23c4eb9cb3d075536c9e4e1b04f" name = "github.com/agext/levenshtein" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "0ded9c86537917af2ff89bc9c78de6bd58477894" version = "v1.2.2" [[projects]] - branch = "master" - digest = "1:baf770c4efa1883bb5e444614e85b8028bbad33913aca290a43298f65d9df485" - name = "github.com/bluele/gcache" - packages = ["."] - pruneopts = "" - revision = "bc40bd6538339bd4be8cb0b48fc33fdf012ddb6e" - -[[projects]] - digest = "1:04be39ea2e9e54ccb36ad938cc7fd991845b07efa7cd5b497a534085df2155ec" + digest = "1:e097b70eeb55d10325f576ec2f97221d8ae18a3569cb0bc404863bde944788b8" name = "github.com/cloudflare/cfssl" packages = [ "crypto/pkcs7", "errors", ] - pruneopts = "" + pruneopts = "UT" revision = "768cd563887febaad559b511aaa5964823ccb4ab" version = "1.3.3" [[projects]] branch = "v2.1" - digest = "1:3fc5d0d9cb474736e8e6c2f2292e0763b5132c6e7d8cbedf7bde404a470c8c3b" + digest = "1:1a2c0956b86c464f8ee91a46e0947dac7251f1d6fb7d3ad89cb9b376273ece82" name = "github.com/cookieo9/resources-go" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "d27c04069d0d5dfe11c202dacbf745ae8d1ab181" [[projects]] - digest = "1:166e24c91c2732657d2f791d3ee3897e7d85ece7cbb62ad991250e6b51fc1d4c" + digest = "1:3b4fcce8036672adc21c09d8e288f7b7590e76a468fae5a13346366e778e5ff8" name = "github.com/coreos/go-iptables" packages = ["iptables"] - pruneopts = "" + pruneopts = "UT" revision = "78b5fff24e6df8886ef8eca9411f683a884349a5" version = "v0.4.1" [[projects]] - digest = "1:b6581f9180e0f2d5549280d71819ab951db9d511478c87daca95669589d505c0" + digest = "1:440028f55cb322d8cb5b9d5ebec298a00b7d74690a658fe6b1c0c0b44341bfae" name = "github.com/go-ole/go-ole" packages = [ ".", "oleutil", ] - pruneopts = "" + pruneopts = "UT" revision = "97b6244175ae18ea6eef668034fd6565847501c9" version = "v1.2.4" [[projects]] - digest = "1:cc1255e2fef3819bfab3540277001e602892dd431ef9ab5499bcdbc425923d64" + digest = "1:b3d20bcdedab2050e6bc58e52f4fdc46f710b4c74e1a1ecee262ebec1aee7b6e" name = "github.com/godbus/dbus" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "2ff6f7ffd60f0f2410b3105864bdd12c7894f844" version = "v5.0.1" [[projects]] - digest = "1:e85e59c4152d8576341daf54f40d96c404c264e04941a4a36b97a0f427eb9e5e" + digest = "1:0d40612c9acf7173aa742ee335bf344524add9c8d7e818992b610f3982350101" name = "github.com/google/gopacket" packages = [ ".", "layers", "tcpassembly", ] - pruneopts = "" + pruneopts = "UT" revision = "6d3e2615da4ed2ed2a349918fe74e7e6d03482fa" version = "v1.1.17" [[projects]] - digest = "1:20dc576ad8f98fe64777c62f090a9b37dd67c62b23fe42b429c2c41936aa8a9c" + digest = "1:c3388642e07731a240e14f4bc7207df59cfcc009447c657b9de87fec072d07e3" name = "github.com/google/renameio" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "f0e32980c006571efd537032e5f9cd8c1a92819e" version = "v0.1.0" [[projects]] - digest = "1:ec5262e6c65f9fcedc01d7789ee4e18ad429dde822cfd50e57e3fd77c4d70c73" + digest = "1:cbec35fe4d5a4fba369a656a8cd65e244ea2c743007d8f6c1ccb132acf9d1296" name = "github.com/gorilla/mux" packages = ["."] - pruneopts = "" - revision = "ed099d42384823742bba0bf9a72b53b55c9e2e38" - version = "v1.7.2" - -[[projects]] - digest = "1:09aa5dd1332b93c96bde671bafb053249dc813febf7d5ca84e8f382ba255d67d" - name = "github.com/gorilla/websocket" - packages = ["."] - pruneopts = "" - revision = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d" - version = "v1.4.0" + pruneopts = "UT" + revision = "00bdffe0f3c77e27d2cf6f5c70232a2d3e4d9c15" + version = "v1.7.3" [[projects]] digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" name = "github.com/inconshreveable/mousetrap" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" version = "v1.0" [[projects]] branch = "master" - digest = "1:e71cc6b377264002aec0d9c235087e51ad7a3c1fb341bb4baa84709308b94fe8" + digest = "1:f433da6fbabb0bd1bd730fd340782015c644123d02eb78c20c69ce03352daad1" name = "github.com/kardianos/osext" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "2bc1f35cddc0cc527b4bc3dce8578fc2a6c11384" [[projects]] - digest = "1:49b2165427f1eecc536ccc1b34129f1f9240b85d1c54228f3aeb6d4275e3daf3" + digest = "1:66def2f80d5127123c81ffa876242c12d3b7b06188f6645d79b3cc4acba637b3" name = "github.com/miekg/dns" packages = ["."] - pruneopts = "" - revision = "d16ecb693e3f8d524769fefce2192a4c92207ff9" - version = "v1.1.13" + pruneopts = "UT" + revision = "b13675009d59c97f3721247d9efa8914e1866a5b" + version = "v1.1.15" [[projects]] - digest = "1:3819cd861b7abd7d12dc1ea52ecb998ad1171826a76ecf0aefa09545781091f9" + digest = "1:8186cc518f5dcea736d7725e284632937971fdf29fa2953fdfa53f631e21a799" name = "github.com/oschwald/maxminddb-golang" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "2905694a1b00c5574f1418a7dbf8a22a7d247559" version = "v1.3.1" [[projects]] - digest = "1:7f569d906bdd20d906b606415b7d794f798f91a62fcfb6a4daa6d50690fb7a3f" + digest = "1:274f67cb6fed9588ea2521ecdac05a6d62a8c51c074c1fccc6a49a40ba80e925" name = "github.com/satori/go.uuid" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" version = "v1.2.0" [[projects]] - branch = "master" - digest = "1:8ea5e33ea56cafca3c9636a8251d651f33431450ecb11bcb21ecf9e5d5017c7e" - name = "github.com/seehuhn/fortuna" - packages = ["."] - pruneopts = "" - revision = "f376bbcd33f446d4431a641aead7851fcbeafa08" - -[[projects]] - branch = "master" - digest = "1:3e67cb161714c815dfe346a3c1d386b44bab7bd907473acf437171f5577bee88" - name = "github.com/seehuhn/sha256d" - packages = ["."] - pruneopts = "" - revision = "e9f377c596061894b7f9ee69aab61e62c3ccc13e" - -[[projects]] - digest = "1:ab6d9cca43e0a89aacd6657db0adb5a6597ed51f81ad0e4f2db516728eb63185" + digest = "1:36ff5e7a8aa3e7d01b9ca22d441484d9c43247b6e34e379c404d17a2e0098091" name = "github.com/shirou/gopsutil" packages = [ "cpu", - "host", "internal/common", "mem", "net", "process", ] - pruneopts = "" - revision = "fa9845945e5b5c6ffb19b436586ff702a30417c5" - version = "v2.19.04" + pruneopts = "UT" + revision = "4c8b404ee5c53b04b04f34b1744a26bf5d2910de" + version = "v2.19.6" [[projects]] branch = "master" digest = "1:99c6a6dab47067c9b898e8c8b13d130c6ab4ffbcc4b7cc6236c2cd0b1e344f5b" name = "github.com/shirou/w32" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b" [[projects]] - digest = "1:78715f4ed019d19795e67eed1dc63f525461d925616b1ed02b72582c01362440" + digest = "1:e096613fb7cf34743d49af87d197663cfccd61876e2219853005a57baedfa562" name = "github.com/spf13/cobra" packages = ["."] - pruneopts = "" - revision = "67fc4837d267bc9bfd6e47f77783fcc3dffc68de" - version = "v0.0.4" + pruneopts = "UT" + revision = "f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5" + version = "v0.0.5" [[projects]] - digest = "1:cbaf13cdbfef0e4734ed8a7504f57fe893d471d62a35b982bf6fb3f036449a66" + digest = "1:c1b1102241e7f645bc8e0c22ae352e8f0dc6484b6cb4d132fa9f24174e0119e2" name = "github.com/spf13/pflag" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "298182f68c66c05229eb03ac171abe6e309ee79a" version = "v1.0.3" [[projects]] branch = "master" - digest = "1:86e6712cfd4070a2120c03fcec41cfcbbc51813504a74e28d74479edfaf669ee" + digest = "1:93d6687fc19da8a35c7352d72117a6acd2072dfb7e9bfd65646227bf2a913b2a" name = "github.com/tevino/abool" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "9b9efcf221b50905aab9bbabd3daed56dc10f339" -[[projects]] - digest = "1:eade4ea6782f5eed4a6b3138a648f9a332900650804fd206e5daaf99cc5613ea" - name = "github.com/tidwall/gjson" - packages = ["."] - pruneopts = "" - revision = "eee0b6226f0d1db2675a176fdfaa8419bcad4ca8" - version = "v1.2.1" - -[[projects]] - digest = "1:72511ec1089fee111c995492d1d390a38ac7ab888aabdb1188985f2a1719c599" - name = "github.com/tidwall/match" - packages = ["."] - pruneopts = "" - revision = "33827db735fff6510490d69a8622612558a557ed" - version = "v1.0.1" - [[projects]] branch = "master" - digest = "1:1d7cab09854959fe179fe2f209400626f3dda9ec8e8b719c661d7b2add7b54b5" - name = "github.com/tidwall/pretty" - packages = ["."] - pruneopts = "" - revision = "1166b9ac2b65e46a43d8618d30d1554f4652d49b" - -[[projects]] - digest = "1:04a1f04f50d734222dc3da57368771a1d6a4e4c7418d19e17285d7c1d1936939" - name = "github.com/tidwall/sjson" - packages = ["."] - pruneopts = "" - revision = "25fb082a20e29e83fb7b7ef5f5919166aad1f084" - version = "v1.0.4" - -[[projects]] - branch = "master" - digest = "1:21097653bd7914de1262f2429e277933507442f892815a791ce1c0dbf0a8dc20" + digest = "1:2a9f7ca80c3035b7e68a927db100922d4a266a31cea2568d9a5185a90b469279" name = "github.com/umahmood/haversine" packages = ["."] - pruneopts = "" + pruneopts = "UT" revision = "808ab04add26660fd241ddb7973886c6dd6669e8" -[[projects]] - digest = "1:8fe1bf6222077787bf88db4eae509f1c910743be1b82e1a6a57444fe092fc4a5" - name = "go.etcd.io/bbolt" - packages = ["."] - pruneopts = "" - revision = "63597a96ec0ad9e6d43c3fc81e809909e0237461" - version = "v1.3.2" - [[projects]] branch = "master" - digest = "1:23603929c559ebf5fa44cc2ed4a72ae729292e2b7e0295ab0e743641f0a47535" + digest = "1:bf3f59dec5aa79945bd4b45c0c649c99d03609565acdd6a087f4cd6e9e5b5544" name = "golang.org/x/crypto" packages = [ - "blake2b", - "blake2s", "chacha20poly1305", "curve25519", "ed25519", @@ -313,14 +198,13 @@ "internal/subtle", "ocsp", "poly1305", - "sha3", ] - pruneopts = "" - revision = "20be4c3c3ed52bfccdb2d59a412ee1a936d175a7" + pruneopts = "UT" + revision = "4def268fd1a49955bfb3dda92fe3db4f924f2285" [[projects]] branch = "master" - digest = "1:3fcc745bd071aa073bd666e01ff8df5fc72ab15f493ae7246710c66c738aab45" + digest = "1:caffb9a4f8c756941de4b3eb577abd167e7fd4b570f2078c05ceb8835a1514cb" name = "golang.org/x/net" packages = [ "bpf", @@ -330,43 +214,25 @@ "ipv4", "ipv6", ] - pruneopts = "" - revision = "f3200d17e092c607f615320ecaad13d87ad9a2b3" + pruneopts = "UT" + revision = "da137c7871d730100384dbcf36e6f8fa493aef5b" [[projects]] branch = "master" - digest = "1:42729e4b5f90f33713c3eb772316cac71baf3344965a9fd9a86ab54b46bff88b" + digest = "1:7e3e63385ebe2dd5210be1534c516d8ae33c7ffac74126e5243d43ba7222e0d4" name = "golang.org/x/sys" packages = [ "cpu", "unix", "windows", ] - pruneopts = "" - revision = "69e3a3a65b5bed52b8194d33c59d955757d87523" + pruneopts = "UT" + revision = "04f50cda93cbb67f2afa353c52f342100e80e625" [solve-meta] analyzer-name = "dep" analyzer-version = 1 input-imports = [ - "github.com/Safing/portbase/api", - "github.com/Safing/portbase/config", - "github.com/Safing/portbase/crypto/hash", - "github.com/Safing/portbase/crypto/random", - "github.com/Safing/portbase/database", - "github.com/Safing/portbase/database/dbmodule", - "github.com/Safing/portbase/database/iterator", - "github.com/Safing/portbase/database/query", - "github.com/Safing/portbase/database/record", - "github.com/Safing/portbase/database/storage", - "github.com/Safing/portbase/database/storage/bbolt", - "github.com/Safing/portbase/info", - "github.com/Safing/portbase/log", - "github.com/Safing/portbase/modules", - "github.com/Safing/portbase/notifications", - "github.com/Safing/portbase/utils", - "github.com/Safing/portbase/utils/osdetail", - "github.com/Safing/portbase/utils/testutils", "github.com/agext/levenshtein", "github.com/cloudflare/cfssl/crypto/pkcs7", "github.com/cookieo9/resources-go", diff --git a/Gopkg.toml b/Gopkg.toml index 4f115cc5..d398ae51 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,4 +1,102 @@ -ignored = ["github.com/Safing/portbase", "github.com/Safing/safing-core", "github.com/Safing/safing-core/formats/varint"] +# Gopkg.toml example +# +# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" +# +# [prune] +# non-go = false +# go-tests = true +# unused-packages = true + +ignored = ["github.com/safing/portbase/*"] + +[[constraint]] + name = "github.com/agext/levenshtein" + version = "1.2.2" + +[[constraint]] + name = "github.com/cloudflare/cfssl" + version = "1.3.3" + +[[constraint]] + branch = "v2.1" + name = "github.com/cookieo9/resources-go" + +[[constraint]] + name = "github.com/coreos/go-iptables" + version = "0.4.1" + +[[constraint]] + name = "github.com/godbus/dbus" + version = "5.0.1" + +[[constraint]] + name = "github.com/google/gopacket" + version = "1.1.17" + +[[constraint]] + name = "github.com/google/renameio" + version = "0.1.0" + +[[constraint]] + name = "github.com/gorilla/mux" + version = "1.7.3" + +[[constraint]] + name = "github.com/miekg/dns" + version = "1.1.15" + +[[constraint]] + name = "github.com/oschwald/maxminddb-golang" + version = "1.3.1" + +[[constraint]] + name = "github.com/satori/go.uuid" + version = "1.2.0" + +[[constraint]] + name = "github.com/shirou/gopsutil" + version = "2.19.6" + +[[constraint]] + name = "github.com/spf13/cobra" + version = "0.0.5" + +[[constraint]] + branch = "master" + name = "github.com/tevino/abool" + +[[constraint]] + branch = "master" + name = "github.com/umahmood/haversine" + +[[constraint]] + branch = "master" + name = "golang.org/x/crypto" + +[[constraint]] + branch = "master" + name = "golang.org/x/net" + +[[constraint]] + branch = "master" + name = "golang.org/x/sys" [prune] go-tests = true diff --git a/README.md b/README.md index 52f64b5f..39663c9b 100644 --- a/README.md +++ b/README.md @@ -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. -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: 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 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 diff --git a/build b/build index dd233516..e73c3e74 100755 --- a/build +++ b/build @@ -54,5 +54,5 @@ if [[ $1 == "dev" ]]; then fi # 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}" $* diff --git a/core/databases.go b/core/databases.go index 99c136e3..3373ea6e 100644 --- a/core/databases.go +++ b/core/databases.go @@ -1,13 +1,13 @@ package core import ( - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/modules" - "github.com/Safing/portbase/notifications" + "github.com/safing/portbase/database" + "github.com/safing/portbase/modules" + "github.com/safing/portbase/notifications" // module dependencies - _ "github.com/Safing/portbase/database/dbmodule" - _ "github.com/Safing/portbase/database/storage/bbolt" + _ "github.com/safing/portbase/database/dbmodule" + _ "github.com/safing/portbase/database/storage/bbolt" ) func init() { diff --git a/dnsonly.go b/dnsonly.go index 3d534a89..556a6c79 100644 --- a/dnsonly.go +++ b/dnsonly.go @@ -7,12 +7,12 @@ import ( "runtime" "syscall" - "github.com/Safing/portbase/info" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/info" + "github.com/safing/portbase/log" + "github.com/safing/portbase/modules" // include packages here - _ "github.com/Safing/portmaster/nameserver/only" + _ "github.com/safing/portmaster/nameserver/only" ) func main() { diff --git a/firewall/config.go b/firewall/config.go index 080ea7fd..8e79e686 100644 --- a/firewall/config.go +++ b/firewall/config.go @@ -1,8 +1,8 @@ package firewall import ( - "github.com/Safing/portbase/config" - "github.com/Safing/portmaster/status" + "github.com/safing/portbase/config" + "github.com/safing/portmaster/status" ) var ( diff --git a/firewall/dialer.go b/firewall/dialer.go index 41f1aec9..b3fab103 100644 --- a/firewall/dialer.go +++ b/firewall/dialer.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/Safing/portmaster/intel" + "github.com/safing/portmaster/intel" ) func init() { diff --git a/firewall/firewall.go b/firewall/firewall.go index 563b9470..74fb95bb 100644 --- a/firewall/firewall.go +++ b/firewall/firewall.go @@ -8,16 +8,16 @@ import ( "sync/atomic" "time" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/modules" - "github.com/Safing/portmaster/firewall/inspection" - "github.com/Safing/portmaster/firewall/interception" - "github.com/Safing/portmaster/network" - "github.com/Safing/portmaster/network/packet" + "github.com/safing/portbase/log" + "github.com/safing/portbase/modules" + "github.com/safing/portmaster/firewall/inspection" + "github.com/safing/portmaster/firewall/interception" + "github.com/safing/portmaster/network" + "github.com/safing/portmaster/network/packet" // module dependencies - _ "github.com/Safing/portmaster/core" - _ "github.com/Safing/portmaster/profile" + _ "github.com/safing/portmaster/core" + _ "github.com/safing/portmaster/profile" ) var ( diff --git a/firewall/inspection/inspection.go b/firewall/inspection/inspection.go index 8842f625..a3a536fa 100644 --- a/firewall/inspection/inspection.go +++ b/firewall/inspection/inspection.go @@ -5,8 +5,8 @@ package inspection import ( "sync" - "github.com/Safing/portmaster/network" - "github.com/Safing/portmaster/network/packet" + "github.com/safing/portmaster/network" + "github.com/safing/portmaster/network/packet" ) const ( diff --git a/firewall/inspection/tls/tls.go b/firewall/inspection/tls/tls.go index 36aade25..e6222ca5 100644 --- a/firewall/inspection/tls/tls.go +++ b/firewall/inspection/tls/tls.go @@ -10,13 +10,13 @@ import ( "github.com/google/gopacket/layers" "github.com/google/gopacket/tcpassembly" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/firewall/inspection" - "github.com/Safing/portmaster/firewall/inspection/tls/tlslib" - "github.com/Safing/portmaster/firewall/inspection/tls/verify" - "github.com/Safing/portmaster/network" - "github.com/Safing/portmaster/network/netutils" - "github.com/Safing/portmaster/network/packet" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/firewall/inspection" + "github.com/safing/portmaster/firewall/inspection/tls/tlslib" + "github.com/safing/portmaster/firewall/inspection/tls/verify" + "github.com/safing/portmaster/network" + "github.com/safing/portmaster/network/netutils" + "github.com/safing/portmaster/network/packet" ) // TODO: diff --git a/firewall/inspection/tls/tls_test.go b/firewall/inspection/tls/tls_test.go index 6e7b823b..e000f026 100644 --- a/firewall/inspection/tls/tls_test.go +++ b/firewall/inspection/tls/tls_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - "github.com/Safing/portmaster/firewall/inspection/tls/tlslib" + "github.com/safing/portmaster/firewall/inspection/tls/tlslib" ) var clientHelloSample = []byte{ diff --git a/firewall/inspection/tls/verify/cert.go b/firewall/inspection/tls/verify/cert.go index 27f92012..03d59b3a 100644 --- a/firewall/inspection/tls/verify/cert.go +++ b/firewall/inspection/tls/verify/cert.go @@ -13,9 +13,9 @@ import ( "github.com/cloudflare/cfssl/crypto/pkcs7" - "github.com/Safing/portbase/crypto/hash" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/record" + "github.com/safing/portbase/crypto/hash" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/record" ) // Cert saves a certificate. diff --git a/firewall/inspection/tls/verify/crl.go b/firewall/inspection/tls/verify/crl.go index 7124ed52..ba02484d 100644 --- a/firewall/inspection/tls/verify/crl.go +++ b/firewall/inspection/tls/verify/crl.go @@ -12,10 +12,10 @@ import ( "sync" "time" - "github.com/Safing/portbase/crypto/hash" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/crypto/hash" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/record" + "github.com/safing/portbase/log" ) // CARevocationInfo saves Information on revokation of Certificates of a Certificate Authority. diff --git a/firewall/inspection/tls/verify/ocsp.go b/firewall/inspection/tls/verify/ocsp.go index b4459de5..bb21c03d 100644 --- a/firewall/inspection/tls/verify/ocsp.go +++ b/firewall/inspection/tls/verify/ocsp.go @@ -14,8 +14,8 @@ import ( "golang.org/x/crypto/ocsp" - "github.com/Safing/portbase/crypto/hash" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/crypto/hash" + "github.com/safing/portbase/log" ) var ( diff --git a/firewall/inspection/tls/verify/verify.go b/firewall/inspection/tls/verify/verify.go index f162f842..469a87ce 100644 --- a/firewall/inspection/tls/verify/verify.go +++ b/firewall/inspection/tls/verify/verify.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/Safing/portbase/crypto/hash" - "github.com/Safing/portbase/database" + "github.com/safing/portbase/crypto/hash" + "github.com/safing/portbase/database" ) // useful references: diff --git a/firewall/interception/interception_linux.go b/firewall/interception/interception_linux.go index 4fd6897e..bf453449 100644 --- a/firewall/interception/interception_linux.go +++ b/firewall/interception/interception_linux.go @@ -2,7 +2,7 @@ package interception -import "github.com/Safing/portmaster/network/packet" +import "github.com/safing/portmaster/network/packet" var ( // Packets channel for feeding the firewall. diff --git a/firewall/interception/interception_windows.go b/firewall/interception/interception_windows.go index d084ee73..57db89f3 100644 --- a/firewall/interception/interception_windows.go +++ b/firewall/interception/interception_windows.go @@ -3,12 +3,12 @@ package interception import ( "fmt" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/notifications" - "github.com/Safing/portbase/utils/osdetail" - "github.com/Safing/portmaster/firewall/interception/windowskext" - "github.com/Safing/portmaster/network/packet" - "github.com/Safing/portmaster/updates" + "github.com/safing/portbase/log" + "github.com/safing/portbase/notifications" + "github.com/safing/portbase/utils/osdetail" + "github.com/safing/portmaster/firewall/interception/windowskext" + "github.com/safing/portmaster/network/packet" + "github.com/safing/portmaster/updates" ) var Packets chan packet.Packet diff --git a/firewall/interception/nfqueue/multiqueue.go b/firewall/interception/nfqueue/multiqueue.go index 6fd4b71c..2c5aaa41 100644 --- a/firewall/interception/nfqueue/multiqueue.go +++ b/firewall/interception/nfqueue/multiqueue.go @@ -7,7 +7,7 @@ package nfqueue // import ( // "sync" // -// "github.com/Safing/portmaster/network/packet" +// "github.com/safing/portmaster/network/packet" // ) // // type multiQueue struct { diff --git a/firewall/interception/nfqueue/nfqueue.go b/firewall/interception/nfqueue/nfqueue.go index a737312a..1c2d5d08 100644 --- a/firewall/interception/nfqueue/nfqueue.go +++ b/firewall/interception/nfqueue/nfqueue.go @@ -20,7 +20,7 @@ import ( "time" "unsafe" - "github.com/Safing/portmaster/network/packet" + "github.com/safing/portmaster/network/packet" ) var queues map[uint16]*NFQueue diff --git a/firewall/interception/nfqueue/packet.go b/firewall/interception/nfqueue/packet.go index 51143f81..cbbfc27a 100644 --- a/firewall/interception/nfqueue/packet.go +++ b/firewall/interception/nfqueue/packet.go @@ -5,7 +5,7 @@ package nfqueue import ( "fmt" - "github.com/Safing/portmaster/network/packet" + "github.com/safing/portmaster/network/packet" ) var ( diff --git a/firewall/interception/nfqueue_linux.go b/firewall/interception/nfqueue_linux.go index a2142494..17e1fb2a 100644 --- a/firewall/interception/nfqueue_linux.go +++ b/firewall/interception/nfqueue_linux.go @@ -7,7 +7,7 @@ import ( "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 diff --git a/firewall/interception/windowskext/handler.go b/firewall/interception/windowskext/handler.go index d2c91c52..026fab08 100644 --- a/firewall/interception/windowskext/handler.go +++ b/firewall/interception/windowskext/handler.go @@ -6,8 +6,8 @@ import ( "github.com/tevino/abool" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/network/packet" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/network/packet" ) // VerdictRequest is the request structure from the Kext. diff --git a/firewall/interception/windowskext/kext.go b/firewall/interception/windowskext/kext.go index 3613cf33..c1828772 100644 --- a/firewall/interception/windowskext/kext.go +++ b/firewall/interception/windowskext/kext.go @@ -9,8 +9,8 @@ import ( "time" "unsafe" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/network" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/network" "github.com/tevino/abool" "golang.org/x/sys/windows" ) diff --git a/firewall/interception/windowskext/packet.go b/firewall/interception/windowskext/packet.go index 48f4f7de..d45444b2 100644 --- a/firewall/interception/windowskext/packet.go +++ b/firewall/interception/windowskext/packet.go @@ -5,9 +5,9 @@ import ( "github.com/tevino/abool" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/network" - "github.com/Safing/portmaster/network/packet" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/network" + "github.com/safing/portmaster/network/packet" ) // Packet represents an IP packet. diff --git a/firewall/interception/windowskext/test/main.go b/firewall/interception/windowskext/test/main.go index 0fcc0208..0b3642c8 100644 --- a/firewall/interception/windowskext/test/main.go +++ b/firewall/interception/windowskext/test/main.go @@ -6,9 +6,9 @@ import ( "os/signal" "syscall" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/firewall/interception/windowskext" - "github.com/Safing/portmaster/network/packet" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/firewall/interception/windowskext" + "github.com/safing/portmaster/network/packet" ) var ( diff --git a/firewall/master.go b/firewall/master.go index baca986c..9a752cae 100644 --- a/firewall/master.go +++ b/firewall/master.go @@ -7,15 +7,15 @@ import ( "strings" "time" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/notifications" - "github.com/Safing/portmaster/intel" - "github.com/Safing/portmaster/network" - "github.com/Safing/portmaster/network/netutils" - "github.com/Safing/portmaster/network/packet" - "github.com/Safing/portmaster/process" - "github.com/Safing/portmaster/profile" - "github.com/Safing/portmaster/status" + "github.com/safing/portbase/log" + "github.com/safing/portbase/notifications" + "github.com/safing/portmaster/intel" + "github.com/safing/portmaster/network" + "github.com/safing/portmaster/network/netutils" + "github.com/safing/portmaster/network/packet" + "github.com/safing/portmaster/process" + "github.com/safing/portmaster/profile" + "github.com/safing/portmaster/status" "github.com/miekg/dns" "github.com/agext/levenshtein" diff --git a/firewall/ports.go b/firewall/ports.go index 9401532c..fc41727b 100644 --- a/firewall/ports.go +++ b/firewall/ports.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/Safing/portbase/crypto/random" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/crypto/random" + "github.com/safing/portbase/log" ) type portStatus struct { diff --git a/intel/config.go b/intel/config.go index 0f20ee3f..6cdd0468 100644 --- a/intel/config.go +++ b/intel/config.go @@ -1,8 +1,8 @@ package intel import ( - "github.com/Safing/portbase/config" - "github.com/Safing/portmaster/status" + "github.com/safing/portbase/config" + "github.com/safing/portmaster/status" ) var ( diff --git a/intel/intel.go b/intel/intel.go index c398710e..ce7822ca 100644 --- a/intel/intel.go +++ b/intel/intel.go @@ -6,8 +6,8 @@ import ( "fmt" "sync" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/record" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/record" ) var ( diff --git a/intel/ipinfo.go b/intel/ipinfo.go index e00921fa..583e34f4 100644 --- a/intel/ipinfo.go +++ b/intel/ipinfo.go @@ -5,9 +5,9 @@ import ( "strings" "sync" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portbase/utils" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/record" + "github.com/safing/portbase/utils" ) var ( diff --git a/intel/main.go b/intel/main.go index df8505ae..c2afa943 100644 --- a/intel/main.go +++ b/intel/main.go @@ -5,11 +5,11 @@ import ( "github.com/miekg/dns" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/log" + "github.com/safing/portbase/modules" // module dependencies - _ "github.com/Safing/portmaster/core" + _ "github.com/safing/portmaster/core" ) func init() { diff --git a/intel/main_test.go b/intel/main_test.go index bcb8e407..add9a295 100644 --- a/intel/main_test.go +++ b/intel/main_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" - "github.com/Safing/portbase/database/dbmodule" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/database/dbmodule" + "github.com/safing/portbase/log" + "github.com/safing/portbase/modules" ) func TestMain(m *testing.M) { diff --git a/intel/mdns.go b/intel/mdns.go index 35a597c5..a03436a5 100644 --- a/intel/mdns.go +++ b/intel/mdns.go @@ -13,7 +13,7 @@ import ( "github.com/miekg/dns" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) // DNS Classes diff --git a/intel/namerecord.go b/intel/namerecord.go index 1b137a92..54163ad9 100644 --- a/intel/namerecord.go +++ b/intel/namerecord.go @@ -5,8 +5,8 @@ import ( "fmt" "sync" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/record" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/record" ) var ( diff --git a/intel/resolve.go b/intel/resolve.go index 5a760ce6..2ccc8e5e 100644 --- a/intel/resolve.go +++ b/intel/resolve.go @@ -13,9 +13,9 @@ import ( "github.com/miekg/dns" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/status" + "github.com/safing/portbase/database" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/status" ) // TODO: make resolver interface for http package diff --git a/intel/resolver.go b/intel/resolver.go index 9af94455..e7e830cc 100644 --- a/intel/resolver.go +++ b/intel/resolver.go @@ -11,10 +11,10 @@ import ( "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/netutils" + "github.com/safing/portmaster/network/environment" + "github.com/safing/portmaster/network/netutils" ) // Resolver holds information about an active resolver. diff --git a/intel/reverse.go b/intel/reverse.go index e57bd5a7..fb1251d6 100644 --- a/intel/reverse.go +++ b/intel/reverse.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" "github.com/miekg/dns" ) diff --git a/main.go b/main.go index e38f8027..5d08b81e 100644 --- a/main.go +++ b/main.go @@ -9,15 +9,15 @@ import ( "syscall" "time" - "github.com/Safing/portbase/info" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/info" + "github.com/safing/portbase/log" + "github.com/safing/portbase/modules" // include packages here - _ "github.com/Safing/portmaster/core" - _ "github.com/Safing/portmaster/firewall" - _ "github.com/Safing/portmaster/nameserver" - _ "github.com/Safing/portmaster/ui" + _ "github.com/safing/portmaster/core" + _ "github.com/safing/portmaster/firewall" + _ "github.com/safing/portmaster/nameserver" + _ "github.com/safing/portmaster/ui" ) var ( diff --git a/nameserver/nameserver.go b/nameserver/nameserver.go index 0afa5ac0..ed0b9831 100644 --- a/nameserver/nameserver.go +++ b/nameserver/nameserver.go @@ -9,14 +9,14 @@ import ( "github.com/miekg/dns" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/log" + "github.com/safing/portbase/modules" - "github.com/Safing/portmaster/analytics/algs" - "github.com/Safing/portmaster/firewall" - "github.com/Safing/portmaster/intel" - "github.com/Safing/portmaster/network" - "github.com/Safing/portmaster/network/netutils" + "github.com/safing/portmaster/analytics/algs" + "github.com/safing/portmaster/firewall" + "github.com/safing/portmaster/intel" + "github.com/safing/portmaster/network" + "github.com/safing/portmaster/network/netutils" ) var ( diff --git a/nameserver/only/nameserver.go b/nameserver/only/nameserver.go index 2369086f..07cc5ae8 100644 --- a/nameserver/only/nameserver.go +++ b/nameserver/only/nameserver.go @@ -7,13 +7,13 @@ import ( "github.com/miekg/dns" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/log" + "github.com/safing/portbase/modules" - "github.com/Safing/portmaster/analytics/algs" - "github.com/Safing/portmaster/intel" - "github.com/Safing/portmaster/network/netutils" - "github.com/Safing/portmaster/status" + "github.com/safing/portmaster/analytics/algs" + "github.com/safing/portmaster/intel" + "github.com/safing/portmaster/network/netutils" + "github.com/safing/portmaster/status" ) var ( diff --git a/nameserver/takeover.go b/nameserver/takeover.go index d2ef510c..82d4e42c 100644 --- a/nameserver/takeover.go +++ b/nameserver/takeover.go @@ -6,10 +6,10 @@ import ( "os" "time" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/notifications" - "github.com/Safing/portmaster/network/packet" - "github.com/Safing/portmaster/process" + "github.com/safing/portbase/log" + "github.com/safing/portbase/notifications" + "github.com/safing/portmaster/network/packet" + "github.com/safing/portmaster/process" ) func checkForConflictingService(err error) { diff --git a/network/clean.go b/network/clean.go index 026ca6c8..92313576 100644 --- a/network/clean.go +++ b/network/clean.go @@ -5,8 +5,8 @@ package network import ( "time" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/process" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/process" ) var ( diff --git a/network/communication.go b/network/communication.go index 8a6c6303..369904fa 100644 --- a/network/communication.go +++ b/network/communication.go @@ -10,13 +10,13 @@ import ( "sync" "time" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/intel" - "github.com/Safing/portmaster/network/netutils" - "github.com/Safing/portmaster/network/packet" - "github.com/Safing/portmaster/process" - "github.com/Safing/portmaster/profile" + "github.com/safing/portbase/database/record" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/intel" + "github.com/safing/portmaster/network/netutils" + "github.com/safing/portmaster/network/packet" + "github.com/safing/portmaster/process" + "github.com/safing/portmaster/profile" ) // Communication describes a logical connection between a process and a domain. diff --git a/network/database.go b/network/database.go index bd97cb2a..72dbb7c3 100644 --- a/network/database.go +++ b/network/database.go @@ -6,12 +6,12 @@ import ( "strings" "sync" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/iterator" - "github.com/Safing/portbase/database/query" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portbase/database/storage" - "github.com/Safing/portmaster/process" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/iterator" + "github.com/safing/portbase/database/query" + "github.com/safing/portbase/database/record" + "github.com/safing/portbase/database/storage" + "github.com/safing/portmaster/process" ) var ( diff --git a/network/environment/addresses.go b/network/environment/addresses.go index b8828d0f..9a9f8689 100644 --- a/network/environment/addresses.go +++ b/network/environment/addresses.go @@ -4,7 +4,7 @@ import ( "net" "strings" - "github.com/Safing/portmaster/network/netutils" + "github.com/safing/portmaster/network/netutils" ) func GetAssignedAddresses() (ipv4 []net.IP, ipv6 []net.IP, err error) { diff --git a/network/environment/environment.go b/network/environment/environment.go index e67065aa..03d92bf9 100644 --- a/network/environment/environment.go +++ b/network/environment/environment.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) // TODO: find a good way to identify a network diff --git a/network/environment/environment_linux.go b/network/environment/environment_linux.go index 76be75c5..49d48314 100644 --- a/network/environment/environment_linux.go +++ b/network/environment/environment_linux.go @@ -12,8 +12,8 @@ import ( "github.com/miekg/dns" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/network/netutils" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/network/netutils" ) // Gateways returns the currently active gateways diff --git a/network/environment/location.go b/network/environment/location.go index cccc3c09..db765021 100644 --- a/network/environment/location.go +++ b/network/environment/location.go @@ -10,7 +10,7 @@ import ( "os" "time" - "github.com/Safing/portmaster/network/netutils" + "github.com/safing/portmaster/network/netutils" "golang.org/x/net/icmp" "golang.org/x/net/ipv4" diff --git a/network/geoip/database.go b/network/geoip/database.go index 6f8fb740..bff7f217 100644 --- a/network/geoip/database.go +++ b/network/geoip/database.go @@ -6,8 +6,8 @@ import ( maxminddb "github.com/oschwald/maxminddb-golang" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/updates" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/updates" ) var ( diff --git a/network/link.go b/network/link.go index 4b30f900..4dbd07fa 100644 --- a/network/link.go +++ b/network/link.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/network/packet" + "github.com/safing/portbase/database/record" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/network/packet" ) // FirewallHandler defines the function signature for a firewall handle function diff --git a/network/module.go b/network/module.go index 806d7ff9..85b3d170 100644 --- a/network/module.go +++ b/network/module.go @@ -1,7 +1,7 @@ package network import ( - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/modules" ) func init() { diff --git a/network/self.go b/network/self.go index 13aa9fac..60213855 100644 --- a/network/self.go +++ b/network/self.go @@ -5,9 +5,9 @@ import ( "os" "time" - "github.com/Safing/portmaster/network/netutils" - "github.com/Safing/portmaster/network/packet" - "github.com/Safing/portmaster/process" + "github.com/safing/portmaster/network/netutils" + "github.com/safing/portmaster/network/packet" + "github.com/safing/portmaster/process" ) // GetOwnComm returns the communication for the given packet, that originates from diff --git a/network/unknown.go b/network/unknown.go index cfb45c5b..98c47ee4 100644 --- a/network/unknown.go +++ b/network/unknown.go @@ -3,9 +3,9 @@ package network import ( "time" - "github.com/Safing/portmaster/network/netutils" - "github.com/Safing/portmaster/network/packet" - "github.com/Safing/portmaster/process" + "github.com/safing/portmaster/network/netutils" + "github.com/safing/portmaster/network/packet" + "github.com/safing/portmaster/process" ) // Static reasons diff --git a/pmctl/build b/pmctl/build index bbde1f9f..a311b43b 100755 --- a/pmctl/build +++ b/pmctl/build @@ -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." # 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}" $* diff --git a/pmctl/get.go b/pmctl/get.go index 300a3ebf..3c01b711 100644 --- a/pmctl/get.go +++ b/pmctl/get.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/Safing/portmaster/updates" + "github.com/safing/portmaster/updates" ) func getFile(identifier string) (*updates.File, error) { diff --git a/pmctl/main.go b/pmctl/main.go index a300725b..b9dee2ca 100644 --- a/pmctl/main.go +++ b/pmctl/main.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - "github.com/Safing/portbase/info" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/updates" + "github.com/safing/portbase/info" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/updates" "github.com/spf13/cobra" ) diff --git a/pmctl/upgrade.go b/pmctl/upgrade.go index cba12fb8..411070bf 100644 --- a/pmctl/upgrade.go +++ b/pmctl/upgrade.go @@ -7,8 +7,8 @@ import ( "path/filepath" "runtime" - "github.com/Safing/portbase/info" - "github.com/Safing/portmaster/updates" + "github.com/safing/portbase/info" + "github.com/safing/portmaster/updates" ) func checkForUpgrade() (update *updates.File) { diff --git a/process/database.go b/process/database.go index e6351273..72b70967 100644 --- a/process/database.go +++ b/process/database.go @@ -7,9 +7,9 @@ import ( processInfo "github.com/shirou/gopsutil/process" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/profile" + "github.com/safing/portbase/database" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/profile" "github.com/tevino/abool" ) diff --git a/process/find.go b/process/find.go index 903899d1..6a26e00a 100644 --- a/process/find.go +++ b/process/find.go @@ -5,8 +5,8 @@ import ( "errors" "net" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/network/packet" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/network/packet" ) // Errors diff --git a/process/getpid_linux.go b/process/getpid_linux.go index 49f26e17..1788f3e9 100644 --- a/process/getpid_linux.go +++ b/process/getpid_linux.go @@ -1,7 +1,7 @@ package process import ( - "github.com/Safing/portmaster/process/proc" + "github.com/safing/portmaster/process/proc" ) var ( diff --git a/process/getpid_windows.go b/process/getpid_windows.go index 879c9c14..98b200ea 100644 --- a/process/getpid_windows.go +++ b/process/getpid_windows.go @@ -1,7 +1,7 @@ package process import ( - "github.com/Safing/portmaster/process/iphelper" + "github.com/safing/portmaster/process/iphelper" ) var ( diff --git a/process/iphelper/test/main.go b/process/iphelper/test/main.go index 6f2d08ab..5234fbb4 100644 --- a/process/iphelper/test/main.go +++ b/process/iphelper/test/main.go @@ -5,7 +5,7 @@ package main import ( "fmt" - "github.com/Safing/portmaster/process/iphelper" + "github.com/safing/portmaster/process/iphelper" ) func main() { diff --git a/process/matching.go b/process/matching.go index 1edaa966..bf5db2ad 100644 --- a/process/matching.go +++ b/process/matching.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/query" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/profile" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/query" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/profile" ) var ( diff --git a/process/proc/processfinder.go b/process/proc/processfinder.go index b2c25ef2..a6391c2c 100644 --- a/process/proc/processfinder.go +++ b/process/proc/processfinder.go @@ -10,7 +10,7 @@ import ( "sync" "syscall" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) var ( diff --git a/process/proc/sockets.go b/process/proc/sockets.go index 067847f3..b9c773ea 100644 --- a/process/proc/sockets.go +++ b/process/proc/sockets.go @@ -13,7 +13,7 @@ import ( "sync" "unicode" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) /* diff --git a/process/process.go b/process/process.go index 90373de3..cdadc389 100644 --- a/process/process.go +++ b/process/process.go @@ -12,9 +12,9 @@ import ( processInfo "github.com/shirou/gopsutil/process" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/profile" + "github.com/safing/portbase/database/record" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/profile" ) var ( diff --git a/process/process_windows.go b/process/process_windows.go index 1efdb946..31bbdc73 100644 --- a/process/process_windows.go +++ b/process/process_windows.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/utils/osdetail" + "github.com/safing/portbase/log" + "github.com/safing/portbase/utils/osdetail" ) // IsUser returns whether the process is run by a normal user. diff --git a/process/xdgicons/humanInfo.go b/process/xdgicons/humanInfo.go index abb05d32..bbab8f75 100644 --- a/process/xdgicons/humanInfo.go +++ b/process/xdgicons/humanInfo.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) var ( diff --git a/profile/active.go b/profile/active.go index fdc5ceb8..e70eb13e 100644 --- a/profile/active.go +++ b/profile/active.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) var ( diff --git a/profile/database.go b/profile/database.go index 740ab4a9..d8cdee2e 100644 --- a/profile/database.go +++ b/profile/database.go @@ -1,7 +1,7 @@ package profile import ( - "github.com/Safing/portbase/database" + "github.com/safing/portbase/database" ) // core:profiles/user/12345-1234-125-1234-1235 diff --git a/profile/defaults.go b/profile/defaults.go index ed12ae80..2c700645 100644 --- a/profile/defaults.go +++ b/profile/defaults.go @@ -1,7 +1,7 @@ package profile import ( - "github.com/Safing/portmaster/status" + "github.com/safing/portmaster/status" ) func makeDefaultGlobalProfile() *Profile { diff --git a/profile/endpoints.go b/profile/endpoints.go index ad0e9dbc..9809a56a 100644 --- a/profile/endpoints.go +++ b/profile/endpoints.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/Safing/portmaster/intel" + "github.com/safing/portmaster/intel" ) // Endpoints is a list of permitted or denied endpoints. diff --git a/profile/endpoints_test.go b/profile/endpoints_test.go index 56e1c472..07e43018 100644 --- a/profile/endpoints_test.go +++ b/profile/endpoints_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/Safing/portbase/utils/testutils" + "github.com/safing/portbase/utils/testutils" ) func testEndpointDomainMatch(t *testing.T, ep *EndpointPermission, domain string, expectedResult EPResult) { diff --git a/profile/flags.go b/profile/flags.go index fe8f6c1f..bc0a59a2 100644 --- a/profile/flags.go +++ b/profile/flags.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/Safing/portmaster/status" + "github.com/safing/portmaster/status" ) // Flags are used to quickly add common attributes to profiles diff --git a/profile/flags_test.go b/profile/flags_test.go index 75b85b5f..8f122624 100644 --- a/profile/flags_test.go +++ b/profile/flags_test.go @@ -3,7 +3,7 @@ package profile import ( "testing" - "github.com/Safing/portmaster/status" + "github.com/safing/portmaster/status" ) func TestProfileFlags(t *testing.T) { diff --git a/profile/framework.go b/profile/framework.go index 64cbbefc..dc203098 100644 --- a/profile/framework.go +++ b/profile/framework.go @@ -9,7 +9,7 @@ package profile // "regexp" // "strings" // -// "github.com/Safing/portbase/log" +// "github.com/safing/portbase/log" // ) // // type Framework struct { diff --git a/profile/identifier_linux.go b/profile/identifier_linux.go index d8020e5e..3e6ffc96 100644 --- a/profile/identifier_linux.go +++ b/profile/identifier_linux.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/Safing/portbase/utils" + "github.com/safing/portbase/utils" ) // GetPathIdentifier returns the identifier from the given path diff --git a/profile/identifier_linux_test.go b/profile/identifier_linux_test.go index fef1157a..65c2c1e0 100644 --- a/profile/identifier_linux_test.go +++ b/profile/identifier_linux_test.go @@ -15,7 +15,6 @@ func TestGetPathIdentifier(t *testing.T) { testPathID(t, "/home/user/project/main", "project/main") testPathID(t, "/root/project/main", "project/main") testPathID(t, "/tmp/a/b/c/d/install.sh", "c/d/install.sh") - testPathID(t, "/sbin/init", "sbin/init") testPathID(t, "/lib/systemd/systemd-udevd", "lib/systemd/systemd-udevd") testPathID(t, "/bundle/ruby/2.4.0/bin/passenger", "bin/passenger") testPathID(t, "/usr/sbin/cron", "sbin/cron") diff --git a/profile/index/index.go b/profile/index/index.go index c5859990..f206212f 100644 --- a/profile/index/index.go +++ b/profile/index/index.go @@ -6,8 +6,8 @@ import ( "fmt" "sync" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portbase/utils" + "github.com/safing/portbase/database/record" + "github.com/safing/portbase/utils" ) // ProfileIndex links an Identifier to Profiles diff --git a/profile/index/indexer.go b/profile/index/indexer.go index 0776d24f..471c66b9 100644 --- a/profile/index/indexer.go +++ b/profile/index/indexer.go @@ -1,13 +1,13 @@ package index import ( - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/query" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/query" + "github.com/safing/portbase/database/record" + "github.com/safing/portbase/log" + "github.com/safing/portbase/modules" - "github.com/Safing/portmaster/profile" + "github.com/safing/portmaster/profile" ) // FIXME: listen for profile changes and update the index diff --git a/profile/matching/database.go b/profile/matching/database.go index 0196d0c5..77a2e4ff 100644 --- a/profile/matching/database.go +++ b/profile/matching/database.go @@ -1,7 +1,7 @@ package matching import ( - "github.com/Safing/portbase/database" + "github.com/safing/portbase/database" ) // core:profiles/user/12345-1234-125-1234-1235 diff --git a/profile/matching/fingerprints.go b/profile/matching/fingerprints.go index e77b7df6..11aebb40 100644 --- a/profile/matching/fingerprints.go +++ b/profile/matching/fingerprints.go @@ -3,8 +3,8 @@ package matcher import ( "strings" - "github.com/Safing/portmaster/process" - "github.com/Safing/portmaster/profile" + "github.com/safing/portmaster/process" + "github.com/safing/portmaster/profile" ) // CheckFingerprints checks what fingerprints match and returns the total score. diff --git a/profile/matching/identpath_linux.go b/profile/matching/identpath_linux.go index b5a27262..e25b8c1a 100644 --- a/profile/matching/identpath_linux.go +++ b/profile/matching/identpath_linux.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/Safing/portmaster/process" - "github.com/Safing/portmaster/profile" + "github.com/safing/portmaster/process" + "github.com/safing/portmaster/profile" ) // GetIdentificationPath returns the identifier for the given process (linux edition). diff --git a/profile/matching/identpath_linux_test.go b/profile/matching/identpath_linux_test.go index 2b480f00..eae72098 100644 --- a/profile/matching/identpath_linux_test.go +++ b/profile/matching/identpath_linux_test.go @@ -3,7 +3,7 @@ package matcher import ( "testing" - "github.com/Safing/portmaster/process" + "github.com/safing/portmaster/process" ) func TestGetIdentifierLinux(t *testing.T) { diff --git a/profile/matching/matcher.go b/profile/matching/matcher.go index b9c69a91..14109113 100644 --- a/profile/matching/matcher.go +++ b/profile/matching/matcher.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/process" - "github.com/Safing/portmaster/profile" - "github.com/Safing/portmaster/profile/index" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/process" + "github.com/safing/portmaster/profile" + "github.com/safing/portmaster/profile/index" ) // GetProfileSet finds a local profile. diff --git a/profile/module.go b/profile/module.go index a3e52647..ad7c1dbd 100644 --- a/profile/module.go +++ b/profile/module.go @@ -1,10 +1,10 @@ package profile import ( - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/modules" // module dependencies - _ "github.com/Safing/portmaster/core" + _ "github.com/safing/portmaster/core" ) var ( diff --git a/profile/profile.go b/profile/profile.go index 9ba6929e..f1bda3c9 100644 --- a/profile/profile.go +++ b/profile/profile.go @@ -7,8 +7,8 @@ import ( uuid "github.com/satori/go.uuid" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portmaster/status" + "github.com/safing/portbase/database/record" + "github.com/safing/portmaster/status" ) var ( @@ -65,11 +65,7 @@ func MakeProfileKey(namespace, ID string) string { // Save saves the profile to the database func (profile *Profile) Save(namespace string) error { if profile.ID == "" { - u, err := uuid.NewV4() - if err != nil { - return err - } - profile.ID = u.String() + profile.ID = uuid.NewV4().String() } if !profile.KeyIsSet() { diff --git a/profile/set.go b/profile/set.go index c21b475b..5afa8f53 100644 --- a/profile/set.go +++ b/profile/set.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "github.com/Safing/portmaster/status" + "github.com/safing/portmaster/status" ) var ( diff --git a/profile/set_test.go b/profile/set_test.go index a5a1df4a..4b9cd8e9 100644 --- a/profile/set_test.go +++ b/profile/set_test.go @@ -1,12 +1,13 @@ package profile import ( + "context" "net" "testing" "time" - "github.com/Safing/portbase/utils/testutils" - "github.com/Safing/portmaster/status" + "github.com/safing/portbase/utils/testutils" + "github.com/safing/portmaster/status" ) var ( @@ -140,7 +141,7 @@ func testEndpointIP(t *testing.T, set *Set, domain string, ip net.IP, protocol u func TestProfileSet(t *testing.T) { - set := NewSet("[pid]-/path/to/bin", testUserProfile, testStampProfile) + set := NewSet(context.Background(), "[pid]-/path/to/bin", testUserProfile, testStampProfile) set.Update(status.SecurityLevelDynamic) testFlag(t, set, Whitelist, false) diff --git a/profile/specialprofiles.go b/profile/specialprofiles.go index 5011c061..f5c8c346 100644 --- a/profile/specialprofiles.go +++ b/profile/specialprofiles.go @@ -3,7 +3,7 @@ package profile import ( "sync" - "github.com/Safing/portbase/database" + "github.com/safing/portbase/database" ) var ( diff --git a/profile/updates.go b/profile/updates.go index cd923c10..36d57f9b 100644 --- a/profile/updates.go +++ b/profile/updates.go @@ -4,9 +4,9 @@ import ( "strings" "sync/atomic" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/query" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/query" + "github.com/safing/portbase/log" ) func initUpdateListener() error { diff --git a/status/database.go b/status/database.go index 8aa34ef7..b0d7b291 100644 --- a/status/database.go +++ b/status/database.go @@ -1,9 +1,9 @@ package status import ( - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/query" - "github.com/Safing/portbase/database/record" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/query" + "github.com/safing/portbase/database/record" ) const ( diff --git a/status/get-config.go b/status/get-config.go index c8641551..b216e4b2 100644 --- a/status/get-config.go +++ b/status/get-config.go @@ -1,7 +1,7 @@ package status import ( - "github.com/Safing/portbase/config" + "github.com/safing/portbase/config" ) type ( diff --git a/status/module.go b/status/module.go index 91404d92..a41147fc 100644 --- a/status/module.go +++ b/status/module.go @@ -1,12 +1,12 @@ package status import ( - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/database" + "github.com/safing/portbase/log" + "github.com/safing/portbase/modules" // module dependencies - _ "github.com/Safing/portmaster/core" + _ "github.com/safing/portmaster/core" ) var ( diff --git a/status/set.go b/status/set.go index 4d63ac16..ff283200 100644 --- a/status/set.go +++ b/status/set.go @@ -3,7 +3,7 @@ package status import ( "sync/atomic" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) // autopilot automatically adjusts the security level as needed diff --git a/status/status.go b/status/status.go index e71d892c..547f3b6c 100644 --- a/status/status.go +++ b/status/status.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/database/record" + "github.com/safing/portbase/log" ) var ( diff --git a/threats/all.go b/threats/all.go index 6ec88a42..f4ce20d0 100644 --- a/threats/all.go +++ b/threats/all.go @@ -1,6 +1,6 @@ package threats import ( - _ "github.com/Safing/portmaster/threats/arp" - _ "github.com/Safing/portmaster/threats/portscan" + _ "github.com/safing/portmaster/threats/arp" + _ "github.com/safing/portmaster/threats/portscan" ) diff --git a/threats/arp/os_linux.go b/threats/arp/os_linux.go index 3512d54b..6cf16bc0 100644 --- a/threats/arp/os_linux.go +++ b/threats/arp/os_linux.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) const ( diff --git a/ui/module.go b/ui/module.go index 654ded14..3927c4ed 100644 --- a/ui/module.go +++ b/ui/module.go @@ -1,15 +1,15 @@ package ui import ( - "github.com/Safing/portbase/api" - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/api" + "github.com/safing/portbase/modules" ) func init() { modules.Register("ui", prep, nil, nil, "updates", "api") + api.SetDefaultAPIListenAddress("127.0.0.1:817") } func prep() error { - api.SetDefaultAPIListenAddress("127.0.0.1:817") return registerRoutes() } diff --git a/ui/serve.go b/ui/serve.go index 8c65c9c1..dbf5637f 100644 --- a/ui/serve.go +++ b/ui/serve.go @@ -13,9 +13,9 @@ import ( resources "github.com/cookieo9/resources-go" "github.com/gorilla/mux" - "github.com/Safing/portbase/api" - "github.com/Safing/portbase/log" - "github.com/Safing/portmaster/updates" + "github.com/safing/portbase/api" + "github.com/safing/portbase/log" + "github.com/safing/portmaster/updates" ) var ( diff --git a/updates/fetch.go b/updates/fetch.go index d07a0248..f1cd07de 100644 --- a/updates/fetch.go +++ b/updates/fetch.go @@ -14,7 +14,7 @@ import ( "github.com/google/renameio" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) var ( diff --git a/updates/get.go b/updates/get.go index 9f8385f4..3ac13b8e 100644 --- a/updates/get.go +++ b/updates/get.go @@ -8,7 +8,7 @@ import ( "path/filepath" "runtime" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) var ( diff --git a/updates/latest.go b/updates/latest.go index 5c90b73f..83bb11b6 100644 --- a/updates/latest.go +++ b/updates/latest.go @@ -10,7 +10,7 @@ import ( "runtime" "sync" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) var ( diff --git a/updates/main.go b/updates/main.go index f9d32467..3b9e68cc 100644 --- a/updates/main.go +++ b/updates/main.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/info" - "github.com/Safing/portbase/log" - "github.com/Safing/portbase/modules" + "github.com/safing/portbase/database" + "github.com/safing/portbase/info" + "github.com/safing/portbase/log" + "github.com/safing/portbase/modules" ) var ( diff --git a/updates/notify.go b/updates/notify.go index f944cf51..cb785952 100644 --- a/updates/notify.go +++ b/updates/notify.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/Safing/portbase/notifications" + "github.com/safing/portbase/notifications" ) const coreIdentifier = "core/portmaster" diff --git a/updates/status.go b/updates/status.go index 7a61c555..c8a69593 100644 --- a/updates/status.go +++ b/updates/status.go @@ -4,11 +4,11 @@ import ( "errors" "sync" - "github.com/Safing/portbase/database" - "github.com/Safing/portbase/database/query" - "github.com/Safing/portbase/database/record" - "github.com/Safing/portbase/info" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/database" + "github.com/safing/portbase/database/query" + "github.com/safing/portbase/database/record" + "github.com/safing/portbase/info" + "github.com/safing/portbase/log" "github.com/tevino/abool" ) diff --git a/updates/updater.go b/updates/updater.go index 10342971..8dab77b2 100644 --- a/updates/updater.go +++ b/updates/updater.go @@ -8,7 +8,7 @@ import ( "runtime" "time" - "github.com/Safing/portbase/log" + "github.com/safing/portbase/log" ) func updater() { diff --git a/updates/uptool/scan.go b/updates/uptool/scan.go index ccb5185d..47b280c3 100644 --- a/updates/uptool/scan.go +++ b/updates/uptool/scan.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/Safing/portmaster/updates" + "github.com/safing/portmaster/updates" "github.com/spf13/cobra" )