archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-14 05:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add broker and server side rejection based on proxy version

Browse source
This commit is contained in:
Shelikhoo 2025-02-19 15:47:36 +00:00
parent 1bc310c2e9
commit 6ec0025e93
No known key found for this signature in database
GPG key ID: 4C9764E9FE80A3DC
4 changed files with 166 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
common/messages/proxy.go
View file

@ -13,7 +13,7 @@ import (
)
const (
version = "1.3"
version = "1.4"
ProxyUnknown = "unknown"
)
@ -124,11 +124,18 @@ func DecodeProxyPollRequest(data []byte) (sid string, proxyType string, natType
return
}
// Decodes a poll message from a snowflake proxy and returns the
// sid, proxy type, nat type and clients of the proxy on success
// and an error if it failed
func DecodeProxyPollRequestWithRelayPrefix(data []byte) (
sid string, proxyType string, natType string, clients int, relayPrefix string, relayPrefixAware bool, err error) {
sid, proxyType, natType, clients, relayPrefix, relayPrefixAware, _, err = DecodeProxyPollRequestWithRelayPrefixAndReturnVersion(data)
return
}
// Decodes a poll message from a snowflake proxy and returns the
// sid, proxy type, nat type and clients, version of the proxy on success
// and an error if it failed
func DecodeProxyPollRequestWithRelayPrefixAndReturnVersion(data []byte) (
sid string, proxyType string, natType string, clients int,
relayPrefix string, relayPrefixAware bool, version string, err error) {
var message ProxyPollRequest
err = json.Unmarshal(data, &message)
@ -169,7 +176,7 @@ func DecodeProxyPollRequestWithRelayPrefix(data []byte) (
acceptedRelayPattern = *message.AcceptedRelayPattern
}
return message.Sid, message.Type, message.NAT, message.Clients,
acceptedRelayPattern, message.AcceptedRelayPattern != nil, nil
acceptedRelayPattern, message.AcceptedRelayPattern != nil, message.Version, nil
}
type ProxyPollResponse struct {