admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #12761 from thomvaill/fix-vendor-install-private-registry-basicauth-token

Browse Source 
fix: take $HOMEBREW_DOCKER_REGISTRY_BASIC_AUTH_TOKEN into account when installing portable-ruby
This commit is contained in:
Mike McQuaid 2022-01-28 14:18:54 +00:00 committed by GitHub
commit fc8fbd60b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/brew.sh
View File

@ -818,6 +818,16 @@ then
export GIT_SSH_COMMAND="ssh -F${HOMEBREW_SSH_CONFIG_PATH}" export GIT_SSH_COMMAND="ssh -F${HOMEBREW_SSH_CONFIG_PATH}"
fi fi
if [[ -n "${HOMEBREW_ARTIFACT_DOMAIN}" && -n "${HOMEBREW_DOCKER_REGISTRY_TOKEN}" ]]
then
export HOMEBREW_GITHUB_PACKAGES_AUTH="Bearer ${HOMEBREW_DOCKER_REGISTRY_TOKEN}"
elif [[ -n "${HOMEBREW_ARTIFACT_DOMAIN}" && -n "${HOMEBREW_DOCKER_REGISTRY_BASIC_AUTH_TOKEN}" ]]
then
export HOMEBREW_GITHUB_PACKAGES_AUTH="Basic ${HOMEBREW_DOCKER_REGISTRY_BASIC_AUTH_TOKEN}"
else
export HOMEBREW_GITHUB_PACKAGES_AUTH="Bearer QQ=="
fi
if [[ -n "${HOMEBREW_BASH_COMMAND}" ]] if [[ -n "${HOMEBREW_BASH_COMMAND}" ]]
then then
# source rather than executing directly to ensure the entire file is read into # source rather than executing directly to ensure the entire file is read into

2
Library/Homebrew/cmd/vendor-install.sh
View File

@ -119,7 +119,7 @@ fetch() {
--remote-time --remote-time
--location --location
--user-agent "${HOMEBREW_USER_AGENT_CURL}" --user-agent "${HOMEBREW_USER_AGENT_CURL}"
--header "Authorization: Bearer ${HOMEBREW_DOCKER_REGISTRY_TOKEN:-QQ==}" --header "Authorization: ${HOMEBREW_GITHUB_PACKAGES_AUTH}"
) )
if [[ -n "${HOMEBREW_QUIET}" ]] if [[ -n "${HOMEBREW_QUIET}" ]]

11
Library/Homebrew/download_strategy.rb
View File

@ -595,14 +595,9 @@ class CurlGitHubPackagesDownloadStrategy < CurlDownloadStrategy
def initialize(url, name, version, **meta) def initialize(url, name, version, **meta)
meta ||= {} meta ||= {}
meta[:headers] ||= [] meta[:headers] ||= []
meta[:headers] << if Homebrew::EnvConfig.artifact_domain && Homebrew::EnvConfig.docker_registry_token # GitHub Packages authorization header.
"Authorization: Bearer #{Homebrew::EnvConfig.docker_registry_token}" # HOMEBREW_GITHUB_PACKAGES_AUTH set in brew.sh
elsif Homebrew::EnvConfig.artifact_domain && Homebrew::EnvConfig.docker_registry_basic_auth_token meta[:headers] << "Authorization: #{HOMEBREW_GITHUB_PACKAGES_AUTH}"
"Authorization: Basic #{Homebrew::EnvConfig.docker_registry_basic_auth_token}"
else
# This QQ== is needed for the no-auth GitHub Packages default.
"Authorization: Bearer QQ=="
end
super(url, name, version, meta) super(url, name, version, meta)
end end

1
Library/Homebrew/global.rb
View File

@ -52,6 +52,7 @@ HOMEBREW_USER_AGENT_RUBY =
HOMEBREW_USER_AGENT_FAKE_SAFARI = HOMEBREW_USER_AGENT_FAKE_SAFARI =
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_3) AppleWebKit/602.4.8 " \ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_3) AppleWebKit/602.4.8 " \
"(KHTML, like Gecko) Version/10.0.3 Safari/602.4.8" "(KHTML, like Gecko) Version/10.0.3 Safari/602.4.8"
HOMEBREW_GITHUB_PACKAGES_AUTH = ENV["HOMEBREW_GITHUB_PACKAGES_AUTH"]
HOMEBREW_DEFAULT_PREFIX = "/usr/local" HOMEBREW_DEFAULT_PREFIX = "/usr/local"
HOMEBREW_DEFAULT_REPOSITORY = "#{HOMEBREW_DEFAULT_PREFIX}/Homebrew" HOMEBREW_DEFAULT_REPOSITORY = "#{HOMEBREW_DEFAULT_PREFIX}/Homebrew"