github/OpenHands
1
0
Fork 0
mirror of https://github.com/OpenHands/OpenHands.git synced 2026-03-22 13:47:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: preserve HTTP protocol for self-hosted Gitea/Forgejo instances (#12439)

Browse Source
This commit is contained in:
MkDev11
2026-01-15 12:20:07 -05:00
committed by GitHub
parent 3cb76f5cbb
commit b5a615aa67
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhands/integrations/forgejo/service/base.py
View File

@@ -57,7 +57,9 @@ class ForgejoMixinBase(BaseGitService, HTTPClient):
self.base_url = self.BASE_URL # Backwards compatibility for existing usage
parsed = urlparse(self.BASE_URL)
self.base_domain = parsed.netloc or self.DEFAULT_DOMAIN
self.web_base_url = f'https://{self.base_domain}'.rstrip('/')
# Preserve the protocol from BASE_URL (http or https)
protocol = parsed.scheme or 'https'
self.web_base_url = f'{protocol}://{self.base_domain}'.rstrip('/')
@property
def provider(self) -> str:

30
openhands/integrations/provider.py
View File

@@ -675,6 +675,22 @@ class ProviderHandler:
if provider != ProviderType.AZURE_DEVOPS:
domain = self.provider_tokens[provider].host or domain
# Detect protocol before normalizing domain
# Default to https, but preserve http if explicitly specified
protocol = 'https'
if domain and domain.strip().startswith('http://'):
# Check if insecure HTTP access is allowed
allow_insecure = os.environ.get(
'ALLOW_INSECURE_GIT_ACCESS', 'false'
).lower() in ('true', '1', 'yes')
if not allow_insecure:
raise ValueError(
'Attempting to connect to an insecure git repository over HTTP. '
"If you'd like to allow this nonetheless, set "
'ALLOW_INSECURE_GIT_ACCESS=true as an environment variable.'
)
protocol = 'http'
# Normalize domain to prevent double protocols or path segments
if domain:
domain = domain.strip()
@@ -690,16 +706,18 @@ class ProviderHandler:
token_value = git_token.get_secret_value()
if provider == ProviderType.GITLAB:
remote_url = (
f'https://oauth2:{token_value}@{domain}/{repo_name}.git'
f'{protocol}://oauth2:{token_value}@{domain}/{repo_name}.git'
)
elif provider == ProviderType.BITBUCKET:
# For Bitbucket, handle username:app_password format
if ':' in token_value:
# App token format: username:app_password
remote_url = f'https://{token_value}@{domain}/{repo_name}.git'
remote_url = (
f'{protocol}://{token_value}@{domain}/{repo_name}.git'
)
else:
# Access token format: use x-token-auth
remote_url = f'https://x-token-auth:{token_value}@{domain}/{repo_name}.git'
remote_url = f'{protocol}://x-token-auth:{token_value}@{domain}/{repo_name}.git'
elif provider == ProviderType.AZURE_DEVOPS:
# Azure DevOps uses PAT with Basic auth
# Format: https://{anything}:{PAT}@dev.azure.com/{org}/{project}/_git/{repo}
@@ -759,11 +777,11 @@ class ProviderHandler:
)
else:
# GitHub, Forgejo
remote_url = f'https://{token_value}@{domain}/{repo_name}.git'
remote_url = f'{protocol}://{token_value}@{domain}/{repo_name}.git'
else:
remote_url = f'https://{domain}/{repo_name}.git'
remote_url = f'{protocol}://{domain}/{repo_name}.git'
else:
remote_url = f'https://{domain}/{repo_name}.git'
remote_url = f'{protocol}://{domain}/{repo_name}.git'
return remote_url