From f4abdcbeea00594600473739a78dd90213222f49 Mon Sep 17 00:00:00 2001 From: Alex Guo Date: Sun, 23 May 2021 00:48:04 +0000 Subject: [PATCH 1/3] set CORS allow origin * in the right place --- code/go/0chain.net/blobber/main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/go/0chain.net/blobber/main.go b/code/go/0chain.net/blobber/main.go index 322c27232..0ad532f22 100644 --- a/code/go/0chain.net/blobber/main.go +++ b/code/go/0chain.net/blobber/main.go @@ -335,7 +335,11 @@ func main() { "X-Requested-With", "X-App-Client-ID", "X-App-Client-Key", "Content-Type", }) - originsOk := handlers.AllowedOriginValidator(isValidOrigin) + + // Allow anybody to access API. + // originsOk := handlers.AllowedOriginValidator(isValidOrigin) + originsOk := handlers.AllowedOrigins([]string{"*"}) + methodsOk := handlers.AllowedMethods([]string{"GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS"}) From 23b6e629457f9bc40ff6ddb14959956a0a2227f9 Mon Sep 17 00:00:00 2001 From: Alex Guo Date: Sun, 23 May 2021 00:53:27 +0000 Subject: [PATCH 2/3] fix lint by commenting out unused function --- code/go/0chain.net/blobber/main.go | 40 ++++++++++++++++-------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/code/go/0chain.net/blobber/main.go b/code/go/0chain.net/blobber/main.go index 0ad532f22..4bc1c0c58 100644 --- a/code/go/0chain.net/blobber/main.go +++ b/code/go/0chain.net/blobber/main.go @@ -193,25 +193,27 @@ func processMinioConfig(reader io.Reader) error { return nil } -func isValidOrigin(origin string) bool { - var url, err = url.Parse(origin) - if err != nil { - return false - } - var host = url.Hostname() - if host == "localhost" { - return true - } - if host == "0chain.net" || host == "0box.io" || - strings.HasSuffix(host, ".0chain.net") || - strings.HasSuffix(host, ".alphanet-0chain.net") || - strings.HasSuffix(host, ".testnet-0chain.net") || - strings.HasSuffix(host, ".devnet-0chain.net") || - strings.HasSuffix(host, ".mainnet-0chain.net") { - return true - } - return false -} +// // Comment out to pass lint. Still keep this function around in case we want to +// // change how CORS validates origins. +// func isValidOrigin(origin string) bool { +// var url, err = url.Parse(origin) +// if err != nil { +// return false +// } +// var host = url.Hostname() +// if host == "localhost" { +// return true +// } +// if host == "0chain.net" || host == "0box.io" || +// strings.HasSuffix(host, ".0chain.net") || +// strings.HasSuffix(host, ".alphanet-0chain.net") || +// strings.HasSuffix(host, ".testnet-0chain.net") || +// strings.HasSuffix(host, ".devnet-0chain.net") || +// strings.HasSuffix(host, ".mainnet-0chain.net") { +// return true +// } +// return false +// } func main() { deploymentMode := flag.Int("deployment_mode", 2, "deployment_mode") From 87c34038150ffdcda69474e74aeb262f85a2b04c Mon Sep 17 00:00:00 2001 From: Alex Guo Date: Sun, 23 May 2021 02:06:41 +0000 Subject: [PATCH 3/3] fix compile error --- code/go/0chain.net/blobber/main.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/go/0chain.net/blobber/main.go b/code/go/0chain.net/blobber/main.go index 4bc1c0c58..dba5ba2c7 100644 --- a/code/go/0chain.net/blobber/main.go +++ b/code/go/0chain.net/blobber/main.go @@ -8,11 +8,9 @@ import ( "log" "net" "net/http" - "net/url" "os" "runtime" "strconv" - "strings" "time" "0chain.net/blobbercore/allocation"