From 3f736e9439b7bcffc63edbbddd616de157738b23 Mon Sep 17 00:00:00 2001 From: Gaukas Wang Date: Fri, 16 Feb 2024 22:14:35 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20update:=20post=20ownership=20tra?= =?UTF-8?q?nsfer=20change=20(#50)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🚚 update: ownership to refraction-networking Signed-off-by: Gaukas Wang * update: FOSSA url Signed-off-by: Gaukas Wang --------- Signed-off-by: Gaukas Wang --- .deepsource.toml | 13 ----------- README.md | 40 +++++++++++++++++--------------- config.go | 4 ++-- config_test.go | 4 ++-- configbuilder/config.pb.go | 2 +- configbuilder/pb/config.proto | 2 +- core.go | 2 +- dialer_test.go | 4 ++-- examples/v0/dialer/README.md | 2 +- examples/v0/dialer/main.go | 6 ++--- examples/v0/listener/README.md | 2 +- examples/v0/listener/main.go | 6 ++--- examples/v0/relay/README.md | 2 +- examples/v0/relay/main.go | 4 ++-- go.mod | 4 ++-- go.sum | 4 ++-- internal/socket/tcpconn.go | 2 +- internal/socket/tcpconn_test.go | 2 +- internal/socket/unixconn.go | 2 +- internal/socket/unixconn_test.go | 2 +- listener_test.go | 4 ++-- log.go | 2 +- relay_test.go | 4 ++-- transport/v0/conn.go | 6 ++--- transport/v0/dialer.go | 2 +- transport/v0/dialer_test.go | 4 ++-- transport/v0/gc_test.go | 4 ++-- transport/v0/listener.go | 2 +- transport/v0/listener_test.go | 4 ++-- transport/v0/relay.go | 2 +- transport/v0/relay_test.go | 4 ++-- transport/v0/transport_module.go | 8 +++---- 32 files changed, 72 insertions(+), 83 deletions(-) delete mode 100644 .deepsource.toml diff --git a/.deepsource.toml b/.deepsource.toml deleted file mode 100644 index 24660a8..0000000 --- a/.deepsource.toml +++ /dev/null @@ -1,13 +0,0 @@ -version = 1 - -[[analyzers]] -name = "test-coverage" - -[[analyzers]] -name = "go" - - [analyzers.meta] - import_root = "github.com/gaukas/water" - -[[transformers]] -name = "gofumpt" \ No newline at end of file diff --git a/README.md b/README.md index d11ebeb..1e2d67c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # W.A.T.E.R.: WebAssembly Transport Executables Runtime -[![License](https://img.shields.io/github/license/gaukas/water)](https://github.com/gaukas/water/blob/master/LICENSE) -[![FOSSA](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fgaukas%2Fwater.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Fgaukas%2Fwater?ref=badge_shield&issueType=license) -[![CI](https://github.com/gaukas/water/actions/workflows/go.yml/badge.svg?branch=master)](https://github.com/gaukas/water/actions/workflows/go.yml) -[![Go Doc](https://pkg.go.dev/badge/github.com/gaukas/water.svg)](https://pkg.go.dev/github.com/gaukas/water) +[![License](https://img.shields.io/github/license/gaukas/water)](https://github.com/refraction-networking/water/blob/master/LICENSE) +[![FOSSA](https://app.fossa.com/api/projects/git%2Bgithub.com%2Frefraction-networking%2Fwater.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Frefraction-networking%2Fwater?ref=badge_shield&issueType=license) +[![CI](https://github.com/refraction-networking/water/actions/workflows/go.yml/badge.svg?branch=master)](https://github.com/refraction-networking/water/actions/workflows/go.yml) +[![Go Doc](https://pkg.go.dev/badge/github.com/refraction-networking/water.svg)](https://pkg.go.dev/github.com/refraction-networking/water)
@@ -21,32 +21,34 @@ To build a WATM in Go, please refer to [watm](https://github.com/gaukas/watm) for examples and helper libraries interfacing Pluggable Transports-like interfaces. Official Go compiler is currently not supported ([watm#4](https://github.com/gaukas/watm/issues/4)). -You can contact one of developers personally via gaukas.wang@colorado.edu, or simply [opening an issue](https://github.com/gaukas/water/issues/new). +You can contact one of developers personally via gaukas.wang@colorado.edu, or simply [opening an issue](https://github.com/refraction-networking/water/issues/new). -The Rust implementation of the runtime library and information about writing, building, and using WebAssembly Transport Modules(WATM) from Rust can be found in [water-rs](https://github.com/erikziyunchi/water-rs). +The Rust implementation of the runtime library and information about writing, building, and using WebAssembly Transport Modules(WATM) from Rust can be found in [water-rs](https://github.com/refraction-networking/water-rs). ### Cite our work -If you quoted or used our work in your own project/paper/research, please cite our paper [Just add WATER: WebAssembly-based Circumvention Transports](https://arxiv.org/pdf/2312.00163.pdf). +If you quoted or used our work in your own project/paper/research, please cite our paper [Just add WATER: WebAssembly-based Circumvention Transports](https://www.petsymposium.org/foci/2024/foci-2024-0003.pdf), which is published in the proceedings of Free and Open Communications on the Internet (FOCI) in 2024 issue 1, pages 22-28.
BibTeX ```bibtex - @inproceedings{water-foci24, - author = {Chi, Erik and Wang, Gaukas and Halderman, J. Alex and Wustrow, Eric and Wampler, Jack}, - year = {2024}, - month = {02}, - title = {Just add {WATER}: {WebAssembly}-based Circumvention Transports}, - address = {Virtual Event}, - series = {FOCI '24}, - booktitle = {Free and Open Communications on the Internet}, - } + @inproceedings{water-foci24, + author = {Chi, Erik and Wang, Gaukas and Halderman, J. Alex and Wustrow, Eric and Wampler, Jack}, + year = {2024}, + month = {02}, + number = {1}, + pages = {22-28}, + title = {Just add {WATER}: {WebAssembly}-based Circumvention Transports}, + howpublished = "\url{https://www.petsymposium.org/foci/2024/foci-2024-0003.php}", + publisher = {PoPETs}, + address = {Virtual Event}, + series = {FOCI '24}, + booktitle = {Free and Open Communications on the Internet}, + } ```
-**Update**: our paper has been accepted by FOCI and will appear at [FOCI 2024](https://foci.community/foci24.html) on Feb 19, 2024! - ## Be Water > Empty your mind, be formless, shapeless, like water. If you put water into a cup, it becomes the cup. You put water into a bottle and it becomes the bottle. You put it in a teapot, it becomes the teapot. Now, water can flow or it can crash. Be water, my friend. @@ -70,7 +72,7 @@ W.A.T.E.R. is designed to be future-proof with the automated multi-version WebAs import ( // ... - _ "github.com/gaukas/water/transport/v0" + _ "github.com/refraction-networking/water/transport/v0" // ... ) diff --git a/config.go b/config.go index 3f81359..53e60de 100644 --- a/config.go +++ b/config.go @@ -7,8 +7,8 @@ import ( "net" "os" - "github.com/gaukas/water/configbuilder" - "github.com/gaukas/water/internal/log" + "github.com/refraction-networking/water/configbuilder" + "github.com/refraction-networking/water/internal/log" "google.golang.org/protobuf/proto" ) diff --git a/config_test.go b/config_test.go index 5aef7c6..796e16f 100644 --- a/config_test.go +++ b/config_test.go @@ -6,9 +6,9 @@ import ( "reflect" "testing" - "github.com/gaukas/water/internal/log" + "github.com/refraction-networking/water/internal/log" - "github.com/gaukas/water" + "github.com/refraction-networking/water" ) func TestConfig_Clone(t *testing.T) { diff --git a/configbuilder/config.pb.go b/configbuilder/config.pb.go index 3ff079b..edfd540 100644 --- a/configbuilder/config.pb.go +++ b/configbuilder/config.pb.go @@ -1,6 +1,6 @@ package configbuilder -import "github.com/gaukas/water/configbuilder/pb" +import "github.com/refraction-networking/water/configbuilder/pb" // ConfigProtoBuf defines the Protobuf format of the Config. // diff --git a/configbuilder/pb/config.proto b/configbuilder/pb/config.proto index bde8fe3..3bbb6f7 100644 --- a/configbuilder/pb/config.proto +++ b/configbuilder/pb/config.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package water; -option go_package = "github.com/gaukas/water/configbuilder/pb"; +option go_package = "github.com/refraction-networking/water/configbuilder/pb"; message Config { TransportModule transport_module = 1; diff --git a/core.go b/core.go index 23ba5ef..793d95f 100644 --- a/core.go +++ b/core.go @@ -8,7 +8,7 @@ import ( "runtime" "sync" - "github.com/gaukas/water/internal/log" + "github.com/refraction-networking/water/internal/log" "github.com/tetratelabs/wazero" "github.com/tetratelabs/wazero/api" "github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1" diff --git a/dialer_test.go b/dialer_test.go index 618311d..b218fb3 100644 --- a/dialer_test.go +++ b/dialer_test.go @@ -5,8 +5,8 @@ import ( "fmt" "net" - "github.com/gaukas/water" - _ "github.com/gaukas/water/transport/v0" + "github.com/refraction-networking/water" + _ "github.com/refraction-networking/water/transport/v0" ) // ExampleDialer demonstrates how to use water.Dialer. diff --git a/examples/v0/dialer/README.md b/examples/v0/dialer/README.md index 4422412..4b89432 100644 --- a/examples/v0/dialer/README.md +++ b/examples/v0/dialer/README.md @@ -7,7 +7,7 @@ This is an example of using `water.Dialer` with any v0 WATM. ### Install ```bash -go get github.com/gaukas/water/examples/v0/dialer +go get github.com/refraction-networking/water/examples/v0/dialer ``` ### Run diff --git a/examples/v0/dialer/main.go b/examples/v0/dialer/main.go index 1a527c3..d866adf 100644 --- a/examples/v0/dialer/main.go +++ b/examples/v0/dialer/main.go @@ -9,9 +9,9 @@ import ( "os" "time" - "github.com/gaukas/water" - "github.com/gaukas/water/internal/log" - _ "github.com/gaukas/water/transport/v0" + "github.com/refraction-networking/water" + "github.com/refraction-networking/water/internal/log" + _ "github.com/refraction-networking/water/transport/v0" ) var ( diff --git a/examples/v0/listener/README.md b/examples/v0/listener/README.md index a4f0a9d..f25cc52 100644 --- a/examples/v0/listener/README.md +++ b/examples/v0/listener/README.md @@ -7,7 +7,7 @@ This is an example of using `water.Listener` with any v0 WATM. ### Install ```bash -go get github.com/gaukas/water/examples/v0/listener +go get github.com/refraction-networking/water/examples/v0/listener ``` ### Run diff --git a/examples/v0/listener/main.go b/examples/v0/listener/main.go index 66c7019..0b2789f 100644 --- a/examples/v0/listener/main.go +++ b/examples/v0/listener/main.go @@ -9,9 +9,9 @@ import ( "os" "time" - "github.com/gaukas/water" - "github.com/gaukas/water/internal/log" - _ "github.com/gaukas/water/transport/v0" + "github.com/refraction-networking/water" + "github.com/refraction-networking/water/internal/log" + _ "github.com/refraction-networking/water/transport/v0" ) var ( diff --git a/examples/v0/relay/README.md b/examples/v0/relay/README.md index 2a0189d..36a0f58 100644 --- a/examples/v0/relay/README.md +++ b/examples/v0/relay/README.md @@ -7,7 +7,7 @@ This is an example of using `water.Relay` with any v0 WATM. ### Install ```bash -go get github.com/gaukas/water/examples/v0/relay +go get github.com/refraction-networking/water/examples/v0/relay ``` ### Run diff --git a/examples/v0/relay/main.go b/examples/v0/relay/main.go index 647b4bc..63b0a0b 100644 --- a/examples/v0/relay/main.go +++ b/examples/v0/relay/main.go @@ -7,8 +7,8 @@ import ( "net" "os" - "github.com/gaukas/water" - _ "github.com/gaukas/water/transport/v0" + "github.com/refraction-networking/water" + _ "github.com/refraction-networking/water/transport/v0" ) var ( diff --git a/go.mod b/go.mod index 7589150..f53c5bb 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ -module github.com/gaukas/water +module github.com/refraction-networking/water go 1.20 -replace github.com/tetratelabs/wazero v1.6.0 => github.com/gaukas/wazero v1.6.5-w +replace github.com/tetratelabs/wazero v1.6.0 => github.com/refraction-networking/wazero v1.6.6-w require ( github.com/tetratelabs/wazero v1.6.0 diff --git a/go.sum b/go.sum index a25886f..f151d04 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ -github.com/gaukas/wazero v1.6.5-w h1:tSQbdHJjYcH9GmQ/5aObsTdbsw44pRT2eqw8HXIuWKg= -github.com/gaukas/wazero v1.6.5-w/go.mod h1:0U0G41+ochRKoPKCJlh0jMg1CHkyfK8kDqiirMmKY8A= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/refraction-networking/wazero v1.6.6-w h1:GopGAQ5/Rah0vzGImewwOrOaXFR+FmgWlgGKs1JpVlw= +github.com/refraction-networking/wazero v1.6.6-w/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y= golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA= golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= diff --git a/internal/socket/tcpconn.go b/internal/socket/tcpconn.go index 3196121..185a860 100644 --- a/internal/socket/tcpconn.go +++ b/internal/socket/tcpconn.go @@ -8,7 +8,7 @@ import ( "os" "sync" - "github.com/gaukas/water/internal/log" + "github.com/refraction-networking/water/internal/log" ) // TCPConnPair returns a pair of connected net.TCPConn. diff --git a/internal/socket/tcpconn_test.go b/internal/socket/tcpconn_test.go index ad9b23c..8f6ef93 100644 --- a/internal/socket/tcpconn_test.go +++ b/internal/socket/tcpconn_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/gaukas/water/internal/socket" + "github.com/refraction-networking/water/internal/socket" ) func TestTCPConnPair(t *testing.T) { diff --git a/internal/socket/unixconn.go b/internal/socket/unixconn.go index 46b3a7c..0c188c2 100644 --- a/internal/socket/unixconn.go +++ b/internal/socket/unixconn.go @@ -9,7 +9,7 @@ import ( "os" "sync" - "github.com/gaukas/water/internal/log" + "github.com/refraction-networking/water/internal/log" ) // UnixConnPair returns a pair of connected net.UnixConn. diff --git a/internal/socket/unixconn_test.go b/internal/socket/unixconn_test.go index c7ab1ff..f91570c 100644 --- a/internal/socket/unixconn_test.go +++ b/internal/socket/unixconn_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/gaukas/water/internal/socket" + "github.com/refraction-networking/water/internal/socket" ) func TestUnixConnPair(t *testing.T) { diff --git a/listener_test.go b/listener_test.go index 51ec575..0115579 100644 --- a/listener_test.go +++ b/listener_test.go @@ -5,8 +5,8 @@ import ( "fmt" "net" - "github.com/gaukas/water" - _ "github.com/gaukas/water/transport/v0" + "github.com/refraction-networking/water" + _ "github.com/refraction-networking/water/transport/v0" ) // ExampleListener demonstrates how to use water.Listener. diff --git a/log.go b/log.go index e27fc78..f706f3e 100644 --- a/log.go +++ b/log.go @@ -1,7 +1,7 @@ package water import ( - "github.com/gaukas/water/internal/log" + "github.com/refraction-networking/water/internal/log" ) // SetDefaultLogger sets the logger to be used by the package diff --git a/relay_test.go b/relay_test.go index 3de7543..93f9ee3 100644 --- a/relay_test.go +++ b/relay_test.go @@ -6,8 +6,8 @@ import ( "net" "time" - "github.com/gaukas/water" - _ "github.com/gaukas/water/transport/v0" + "github.com/refraction-networking/water" + _ "github.com/refraction-networking/water/transport/v0" ) // ExampleRelay demonstrates how to use water.Relay. diff --git a/transport/v0/conn.go b/transport/v0/conn.go index a483617..23e5740 100644 --- a/transport/v0/conn.go +++ b/transport/v0/conn.go @@ -9,9 +9,9 @@ import ( "sync/atomic" "time" - "github.com/gaukas/water" - "github.com/gaukas/water/internal/log" - "github.com/gaukas/water/internal/socket" + "github.com/refraction-networking/water" + "github.com/refraction-networking/water/internal/log" + "github.com/refraction-networking/water/internal/socket" ) // Conn is the first experimental version of Conn implementation. diff --git a/transport/v0/dialer.go b/transport/v0/dialer.go index b702108..e77e47c 100644 --- a/transport/v0/dialer.go +++ b/transport/v0/dialer.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/gaukas/water" + "github.com/refraction-networking/water" ) func init() { diff --git a/transport/v0/dialer_test.go b/transport/v0/dialer_test.go index 016bcc6..2e021a1 100644 --- a/transport/v0/dialer_test.go +++ b/transport/v0/dialer_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/gaukas/water" - v0 "github.com/gaukas/water/transport/v0" + "github.com/refraction-networking/water" + v0 "github.com/refraction-networking/water/transport/v0" ) // ExampleDialer demonstrates how to use v0.Dialer as a water.Dialer. diff --git a/transport/v0/gc_test.go b/transport/v0/gc_test.go index 1491f77..cc08ddc 100644 --- a/transport/v0/gc_test.go +++ b/transport/v0/gc_test.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "testing" - "github.com/gaukas/water" - v0 "github.com/gaukas/water/transport/v0" + "github.com/refraction-networking/water" + v0 "github.com/refraction-networking/water/transport/v0" ) // This file is specifically designed to test to make sure everything will eventually be diff --git a/transport/v0/listener.go b/transport/v0/listener.go index f831615..256cd31 100644 --- a/transport/v0/listener.go +++ b/transport/v0/listener.go @@ -6,7 +6,7 @@ import ( "net" "sync/atomic" - "github.com/gaukas/water" + "github.com/refraction-networking/water" ) func init() { diff --git a/transport/v0/listener_test.go b/transport/v0/listener_test.go index 94e21f6..af6ee6e 100644 --- a/transport/v0/listener_test.go +++ b/transport/v0/listener_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/gaukas/water" - v0 "github.com/gaukas/water/transport/v0" + "github.com/refraction-networking/water" + v0 "github.com/refraction-networking/water/transport/v0" ) // ExampleListener demonstrates how to use v0.Listener as a water.Listener. diff --git a/transport/v0/relay.go b/transport/v0/relay.go index 5e7af2b..c2d04e4 100644 --- a/transport/v0/relay.go +++ b/transport/v0/relay.go @@ -6,7 +6,7 @@ import ( "net" "sync/atomic" - "github.com/gaukas/water" + "github.com/refraction-networking/water" ) func init() { diff --git a/transport/v0/relay_test.go b/transport/v0/relay_test.go index 28f3690..a4f3c2c 100644 --- a/transport/v0/relay_test.go +++ b/transport/v0/relay_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/gaukas/water" - v0 "github.com/gaukas/water/transport/v0" + "github.com/refraction-networking/water" + v0 "github.com/refraction-networking/water/transport/v0" ) // ExampleRelay demonstrates how to use v0.Relay as a water.Relay. diff --git a/transport/v0/transport_module.go b/transport/v0/transport_module.go index 32c29fb..b36d0af 100644 --- a/transport/v0/transport_module.go +++ b/transport/v0/transport_module.go @@ -8,10 +8,10 @@ import ( "sync" "syscall" - "github.com/gaukas/water" - "github.com/gaukas/water/internal/log" - "github.com/gaukas/water/internal/socket" - "github.com/gaukas/water/internal/wasip1" + "github.com/refraction-networking/water" + "github.com/refraction-networking/water/internal/log" + "github.com/refraction-networking/water/internal/socket" + "github.com/refraction-networking/water/internal/wasip1" "github.com/tetratelabs/wazero/api" )