Skip to content

Commit a82f1ab

Browse files
authored
Don't verify TLS certificate in dev mode (#621)
Use openaudio dev nodes in dev, and do not verify their TLS certs as they're self signed
1 parent 8399b28 commit a82f1ab

File tree

6 files changed

+58
-24
lines changed

6 files changed

+58
-24
lines changed

api/open_audio_pool.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package api
22

33
import (
44
"math/rand"
5+
"net/http"
56

67
"github.com/OpenAudio/go-openaudio/pkg/sdk"
78
)
@@ -11,13 +12,13 @@ type OpenAudioPool struct {
1112
clients []*sdk.OpenAudioSDK
1213
}
1314

14-
func NewOpenAudioPool(urls []string) *OpenAudioPool {
15+
func NewOpenAudioPool(urls []string, httpClient *http.Client) *OpenAudioPool {
1516
clients := make([]*sdk.OpenAudioSDK, 0, len(urls))
1617
for _, u := range urls {
1718
if u == "" {
1819
continue
1920
}
20-
clients = append(clients, sdk.NewOpenAudioSDK(u))
21+
clients = append(clients, sdk.NewOpenAudioSDKWithClient(u, httpClient))
2122
}
2223
return &OpenAudioPool{
2324
endpoints: urls,

api/server.go

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package api
22

33
import (
44
"context"
5+
"crypto/tls"
56
_ "embed"
67
"fmt"
78
"net"
@@ -162,13 +163,32 @@ func NewApiServer(config config.Config) *ApiServer {
162163
logger.Error("dial es failed", zap.String("url", config.EsUrl), zap.Error(err))
163164
}
164165

165-
openAudioSDK := sdk.NewOpenAudioSDK(config.AudiusdURL)
166+
httpClient := http.DefaultClient
167+
if config.Env == "development" || config.Env == "dev" {
168+
httpClient = &http.Client{
169+
Transport: &http.Transport{
170+
DialContext: (&net.Dialer{
171+
Timeout: 30 * time.Second,
172+
KeepAlive: 30 * time.Second,
173+
}).DialContext,
174+
ForceAttemptHTTP2: true,
175+
MaxIdleConns: 100,
176+
IdleConnTimeout: 90 * time.Second,
177+
TLSHandshakeTimeout: 10 * time.Second,
178+
ExpectContinueTimeout: 1 * time.Second,
179+
// Skip TLS verification in dev mode
180+
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
181+
},
182+
}
183+
}
184+
185+
openAudioSDK := sdk.NewOpenAudioSDKWithClient(config.AudiusdURL, httpClient)
166186
// Build OpenAudio pool URLs; fall back to single URL if none provided
167187
openAudioURLs := config.OpenAudioURLs
168188
if len(openAudioURLs) == 0 {
169189
openAudioURLs = []string{config.AudiusdURL}
170190
}
171-
openAudioPool := NewOpenAudioPool(openAudioURLs)
191+
openAudioPool := NewOpenAudioPool(openAudioURLs, httpClient)
172192

173193
skipAuthCheck, _ := strconv.ParseBool(os.Getenv("skipAuthCheck"))
174194

config/config.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,10 @@ func init() {
9191
fallthrough
9292
case "":
9393
Cfg.OpenAudioURLs = []string{
94-
"http://audius-creator-node-1",
95-
"http://audius-creator-node-2",
96-
"http://audius-creator-node-3",
94+
"https://node1.oap.devnet",
95+
"https://node2.oap.devnet",
96+
"https://node3.oap.devnet",
97+
"https://node4.oap.devnet",
9798
}
9899
if Cfg.DelegatePrivateKey == "" {
99100
// Dummy key
@@ -102,8 +103,8 @@ func init() {
102103
Cfg.AntiAbuseOracles = []string{"http://audius-discovery-provider-1"}
103104
Cfg.ArchiverNodes = []string{"http://audius-discovery-provider-1"}
104105
Cfg.Rewards = core_config.MakeRewards(core_config.DevClaimAuthorities, core_config.DevRewardExtensions)
105-
Cfg.AudiusdURL = "http://audius-creator-node-1"
106-
Cfg.ChainId = "audius-devnet"
106+
Cfg.AudiusdURL = "https://node1.oap.devnet"
107+
Cfg.ChainId = "openaudio-devnet"
107108
Cfg.SolanaIndexerWorkers = 1
108109
Cfg.DeadNodes = []string{}
109110
Cfg.StoreAllNodes = []string{}

config/nodes.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ var (
2626
"https://creatornode6.staging.audius.co",
2727
}
2828
DevUploadNodes = []string{
29-
"http://audius-creator-node-1",
29+
"https://node1.oap.devnet",
30+
"https://node2.oap.devnet",
31+
"https://node3.oap.devnet",
32+
"https://node4.oap.devnet",
3033
}
3134
)

go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
connectrpc.com/connect v1.18.1
77
github.com/AlecAivazis/survey/v2 v2.3.7
88
github.com/Doist/unfurlist v0.0.0-20250409100812-515f2735f8e5
9-
github.com/OpenAudio/go-openaudio v1.0.9
9+
github.com/OpenAudio/go-openaudio v1.1.0
1010
github.com/aquasecurity/esquery v0.2.0
1111
github.com/axiomhq/axiom-go v0.23.0
1212
github.com/axiomhq/hyperloglog v0.2.5
@@ -49,6 +49,8 @@ require (
4949
google.golang.org/protobuf v1.36.6
5050
)
5151

52+
require github.com/bdragon300/tusgo v0.1.2 // indirect
53+
5254
require (
5355
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
5456
github.com/DataDog/zstd v1.5.2 // indirect
@@ -150,7 +152,6 @@ require (
150152
github.com/jmhodges/levigo v1.0.0 // indirect
151153
github.com/josharian/intern v1.0.0 // indirect
152154
github.com/json-iterator/go v1.1.12 // indirect
153-
github.com/jsternberg/zap-logfmt v1.3.0
154155
github.com/kamstrup/intmap v0.5.1 // indirect
155156
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
156157
github.com/klauspost/compress v1.18.0 // indirect
@@ -189,7 +190,7 @@ require (
189190
github.com/pkg/errors v0.9.1 // indirect
190191
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
191192
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
192-
github.com/prometheus/client_golang v1.20.5 // indirect
193+
github.com/prometheus/client_golang v1.21.1 // indirect
193194
github.com/prometheus/client_model v0.6.1 // indirect
194195
github.com/prometheus/common v0.62.0 // indirect
195196
github.com/prometheus/procfs v0.15.1 // indirect
@@ -233,7 +234,7 @@ require (
233234
golang.org/x/sys v0.35.0 // indirect
234235
golang.org/x/term v0.34.0 // indirect
235236
golang.org/x/text v0.28.0 // indirect
236-
golang.org/x/time v0.9.0 // indirect
237+
golang.org/x/time v0.10.0 // indirect
237238
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
238239
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
239240
gopkg.in/yaml.v2 v2.4.0 // indirect

go.sum

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n
2020
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
2121
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
2222
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
23-
github.com/OpenAudio/go-openaudio v1.0.9 h1:lyMsJz4n/UfY/nYJPVTW3evNS4ucF+65wZzUl6zVelQ=
24-
github.com/OpenAudio/go-openaudio v1.0.9/go.mod h1:xmx0/cpToJenH1N+CrFgF3aApI1dJBiwoShvlwSbpHE=
23+
github.com/OpenAudio/go-openaudio v1.1.0 h1:OhjXGPQd8oRkClrNujXG+oW/zT5w00WmnyjySQiaRCI=
24+
github.com/OpenAudio/go-openaudio v1.1.0/go.mod h1:lVst5R48H8ZyIDHkavo8/1mzr8ZwCmxj9aZV9x1TWkQ=
2525
github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
2626
github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
2727
github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI=
@@ -47,6 +47,8 @@ github.com/axiomhq/axiom-go v0.23.0 h1:kY+JkLubQ6ANwIp1O3J//YQe9OpdXFaW7xaj1wXvf
4747
github.com/axiomhq/axiom-go v0.23.0/go.mod h1:JGtkryt27W4QXVrgrwVxORPI/iRCM3N22H5FVi0PtQs=
4848
github.com/axiomhq/hyperloglog v0.2.5 h1:Hefy3i8nAs8zAI/tDp+wE7N+Ltr8JnwiW3875pvl0N8=
4949
github.com/axiomhq/hyperloglog v0.2.5/go.mod h1:DLUK9yIzpU5B6YFLjxTIcbHu1g4Y1WQb1m5RH3radaM=
50+
github.com/bdragon300/tusgo v0.1.2 h1:7h+1AkTEhudhRgHtPSHWWdJeXK7ZrGWH91IWOKLw8D8=
51+
github.com/bdragon300/tusgo v0.1.2/go.mod h1:C+JEnr9Mg5aMyd9hCQx6y8DGzbf2gXd3tF6c3Ft7IIw=
5052
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
5153
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
5254
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -252,6 +254,8 @@ github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc
252254
github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
253255
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
254256
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
257+
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
258+
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
255259
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
256260
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
257261
github.com/gofiber/contrib/fiberzap/v2 v2.1.5 h1:mJnuTFd1gQw/DFUz1mkJlMmiwPGJ5cEfjuOxYugKmT4=
@@ -314,6 +318,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
314318
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
315319
github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us=
316320
github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20=
321+
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
322+
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
317323
github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
318324
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
319325
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -387,8 +393,6 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
387393
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
388394
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
389395
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
390-
github.com/jsternberg/zap-logfmt v1.3.0 h1:z1n1AOHVVydOOVuyphbOKyR4NICDQFiJMn1IK5hVQ5Y=
391-
github.com/jsternberg/zap-logfmt v1.3.0/go.mod h1:N3DENp9WNmCZxvkBD/eReWwz1149BK6jEN9cQ4fNwZE=
392396
github.com/kamstrup/intmap v0.5.1 h1:ENGAowczZA+PJPYYlreoqJvWgQVtAmX1l899WfYFVK0=
393397
github.com/kamstrup/intmap v0.5.1/go.mod h1:gWUVWHKzWj8xpJVFf5GC0O26bWmv3GqdnIX/LMT6Aq4=
394398
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
@@ -511,10 +515,12 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
511515
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
512516
github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
513517
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
518+
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
519+
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
514520
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
515521
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
516-
github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU=
517-
github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
522+
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
523+
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
518524
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
519525
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
520526
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
@@ -555,8 +561,8 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF
555561
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
556562
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
557563
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
558-
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
559-
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
564+
github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
565+
github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
560566
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
561567
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
562568
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
@@ -656,6 +662,8 @@ github.com/valyala/fasthttp v1.65.0 h1:j/u3uzFEGFfRxw79iYzJN+TteTJwbYkru9uDp3d0Y
656662
github.com/valyala/fasthttp v1.65.0/go.mod h1:P/93/YkKPMsKSnATEeELUCkG8a7Y+k99uxNHVbKINr4=
657663
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
658664
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
665+
github.com/vitorsalgado/mocha/v3 v3.0.2 h1:uTx/+7kZvTWddXzoF34vUQTa3OL9OE+f5fPjD2XCMoY=
666+
github.com/vitorsalgado/mocha/v3 v3.0.2/go.mod h1:ZMpyjuNfWPqLP2v7ztaaLJwOcyl4jmmHVQCEoDsFD0Q=
659667
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
660668
github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
661669
github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
@@ -805,8 +813,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
805813
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
806814
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
807815
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
808-
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
809-
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
816+
golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
817+
golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
810818
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
811819
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
812820
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

0 commit comments

Comments
 (0)