Skip to content

set CORS allow origin * in the right place #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 25, 2021
Merged

set CORS allow origin * in the right place #146

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4abdcb
set CORS allow origin * in the right place
mallochine May 23, 2021
23b6e62
fix lint by commenting out unused function
mallochine May 23, 2021
87c3403
fix compile error
mallochine May 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions code/go/0chain.net/blobber/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ import (
"log"
"net"
"net/http"
"net/url"
"os"
"runtime"
"strconv"
"strings"
"time"

"0chain.net/blobbercore/allocation"
Expand Down Expand Up @@ -193,25 +191,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")
Expand Down Expand Up @@ -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"})

Expand Down