Skip to content

control/controlhttp: allow client and server to communicate over WebSockets#4781

Merged
mihaip merged 1 commit intomainfrom
mihaip/ws-controlhttp
Jun 3, 2022
Merged

control/controlhttp: allow client and server to communicate over WebSockets#4781
mihaip merged 1 commit intomainfrom
mihaip/ws-controlhttp

Conversation

@mihaip
Copy link
Copy Markdown
Contributor

@mihaip mihaip commented Jun 2, 2022

We can't do Noise-over-HTTP in Wasm/JS (because we don't have bidirectional
communication), but we should be able to do it over WebSockets. Reuses
derp WebSocket support that allows us to turn a WebSocket connection
into a net.Conn.

Updates #3157

Signed-off-by: Mihai Parparita mihai@tailscale.com

@mihaip mihaip requested a review from bradfitz June 2, 2022 23:26
@mihaip
Copy link
Copy Markdown
Contributor Author

mihaip commented Jun 2, 2022

Not sure what to make of the depware CI failure, the diff I have is what was generated by ./tool/go run github.com/tailscale/depaware -update tailscale.com/cmd/tailscaled

@bradfitz
Copy link
Copy Markdown
Member

bradfitz commented Jun 3, 2022

bradfitz@tsdev:~/src/tailscale.com$ make updatedeps
./tool/go run github.com/tailscale/depaware --update tailscale.com/cmd/tailscaled
./tool/go run github.com/tailscale/depaware --update tailscale.com/cmd/tailscale
git bradfitz@tsdev:~/src/tailscale.com$ git di
diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt
index 73f41043..ba0de4bc 100644
--- a/cmd/tailscaled/depaware.txt
+++ b/cmd/tailscaled/depaware.txt
@@ -79,7 +79,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
         github.com/klauspost/compress/flate                          from nhooyr.io/websocket
         github.com/klauspost/compress/fse                            from github.com/klauspost/compress/huff0
         github.com/klauspost/compress/huff0                          from github.com/klauspost/compress/zstd
-        github.com/klauspost/compress/internal/cpuinfo               from github.com/klauspost/compress/zstd+
+        github.com/klauspost/compress/internal/cpuinfo               from github.com/klauspost/compress/zstd
         github.com/klauspost/compress/internal/snapref               from github.com/klauspost/compress/zstd
         github.com/klauspost/compress/zstd                           from tailscale.com/smallzstd
         github.com/klauspost/compress/zstd/internal/xxhash           from github.com/klauspost/compress/zstd

Copy link
Copy Markdown
Member

@bradfitz bradfitz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM after the depaware fix

@bradfitz
Copy link
Copy Markdown
Member

bradfitz commented Jun 3, 2022

Do you have any dirty files in your git repo that depaware is picking up?

@bradfitz
Copy link
Copy Markdown
Member

bradfitz commented Jun 3, 2022

In the commit message, instead of For #nnn, use Updates #nnnn. (The two verbs we use for issues are "Fixes" or "Updates")

…ockets

We can't do Noise-over-HTTP in Wasm/JS (because we don't have bidirectional
communication), but we should be able to do it over WebSockets. Reuses
derp WebSocket support that allows us to turn a WebSocket connection
into a net.Conn.

Updates #3157

Signed-off-by: Mihai Parparita <mihai@tailscale.com>
@mihaip mihaip force-pushed the mihaip/ws-controlhttp branch from 49a8db4 to 5f16cfb Compare June 3, 2022 04:04
@mihaip
Copy link
Copy Markdown
Contributor Author

mihaip commented Jun 3, 2022

It was the Go workspace, generated the correct depaware diff once I disabled it 🤷

@mihaip mihaip merged commit a9f3265 into main Jun 3, 2022
@mihaip mihaip deleted the mihaip/ws-controlhttp branch June 3, 2022 04:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants