Skip to content

Commit

Permalink
add force http and default to url
Browse files Browse the repository at this point in the history
  • Loading branch information
@Danny-Dasilva
Danny-Dasilva committed Nov 27, 2023
1 parent 55eeeb6 commit 8367623
Show file tree
Hide file tree
Showing 7 changed files with 752 additions and 49 deletions.
7 changes: 4 additions & 3 deletions cycletls/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ import (
"golang.org/x/net/proxy"
)

type browser struct {
type Browser struct {
// Return a greeting that embeds the name in a message.
JA3 string
UserAgent string
Cookies []Cookie
forceHTTP1 bool
}

var disabledRedirect = func(req *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse
}

func clientBuilder(browser browser, dialer proxy.ContextDialer, timeout int, disableRedirect bool) http.Client {
func clientBuilder(browser Browser, dialer proxy.ContextDialer, timeout int, disableRedirect bool) http.Client {
//if timeout is not set in call default to 15
if timeout == 0 {
timeout = 15
Expand All @@ -36,7 +37,7 @@ func clientBuilder(browser browser, dialer proxy.ContextDialer, timeout int, dis
}

// newClient creates a new http client
func newClient(browser browser, timeout int, disableRedirect bool, UserAgent string, proxyURL ...string) (http.Client, error) {
func newClient(browser Browser, timeout int, disableRedirect bool, UserAgent string, proxyURL ...string) (http.Client, error) {
//fix check PR
if len(proxyURL) > 0 && len(proxyURL[0]) > 0 {
dialer, err := newConnectDialer(proxyURL[0], UserAgent)
Expand Down
244 changes: 244 additions & 0 deletions cycletls/extensions.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,244 @@
package cycletls

import (
"fmt"
utls "github.com/refraction-networking/utls"
"strconv"
)

type TLSExtensions struct {
SupportedSignatureAlgorithms *utls.SignatureAlgorithmsExtension
CertCompressionAlgo *utls.UtlsCompressCertExtension
RecordSizeLimit *utls.FakeRecordSizeLimitExtension
DelegatedCredentials *utls.DelegatedCredentialsExtension
SupportedVersions *utls.SupportedVersionsExtension
PSKKeyExchangeModes *utls.PSKKeyExchangeModesExtension
SignatureAlgorithmsCert *utls.SignatureAlgorithmsCertExtension
KeyShareCurves *utls.KeyShareExtension
UseGREASE bool
}

type Extensions struct {
//PKCS1WithSHA256 SignatureScheme = 0x0401
//PKCS1WithSHA384 SignatureScheme = 0x0501
//PKCS1WithSHA512 SignatureScheme = 0x0601
//PSSWithSHA256 SignatureScheme = 0x0804
//PSSWithSHA384 SignatureScheme = 0x0805
//PSSWithSHA512 SignatureScheme = 0x0806
//ECDSAWithP256AndSHA256 SignatureScheme = 0x0403
//ECDSAWithP384AndSHA384 SignatureScheme = 0x0503
//ECDSAWithP521AndSHA512 SignatureScheme = 0x0603
//Ed25519 SignatureScheme = 0x0807
//PKCS1WithSHA1 SignatureScheme = 0x0201
//ECDSAWithSHA1 SignatureScheme = 0x0203
SupportedSignatureAlgorithms []string `json:"SupportedSignatureAlgorithms"`
//CertCompressionZlib CertCompressionAlgo = 0x0001
//CertCompressionBrotli CertCompressionAlgo = 0x0002
//CertCompressionZstd CertCompressionAlgo = 0x0003
CertCompressionAlgo []string `json:"CertCompressionAlgo"`
// Limit: 0x4001
RecordSizeLimit int `json:"RecordSizeLimit"`
//PKCS1WithSHA256 SignatureScheme = 0x0401
//PKCS1WithSHA384 SignatureScheme = 0x0501
//PKCS1WithSHA512 SignatureScheme = 0x0601
//PSSWithSHA256 SignatureScheme = 0x0804
//PSSWithSHA384 SignatureScheme = 0x0805
//PSSWithSHA512 SignatureScheme = 0x0806
//ECDSAWithP256AndSHA256 SignatureScheme = 0x0403
//ECDSAWithP384AndSHA384 SignatureScheme = 0x0503
//ECDSAWithP521AndSHA512 SignatureScheme = 0x0603
//Ed25519 SignatureScheme = 0x0807
//PKCS1WithSHA1 SignatureScheme = 0x0201
//ECDSAWithSHA1 SignatureScheme = 0x0203
DelegatedCredentials []string `json:"DelegatedCredentials"`
//GREASE_PLACEHOLDER = 0x0a0a
//VersionTLS10 = 0x0301
//VersionTLS11 = 0x0302
//VersionTLS12 = 0x0303
//VersionTLS13 = 0x0304
//VersionSSL30 = 0x0300
SupportedVersions []string `json:"SupportedVersions"`
//PskModePlain uint8 = pskModePlain
//PskModeDHE uint8 = pskModeDHE
PSKKeyExchangeModes []string `json:"PSKKeyExchangeModes"`
//PKCS1WithSHA256 SignatureScheme = 0x0401
//PKCS1WithSHA384 SignatureScheme = 0x0501
//PKCS1WithSHA512 SignatureScheme = 0x0601
//PSSWithSHA256 SignatureScheme = 0x0804
//PSSWithSHA384 SignatureScheme = 0x0805
//PSSWithSHA512 SignatureScheme = 0x0806
//ECDSAWithP256AndSHA256 SignatureScheme = 0x0403
//ECDSAWithP384AndSHA384 SignatureScheme = 0x0503
//ECDSAWithP521AndSHA512 SignatureScheme = 0x0603
//Ed25519 SignatureScheme = 0x0807
//PKCS1WithSHA1 SignatureScheme = 0x0201
//ECDSAWithSHA1 SignatureScheme = 0x0203
SignatureAlgorithmsCert []string `json:"SignatureAlgorithmsCert"`
//GREASE_PLACEHOLDER = 0x0a0a
//CurveP256 CurveID = 23
//CurveP384 CurveID = 24
//CurveP521 CurveID = 25
//X25519 CurveID = 29
KeyShareCurves []string `json:"KeyShareCurves"`
//default is false, default is used grease, if not used grease the UseGREASE param is true
UseGREASE bool `json:"UseGREASE"`
}
var supportedSignatureAlgorithmsExtensions = map[string]utls.SignatureScheme{
"PKCS1WithSHA256": utls.PKCS1WithSHA256,
"PKCS1WithSHA384": utls.PKCS1WithSHA384,
"PKCS1WithSHA512": utls.PKCS1WithSHA512,
"PSSWithSHA256": utls.PSSWithSHA256,
"PSSWithSHA384": utls.PSSWithSHA384,
"PSSWithSHA512": utls.PSSWithSHA512,
"ECDSAWithP256AndSHA256": utls.ECDSAWithP256AndSHA256,
"ECDSAWithP384AndSHA384": utls.ECDSAWithP384AndSHA384,
"ECDSAWithP521AndSHA512": utls.ECDSAWithP521AndSHA512,
"Ed25519": utls.Ed25519,
"PKCS1WithSHA1": utls.PKCS1WithSHA1,
"ECDSAWithSHA1": utls.ECDSAWithSHA1,
"rsa_pkcs1_sha1": utls.SignatureScheme(0x0201),
"Reserved for backward compatibility": utls.SignatureScheme(0x0202),
"ecdsa_sha1": utls.SignatureScheme(0x0203),
"rsa_pkcs1_sha256": utls.SignatureScheme(0x0401),
"ecdsa_secp256r1_sha256": utls.SignatureScheme(0x0403),
"rsa_pkcs1_sha256_legacy": utls.SignatureScheme(0x0420),
"rsa_pkcs1_sha384": utls.SignatureScheme(0x0501),
"ecdsa_secp384r1_sha384": utls.SignatureScheme(0x0503),
"rsa_pkcs1_sha384_legacy": utls.SignatureScheme(0x0520),
"rsa_pkcs1_sha512": utls.SignatureScheme(0x0601),
"ecdsa_secp521r1_sha512": utls.SignatureScheme(0x0603),
"rsa_pkcs1_sha512_legacy": utls.SignatureScheme(0x0620),
"eccsi_sha256": utls.SignatureScheme(0x0704),
"iso_ibs1": utls.SignatureScheme(0x0705),
"iso_ibs2": utls.SignatureScheme(0x0706),
"iso_chinese_ibs": utls.SignatureScheme(0x0707),
"sm2sig_sm3": utls.SignatureScheme(0x0708),
"gostr34102012_256a": utls.SignatureScheme(0x0709),
"gostr34102012_256b": utls.SignatureScheme(0x070A),
"gostr34102012_256c": utls.SignatureScheme(0x070B),
"gostr34102012_256d": utls.SignatureScheme(0x070C),
"gostr34102012_512a": utls.SignatureScheme(0x070D),
"gostr34102012_512b": utls.SignatureScheme(0x070E),
"gostr34102012_512c": utls.SignatureScheme(0x070F),
"rsa_pss_rsae_sha256": utls.SignatureScheme(0x0804),
"rsa_pss_rsae_sha384": utls.SignatureScheme(0x0805),
"rsa_pss_rsae_sha512": utls.SignatureScheme(0x0806),
"ed25519": utls.SignatureScheme(0x0807),
"ed448": utls.SignatureScheme(0x0808),
"rsa_pss_pss_sha256": utls.SignatureScheme(0x0809),
"rsa_pss_pss_sha384": utls.SignatureScheme(0x080A),
"rsa_pss_pss_sha512": utls.SignatureScheme(0x080B),
"ecdsa_brainpoolP256r1tls13_sha256": utls.SignatureScheme(0x081A),
"ecdsa_brainpoolP384r1tls13_sha384": utls.SignatureScheme(0x081B),
"ecdsa_brainpoolP512r1tls13_sha512": utls.SignatureScheme(0x081C),
}

var certCompressionAlgoExtensions = map[string]utls.CertCompressionAlgo{
"zlib": utls.CertCompressionZlib,
"brotli": utls.CertCompressionBrotli,
"zstd": utls.CertCompressionZstd,
}

var supportedVersionsExtensions = map[string]uint16{
"GREASE": utls.GREASE_PLACEHOLDER,
"1.3": utls.VersionTLS13,
"1.2": utls.VersionTLS12,
"1.1": utls.VersionTLS11,
"1.0": utls.VersionTLS10,
}

var pskKeyExchangeModesExtensions = map[string]uint8{
"PskModeDHE": utls.PskModeDHE,
"PskModePlain": utls.PskModePlain,
}

var keyShareCurvesExtensions = map[string]utls.KeyShare{
"GREASE": utls.KeyShare{Group: utls.CurveID(utls.GREASE_PLACEHOLDER), Data: []byte{0}},
"P256": utls.KeyShare{Group: utls.CurveP256},
"P384": utls.KeyShare{Group: utls.CurveP384},
"P521": utls.KeyShare{Group: utls.CurveP521},
"X25519": utls.KeyShare{Group: utls.X25519},
}



func ToTLSExtensions(e *Extensions) (extensions *TLSExtensions) {
extensions = &TLSExtensions{}
if e == nil {
return extensions
}
if e.SupportedSignatureAlgorithms != nil {
extensions.SupportedSignatureAlgorithms = &utls.SignatureAlgorithmsExtension{SupportedSignatureAlgorithms: []utls.SignatureScheme{}}
for _, s := range e.SupportedSignatureAlgorithms {
var signature_algorithms utls.SignatureScheme
if val, ok := supportedSignatureAlgorithmsExtensions[s]; ok {
signature_algorithms = val
} else {
hexInt, _ := strconv.ParseInt(s, 0, 0)
signature_algorithms = utls.SignatureScheme(hexInt)
}
extensions.SupportedSignatureAlgorithms.SupportedSignatureAlgorithms = append(extensions.SupportedSignatureAlgorithms.SupportedSignatureAlgorithms, signature_algorithms)
}
}
if e.CertCompressionAlgo != nil {
extensions.CertCompressionAlgo = &utls.UtlsCompressCertExtension{Algorithms: []utls.CertCompressionAlgo{}}
for _, s := range e.CertCompressionAlgo {
extensions.CertCompressionAlgo.Algorithms = append(extensions.CertCompressionAlgo.Algorithms, certCompressionAlgoExtensions[s])
}
}
if e.RecordSizeLimit != 0 {
hexStr := fmt.Sprintf("0x%v", e.RecordSizeLimit)
hexInt, _ := strconv.ParseInt(hexStr, 0, 0)
extensions.RecordSizeLimit = &utls.FakeRecordSizeLimitExtension{uint16(hexInt)}
}
if e.DelegatedCredentials != nil {
extensions.DelegatedCredentials = &utls.DelegatedCredentialsExtension{SupportedSignatureAlgorithms: []utls.SignatureScheme{}}
for _, s := range e.DelegatedCredentials {
var signature_algorithms utls.SignatureScheme
if val, ok := supportedSignatureAlgorithmsExtensions[s]; ok {
signature_algorithms = val
} else {
hexStr := fmt.Sprintf("0x%v", e.RecordSizeLimit)
hexInt, _ := strconv.ParseInt(hexStr, 0, 0)
signature_algorithms = utls.SignatureScheme(hexInt)
}
extensions.DelegatedCredentials.SupportedSignatureAlgorithms = append(extensions.DelegatedCredentials.SupportedSignatureAlgorithms, signature_algorithms)
}
}
if e.SupportedVersions != nil {
extensions.SupportedVersions = &utls.SupportedVersionsExtension{Versions: []uint16{}}
for _, s := range e.SupportedVersions {
extensions.SupportedVersions.Versions = append(extensions.SupportedVersions.Versions, supportedVersionsExtensions[s])
}
}
if e.PSKKeyExchangeModes != nil {
extensions.PSKKeyExchangeModes = &utls.PSKKeyExchangeModesExtension{Modes: []uint8{}}
for _, s := range e.PSKKeyExchangeModes {
extensions.PSKKeyExchangeModes.Modes = append(extensions.PSKKeyExchangeModes.Modes, pskKeyExchangeModesExtensions[s])
}
}
if e.SignatureAlgorithmsCert != nil {
extensions.SignatureAlgorithmsCert = &utls.SignatureAlgorithmsCertExtension{SupportedSignatureAlgorithms: []utls.SignatureScheme{}}
for _, s := range e.SignatureAlgorithmsCert {
var signature_algorithms_cert utls.SignatureScheme
if val, ok := supportedSignatureAlgorithmsExtensions[s]; ok {
signature_algorithms_cert = val
} else {
hexStr := fmt.Sprintf("0x%v", e.RecordSizeLimit)
hexInt, _ := strconv.ParseInt(hexStr, 0, 0)
signature_algorithms_cert = utls.SignatureScheme(hexInt)
}
extensions.SignatureAlgorithmsCert.SupportedSignatureAlgorithms = append(extensions.SignatureAlgorithmsCert.SupportedSignatureAlgorithms, signature_algorithms_cert)
}
}
if e.KeyShareCurves != nil {
extensions.KeyShareCurves = &utls.KeyShareExtension{KeyShares: []utls.KeyShare{}}
for _, s := range e.KeyShareCurves {
extensions.KeyShareCurves.KeyShares = append(extensions.KeyShareCurves.KeyShares, keyShareCurvesExtensions[s])
}
}
if e.UseGREASE != false {
extensions.UseGREASE = e.UseGREASE
}
return extensions
}
17 changes: 10 additions & 7 deletions cycletls/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
module github.com/Danny-Dasilva/CycleTLS/cycletls

go 1.14
go 1.16

require (
github.com/Danny-Dasilva/fhttp v0.0.0-20220418193729-cc12308ae5ea
github.com/Danny-Dasilva/utls v0.0.0-20220418193928-4fb5d057f356
github.com/Danny-Dasilva/fhttp v0.0.0-20220524230104-f801520157d6
github.com/Danny-Dasilva/utls v0.0.0-20220604023528-30cb107b834e // indirect
github.com/PuerkitoBio/goquery v1.8.0
github.com/andybalholm/brotli v1.0.4
github.com/andybalholm/brotli v1.0.6
github.com/cloudflare/circl v1.3.6 // indirect
github.com/gorilla/websocket v1.5.0
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/quic-go/quic-go v0.39.3 // indirect
github.com/refraction-networking/utls v1.5.4
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0
)
Loading

0 comments on commit 8367623

Please sign in to comment.