mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-03 20:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

refactor+feat: Custom Client Handshake + Implement ALPS extension (#142)

Browse source 
* refactor: split `CompressCertExtension` changes

- Split most of changes for `CompressCertExtension` made to `crypto/tls` files out and moved them to `u_` files.
- Edited some `crypto/tls` files to achieve better programmability for uTLS.
- Minor styling fix.

* feat: implement ALPS Extension draft

- Made necessary modifications to existing types to support ALPS.
- Ported `ApplicationSettingsExtension` implementation from `ulixee/utls` by @blakebyrnes with some adaptation.

Co-Authored-By: Blake Byrnes <115056+blakebyrnes@users.noreply.github.com>

* feat: utlsFakeCustomExtension in ALPS

- Introducing `utlsFakeCustomExtension` to enable implementation for custom extensions to be exchanged via ALPS.
- currently it doesn't do anything.

Co-Authored-By: Blake Byrnes <115056+blakebyrnes@users.noreply.github.com>

* fix: magic number in `StatusRequestV2Extension`

- Fixed magic number `17` in `StatusRequestV2Extension` with pre-defined enum `extensionStatusRequestV2`.

Co-authored-by: Blake Byrnes <115056+blakebyrnes@users.noreply.github.com>
This commit is contained in:
Gaukas Wang 2022-11-17 14:04:29 -07:00 • committed by GitHub
parent 1b3a9ad4c5
commit fb99df2a2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 375 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

22
u_tls_extensions.go
View file

@ -132,8 +132,8 @@ func (e *StatusRequestV2Extension) Read(b []byte) (int, error) {
return 0, io.ErrShortBuffer
}
// RFC 4366, section 3.6
b[0] = byte(17 >> 8)
b[1] = byte(17)
b[0] = byte(extensionStatusRequestV2 >> 8)
b[1] = byte(extensionStatusRequestV2)
b[2] = 0
b[3] = 9
b[4] = 0
@ -356,17 +356,9 @@ func (e *ALPNExtension) Read(b []byte) (int, error) {
return e.Len(), io.EOF
}
// ApplicationSettingsExtension represents the TLS ALPS extension. At the time
// of this writing, this extension is currently a draft:
// ApplicationSettingsExtension represents the TLS ALPS extension.
// At the time of this writing, this extension is currently a draft:
// https://datatracker.ietf.org/doc/html/draft-vvv-tls-alps-01
//
// This library does not offer actual support for ALPS. This extension is
// "faked" - it is advertised by the client, but not respected if the server
// responds with support.
//
// In the normal convention of this library, this type name would be prefixed
// with 'Fake'. The existing name is retained for backwards compatibility
// reasons.
type ApplicationSettingsExtension struct {
SupportedProtocols []string
}
@ -389,8 +381,8 @@ func (e *ApplicationSettingsExtension) Read(b []byte) (int, error) {
}
// Read Type.
b[0] = byte(fakeExtensionALPS >> 8) // hex: 44 dec: 68
b[1] = byte(fakeExtensionALPS & 0xff) // hex: 69 dec: 105
b[0] = byte(utlsExtensionApplicationSettings >> 8) // hex: 44 dec: 68
b[1] = byte(utlsExtensionApplicationSettings & 0xff) // hex: 69 dec: 105
lengths := b[2:] // get the remaining buffer without Type
b = b[6:] // set the buffer to the buffer without Type, Length and ALPS Extension Length (so only the Supported ALPN list remains)
@ -863,7 +855,7 @@ func (e *FakeChannelIDExtension) Read(b []byte) (int, error) {
}
extensionID := fakeExtensionChannelID
if e.OldExtensionID {
extensionID = fakeExtensionChannelIDOld
extensionID = fakeOldExtensionChannelID
}
// https://tools.ietf.org/html/draft-balfanz-tls-channelid-00
b[0] = byte(extensionID >> 8)