artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 17:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

extsvc: allow disabling github-proxy via empty GITHUB_BASE_URL (#46311)

Browse Source 
This also fixes a panic if someone puts in a bad value for
GITHUB_BASE_URL. If that happens the logs will be spammed with the parse
error like before, but won't be followed by a panic.

Test Plan: go test and running single binary with an empty
GITHUB_BASE_URL.
This commit is contained in:
Keegan Carruthers-Smith 2023-01-11 12:14:58 +02:00 committed by GitHub
parent 1212512844
commit 442237c812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/extsvc/github/common.go
View File

@ -1473,12 +1473,16 @@ var (
githubProxyRawURL = env.Get("GITHUB_BASE_URL", "http://github-proxy", "base URL for GitHub.com API (used for github-proxy)")
)
func getGithubProxyURL() *url.URL {
func getGithubProxyURL() (*url.URL, bool) {
if githubProxyRawURL == "" {
return nil, false
}
url, err := url.Parse(githubProxyRawURL)
if err != nil {
log.Scoped("extsvc.github", "github package").Fatal("Error parsing GITHUB_BASE_URL", log.Error(err))
return nil, false
}
return url
return url, true
}
// APIRoot returns the root URL of the API using the base URL of the GitHub instance.
@ -1573,14 +1577,25 @@ func canonicalizedURL(apiURL *url.URL) *url.URL {
if urlIsGitHubDotCom(apiURL) {
// For GitHub.com API requests, use github-proxy (which adds our OAuth2 client ID/secret to get a much higher
// rate limit).
return getGithubProxyURL()
u, ok := getGithubProxyURL()
if ok {
return u
}
}
return apiURL
}
func urlIsGitHubDotCom(apiURL *url.URL) bool {
hostname := strings.ToLower(apiURL.Hostname())
return hostname == "api.github.com" || hostname == "github.com" || hostname == "www.github.com" || apiURL.String() == getGithubProxyURL().String()
if hostname == "api.github.com" || hostname == "github.com" || hostname == "www.github.com" {
return true
}
if u, ok := getGithubProxyURL(); ok {
return apiURL.String() == u.String()
}
return false
}
var ErrRepoNotFound = &RepoNotFoundError{}