Update adapter, setup websockets

Author: sleeyax

aternos_api.go

@@ -1,12 +1,13 @@
 package aternos_api
 
 import (
+	tls "github.com/refraction-networking/utls"
+	"github.com/sleeyax/aternos-api/internal/tlsadapter"
 	"github.com/sleeyax/gotcha"
-	"github.com/sleeyax/gotcha/adapters/fhttp"
-	httpx "github.com/useflyent/fhttp"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
+	"strings"
 )
 
 type AternosApi struct {
@@ -22,29 +23,29 @@ type AternosApi struct {
 func New(options *Options) *AternosApi {
 	jar, _ := cookiejar.New(&cookiejar.Options{})
 
-	var adapter gotcha.Adapter
-	if options.Proxy != nil {
-		adapter = &fhttp.Adapter{Transport: &httpx.Transport{
-			Proxy: httpx.ProxyURL(options.Proxy),
-		}}
-	} else {
-		adapter = fhttp.NewAdapter()
-	}
+	adapter := tlsadapter.New(&tls.Config{ServerName: "aternos.org", InsecureSkipVerify: options.InsecureSkipVerify})
 
 	client, _ := gotcha.NewClient(&gotcha.Options{
 		Adapter:   adapter,
 		PrefixURL: "https://aternos.org/",
 		Headers: http.Header{
-			"user-agent":         {"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"},
-			"accept":             {"text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"},
-			"accept-language":    {"en-US,en;q=0.9"},
-			"accept-encoding":    {"gzip, deflate, br"},
-			"cookie":             nil,
-			httpx.HeaderOrderKey: []string{"user-agent", "accept", "accept-language", "accept-encoding", "cookie"},
+			"User-Agent":      {"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"},
+			"Accept":          {"*/*"},
+			"Accept-Language": {"en-US,en;q=0.9"},
 		},
 		CookieJar:      jar,
 		FollowRedirect: false,
 		Retry:          false,
+		Hooks: gotcha.Hooks{
+			AfterResponse: []gotcha.AfterResponseHook{
+				func(response *gotcha.Response, retry gotcha.RetryFunc) (*gotcha.Response, error) {
+					if location := response.Header.Get("location"); strings.Contains(location, "go") {
+						return response, UnauthenticatedError
+					}
+					return response, nil
+				},
+			},
+		},
 	})
 
 	u, _ := url.Parse(client.Options.PrefixURL)

errors.go

@@ -2,5 +2,6 @@ package aternos_api
 
 import "errors"
 
-var ServerAlreadyStartedError = errors.New("server already running")
+var ServerAlreadyStartedError = errors.New("server already started")
 var ServerAlreadyStoppedError = errors.New("server already stopped")
+var UnauthenticatedError = errors.New("unauthenticated")

go.mod

@@ -5,18 +5,25 @@ go 1.17
 require (
 	github.com/PuerkitoBio/goquery v1.8.0
 	github.com/dop251/goja v0.0.0-20211217115348-3f9136fa235d
+	github.com/gorilla/websocket v1.4.3-0.20220104015952-9111bb834a68
+	github.com/refraction-networking/utls v1.0.0
 	github.com/sleeyax/gotcha v0.0.2
 	github.com/sleeyax/gotcha/adapters/fhttp v0.0.0-20211225143732-1ae0bde30de1
 	github.com/useflyent/fhttp v0.0.0-20210801005649-f160dd923789
 )
 
 require (
 	github.com/Sleeyax/urlValues v1.0.0 // indirect
-	github.com/andybalholm/brotli v1.0.3 // indirect
+	github.com/andybalholm/brotli v1.0.4 // indirect
 	github.com/andybalholm/cascadia v1.3.1 // indirect
 	github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
-	golang.org/x/net v0.0.0-20210916014120-12bc252f5db8 // indirect
+	github.com/klauspost/compress v1.13.6 // indirect
+	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
+	golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
+	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
 	golang.org/x/text v0.3.6 // indirect
 )
+
+replace github.com/refraction-networking/utls => github.com/sleeyax/utls v1.1.1

go.sum

@@ -2,8 +2,9 @@ github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0g
 github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI=
 github.com/Sleeyax/urlValues v1.0.0 h1:dtjjBUoygDTofrYiGupYG61+Dw87tpQJ9jkc+3o4fjU=
 github.com/Sleeyax/urlValues v1.0.0/go.mod h1:IiljpGAUgWNsPFduJzF/fBnlfRwNvRPGG7evNThNaSw=
-github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
 github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
+github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c=
 github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -14,8 +15,12 @@ github.com/dop251/goja v0.0.0-20211217115348-3f9136fa235d/go.mod h1:R9ET47fwRVRP
 github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
+github.com/gorilla/websocket v1.4.3-0.20220104015952-9111bb834a68 h1:m6V3+LXduRWqp1rg8FMHBagwmNsgXMVj5PHVLYnPeVQ=
+github.com/gorilla/websocket v1.4.3-0.20220104015952-9111bb834a68/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -24,16 +29,26 @@ github.com/sleeyax/gotcha v0.0.2 h1:eiCFjEa4nwl/eZ7etBswDKPQ0bUp8YPbuicCHJtD68I=
 github.com/sleeyax/gotcha v0.0.2/go.mod h1:H2TKsKYJIXgmFGGUqs21FCr1HXVXjNWccX5/WexkLOM=
 github.com/sleeyax/gotcha/adapters/fhttp v0.0.0-20211225143732-1ae0bde30de1 h1:qlengZ6XaJeHZl4AgIOvcGMs4r75V6DFuP+7zjgQzo0=
 github.com/sleeyax/gotcha/adapters/fhttp v0.0.0-20211225143732-1ae0bde30de1/go.mod h1:LrrdDyEt7OnH6iI0XvXoJgh6hweTOSkNmDR0TOqG5b0=
+github.com/sleeyax/utls v1.1.1 h1:tVapK30m6pEJd4zq5Cmq/SwmkhPsbxfik1bBagMpKgw=
+github.com/sleeyax/utls v1.1.1/go.mod h1:+D89TUtA8+NKVFj1IXWr0p3tSdX1+SqUB7rL0QnGqyg=
 github.com/useflyent/fhttp v0.0.0-20210801005649-f160dd923789 h1:EnTm6BiUoGxi7fdeHMnSBnDyyKYT0AWq96V3cXouL4s=
 github.com/useflyent/fhttp v0.0.0-20210801005649-f160dd923789/go.mod h1:GTDLTqqiwTuUM1f9bCE/HoHOzBaCtT1Zjkd98vUEwrI=
+golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210916014120-12bc252f5db8 h1:/6y1LfuqNuQdHAm0jjtPtgRcxIxjVZgm5OTu8/QhZvk=
 golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211111160137-58aab5ef257a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

http.go

@@ -106,8 +106,6 @@ func (api *AternosApi) GetServerInfo() (ServerInfo, error) {
 	return info, err
 }
 
-// TODO: start & stop server over websockets (wss://aternos.org/hermes/)
-
 // StartServer starts your Minecraft server over HTTP.
 func (api *AternosApi) StartServer() error {
 	info, err := api.GetServerInfo()
@@ -167,7 +165,7 @@ func (api *AternosApi) ConfirmServer(delay time.Duration) error {
 	return nil
 }
 
-// StopServer stops the minecraft server over HTTP.
+// StopServer stops the Minecraft server over HTTP.
 // This function doesn't wait until the server is fully stopped, it only requests a shutdown.
 func (api *AternosApi) StopServer() error {
 	info, err := api.GetServerInfo()

internal/tlsadapter/clienthello.go

@@ -0,0 +1,80 @@
+package tlsadapter
+
+import tls "github.com/refraction-networking/utls"
+
+// CustomClientHelloSpec is a custom tls.ClientHelloSpec for the Chrome v96 browser (but with HTTP 2 disabled!)
+var CustomClientHelloSpec = &tls.ClientHelloSpec{
+	CipherSuites: []uint16{
+		tls.GREASE_PLACEHOLDER,
+		tls.TLS_AES_128_GCM_SHA256,
+		tls.TLS_AES_256_GCM_SHA384,
+		tls.TLS_CHACHA20_POLY1305_SHA256,
+		tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+		tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+		tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+		tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+		tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
+		tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
+		tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+		tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
+		tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+		tls.TLS_RSA_WITH_AES_128_CBC_SHA,
+		tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+	},
+	CompressionMethods: []byte{
+		0x00, // compressionNone
+	},
+	Extensions: []tls.TLSExtension{
+		&tls.UtlsGREASEExtension{},
+		&tls.SNIExtension{},
+		&tls.UtlsExtendedMasterSecretExtension{},
+		&tls.RenegotiationInfoExtension{Renegotiation: tls.RenegotiateOnceAsClient},
+		&tls.SupportedCurvesExtension{[]tls.CurveID{
+			tls.CurveID(tls.GREASE_PLACEHOLDER),
+			tls.X25519,
+			tls.CurveP256,
+			tls.CurveP384,
+		}},
+		&tls.SupportedPointsExtension{SupportedPoints: []byte{
+			0x00, // pointFormatUncompressed
+		}},
+		&tls.SessionTicketExtension{},
+		// NOTE: HTTP 2 is disabled for now because the websockets server only supports http 1.
+		// TODO: control HTTP version from parent code instead.
+		// &tls.ALPNExtension{AlpnProtocols: []string{"h2", "http/1.1"}},
+		&tls.ALPNExtension{AlpnProtocols: []string{"http/1.1"}},
+		&tls.StatusRequestExtension{},
+		&tls.SignatureAlgorithmsExtension{SupportedSignatureAlgorithms: []tls.SignatureScheme{
+			tls.ECDSAWithP256AndSHA256,
+			tls.PSSWithSHA256,
+			tls.PKCS1WithSHA256,
+			tls.ECDSAWithP384AndSHA384,
+			tls.PSSWithSHA384,
+			tls.PKCS1WithSHA384,
+			tls.PSSWithSHA512,
+			tls.PKCS1WithSHA512,
+		}},
+		&tls.SCTExtension{},
+		&tls.KeyShareExtension{[]tls.KeyShare{
+			{Group: tls.CurveID(tls.GREASE_PLACEHOLDER), Data: []byte{0}},
+			{Group: tls.X25519},
+		}},
+		&tls.PSKKeyExchangeModesExtension{[]uint8{
+			tls.PskModeDHE,
+		}},
+		&tls.SupportedVersionsExtension{[]uint16{
+			tls.GREASE_PLACEHOLDER,
+			tls.VersionTLS13,
+			tls.VersionTLS12,
+			tls.VersionTLS11,
+			tls.VersionTLS10,
+		}},
+		&tls.UtlsCompressCertExtension{[]tls.CertCompressionAlgo{
+			tls.CertCompressionBrotli,
+		}},
+		&tls.GenericExtension{Id: 0x4469}, // WARNING: UNKNOWN EXTENSION, USE AT YOUR OWN RISK
+		&tls.UtlsGREASEExtension{},
+		&tls.UtlsPaddingExtension{GetPaddingLen: tls.BoringPaddingStyle},
+	},
+}

internal/tlsadapter/tls_adapter.go

@@ -0,0 +1,70 @@
+package tlsadapter
+
+import (
+	"context"
+	tls "github.com/refraction-networking/utls"
+	"github.com/sleeyax/gotcha"
+	fhttpadapter "github.com/sleeyax/gotcha/adapters/fhttp"
+	fhttp "github.com/useflyent/fhttp"
+	"net"
+	"net/url"
+)
+
+// TLSAdapter implements a custom gotcha.Adapter with advanced TLS options.
+type TLSAdapter struct {
+	// TLS fingerprint to use.
+	// Defaults to tls.HelloCustom.
+	Fingerprint tls.ClientHelloID
+
+	// Optional custom client hello specification to use.
+	// When specified, Fingerprint should be set to tls.HelloCustom.
+	// Defaults to a custom Chrome 96 spec.
+	ClientHelloSpec *tls.ClientHelloSpec
+
+	// Optional TLS configuration to use.
+	Config *tls.Config
+}
+
+// New creates a new gotcha adapter configured with a Chrome 96 browser TLS fingerprint.
+func New(config *tls.Config) *TLSAdapter {
+	return &TLSAdapter{Fingerprint: tls.HelloCustom, ClientHelloSpec: CustomClientHelloSpec, Config: config}
+}
+
+// DoRequest executes a HTTP 1 request and returns its response.
+func (ua *TLSAdapter) DoRequest(options *gotcha.Options) (*gotcha.Response, error) {
+	transport := &fhttp.Transport{
+		Proxy: func(*fhttp.Request) (*url.URL, error) {
+			return options.Proxy, nil
+		},
+		// TODO: fix
+		//DialTLSContext:      ua.DialTLSContext,
+		MaxConnsPerHost:     1,
+		MaxIdleConns:        1,
+		MaxIdleConnsPerHost: 1,
+	}
+
+	adapter := fhttpadapter.Adapter{Transport: transport}
+
+	return adapter.DoRequest(options)
+}
+
+func (ua *TLSAdapter) DialTLSContext(_ context.Context, network string, addr string) (net.Conn, error) {
+	conn, err := net.Dial(network, addr)
+	if err != nil {
+		return nil, err
+	}
+
+	uconn := tls.UClient(conn, ua.Config, ua.Fingerprint)
+
+	if ua.Fingerprint == tls.HelloCustom {
+		if err = uconn.ApplyPreset(ua.ClientHelloSpec); err != nil {
+			return nil, err
+		}
+	}
+
+	if err = uconn.Handshake(); err != nil {
+		return nil, err
+	}
+
+	return uconn, err
+}

options.go

@@ -15,4 +15,8 @@ type Options struct {
 
 	// Optional HTTP proxy to use.
 	Proxy *url.URL
+
+	// Disables server SSL certificate checks.
+	// It's recommended to enable this only for debugging purposes, such as debugging traffic with a web debugging/HTTP/MITM proxy.
+	InsecureSkipVerify bool
 }

server_info.go

@@ -75,7 +75,7 @@ type ServerInfo struct {
 	// E.g vanilla, papermc.
 	SoftwareType string `json:"type"`
 
-	// Current minecraft version.
+	// Current Minecraft version.
 	Version string `json:"version"`
 
 	IsDeprecated bool `json:"deprecated"`

utils.go

@@ -2,31 +2,9 @@ package aternos_api
 
 import (
 	"encoding/base64"
-	"github.com/PuerkitoBio/goquery"
 	"math/rand"
-	"strings"
 )
 
-// findList finds and extracts a list of items from a HTML document.
-//
-// Example:
-//
-// <ul>
-//   <li>foo</li>
-//   <li>bar</li>
-// </ul>
-//
-// findList(document, "li") -> ["foo", "bar"]
-func findList(document *goquery.Document, selector string) []string {
-	items := make([]string, 0)
-
-	document.Find(selector).Each(func(i int, selection *goquery.Selection) {
-		items = append(items, strings.TrimSpace(selection.Text()))
-	})
-
-	return items
-}
-
 // randomString generates a random lowercase string.
 // E.g. mdlc2c9chx9, mbywjir33mm
 func randomString(length int) string {
@@ -41,23 +19,6 @@ func randomString(length int) string {
 	return string(s)
 }
 
-// GetStringInBetween finds a string between two substrings and returns an empty string if no string has been found.
-func getStringInBetween(str string, left string, right string) string {
-	s := strings.Index(str, left)
-	if s == -1 {
-		return ""
-	}
-
-	s += len(left)
-
-	e := strings.Index(str, right)
-	if e == -1 {
-		return ""
-	}
-
-	return str[s:e]
-}
-
 func atob(encoded string) (string, error) {
 	decoded, err := base64.StdEncoding.DecodeString(encoded)
 	if err != nil {