Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-10-26 16:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings

Browse Source
This commit is contained in:
xuwei-k
2025-10-13 17:48:43 +09:00
committed by kenji yoshida
parent 1edb18a147
commit 9ab9363d0b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/gitbucket/core/controller/ControllerBase.scala
View File

@@ -351,7 +351,7 @@ case class Context(
val path: String = settings.baseUrl.getOrElse(request.getContextPath) val path: String = settings.baseUrl.getOrElse(request.getContextPath)
val currentPath: String = request.getRequestURI.substring(request.getContextPath.length) val currentPath: String = request.getRequestURI.substring(request.getContextPath.length)
val baseUrl: String = settings.baseUrl(request) val baseUrl: String = settings.baseUrl(request)
val host: String = new java.net.URL(baseUrl).getHost val host: String = new java.net.URI(baseUrl).toURL.getHost
val platform: String = request.getHeader("User-Agent") match { val platform: String = request.getHeader("User-Agent") match {
case null => null case null => null
case agent if agent.contains("Mac") => "mac" case agent if agent.contains("Mac") => "mac"

2
src/main/scala/gitbucket/core/service/WebHookService.scala
View File

@@ -265,7 +265,7 @@ trait WebHookService {
} }
private def validateTargetAddress(settings: SystemSettings, url: String): Boolean = { private def validateTargetAddress(settings: SystemSettings, url: String): Boolean = {
val host = new java.net.URL(url).getHost val host = new java.net.URI(url).toURL.getHost
!settings.webHook.blockPrivateAddress || !settings.webHook.blockPrivateAddress ||
!HttpClientUtil.isPrivateAddress(host) || !HttpClientUtil.isPrivateAddress(host) ||