MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[github]: Add avatars and media subdomains to authorized hosts list

Browse Source 
Added to handle avatars loading for GHE
#IJPL-244623 Fixed


(cherry picked from commit c6bab30d9a08b50caf1da8c8e01c7cd1a4fc004f)

IJ-CR-216402

GitOrigin-RevId: 5adc21820cec529637eec0cce9dca434628242b6
This commit is contained in:
Bartosz Janusz
2026-07-31 11:16:53 +00:00
committed by intellij-monorepo-bot
parent 9cc253a5bd
commit 0cab72c795
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/github/github-core/src/org/jetbrains/plugins/github/api/GithubApiRequestExecutor.kt
+4
View File
@@ -285,11 +285,15 @@ sealed class GithubApiRequestExecutor {
val ghDotComRawHost = "raw.githubusercontent.com"
val enterpriseRawHost = "raw.$mainHost" // If GH Enterprise serves raw files from raw.<enterprise-host>
val enterpriseAvatarHost = "avatars.$mainHost" // GHE serves avatars from avatars.<enterprise-host>
val enterpriseMediaHost = "media.$mainHost" // GHE serves media attachments from media.<enterprise-host>
val hostMatches = when {
targetHost == mainHost -> true
targetHost == apiHost -> true
targetHost == enterpriseRawHost -> true
targetHost == enterpriseAvatarHost -> true
targetHost == enterpriseMediaHost -> true
serverPath.isGithubDotCom || serverPath.isGheDataResidency -> targetHost == ghDotComRawHost
else -> false
}
plugins/github/github-core/test/org/jetbrains/plugins/github/api/GithubApiRequestExecutorAuthTest.kt
+7 -3
View File
@@ -39,9 +39,11 @@ class GithubApiRequestExecutorAuthTest {
@ValueSource(strings = [
"https://ghe.mycorp.local/myorg/repo",
"https://raw.ghe.mycorp.local/myorg/repo/v1/action.yml",
"https://ghe.mycorp.local/myorg/repo/raw/v1/action.yml"
"https://ghe.mycorp.local/myorg/repo/raw/v1/action.yml",
"https://avatars.ghe.mycorp.local/u/1234",
"https://media.ghe.mycorp.local/user/1234/files/abc123"
])
fun `given GHE server, main and raw subdomain URLs are accepted`(url: String) {
fun `given GHE server, its main, raw, avatars and media subdomain URLs are accepted`(url: String) {
val sp = serverPath("ghe.mycorp.local")
assertTrue(GithubApiRequestExecutor.isAuthorizedUrl(sp, URL(url)))
}
@@ -104,7 +106,9 @@ class GithubApiRequestExecutorAuthTest {
"https://raw.ghe.mycorp.local.malicious.com/org/repo/file",
"https://raw.ghe.mycorp.malicious.local/org/repo/file",
"https://raw.ghe.malicious.mycorp.local.com/org/repo/file",
"https://raw.malicious.ghe.mycorp.local.com/org/repo/file"
"https://raw.malicious.ghe.mycorp.local.com/org/repo/file",
"https://avatars.ghe.mycorp.local.malicious.com/u/1234",
"https://media.ghe.mycorp.local.malicious.com/user/1234/files/abc"
])
fun `malicious hosts for GHE are rejected`(url: String) {
val spEnterprise = serverPath("ghe.mycorp.local")