fix(network): 修复 有多个域名时，无法根据请求的地址获取正确的域名的问题

Author: qzwxsaedc

src/main/kotlin/com/github/fastmirrorserver/controller/QueryController.kt

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
+import javax.servlet.http.HttpServletRequest
 
 @RestController
 class QueryController {
@@ -47,9 +48,10 @@ class QueryController {
     fun querySpecificArtifact(
         @PathVariable name: String,
         @PathVariable core_version: String, 
-        @PathVariable mc_version: String
+        @PathVariable mc_version: String,
+        request: HttpServletRequest
         ) = database.getSpecificArtifact(name, mc_version, core_version)
-        .toResponse()
+        .toResponse(request)
 
     @GetMapping(DOWNLOAD)
     @RawResponse

src/main/kotlin/com/github/fastmirrorserver/controller/UploadTaskController.kt

@@ -24,8 +24,8 @@ class UploadTaskController {
 
     @PostMapping(CREATE_TASK)
     @Authority(Permission.COLLECTOR)
-    fun createTask(@RequestBody manifest: ManifestPOJO)
-     = service.createTask(manifest)
+    fun createTask(@RequestBody manifest: ManifestPOJO, request: HttpServletRequest)
+     = service.createTask(manifest, request)
 
     @PutMapping(UPLOAD)
     @Authority(Permission.COLLECTOR)

src/main/kotlin/com/github/fastmirrorserver/dto/Metadata.kt

@@ -2,7 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.github.fastmirrorserver.controller.UploadTaskController
-import com.github.fastmirrorserver.util.assemblyURI
+import com.github.fastmirrorserver.util.assemblyURL
+import javax.servlet.http.HttpServletRequest
 
 open class Metadata(
     val name: String,
@@ -12,11 +13,10 @@ open class Metadata(
     @get:JsonIgnore
     val key: String get() = "$name-$mc_version-$core_version"
 
-    @get:JsonIgnore
-    val upload_uri: String get() = assemblyURI(
-        UploadTaskController.UPLOAD, mapOf(
-    "name" to name,
-    "mc_version" to mc_version,
-    "core_version" to core_version
+    fun uploadUrl(request: HttpServletRequest): String
+    = request.assemblyURL(UploadTaskController.UPLOAD, mapOf(
+        "name" to name,
+        "mc_version" to mc_version,
+        "core_version" to core_version
     ))
 }

src/main/kotlin/com/github/fastmirrorserver/entity/Manifest.kt

@@ -1,10 +1,14 @@
 package com.github.fastmirrorserver.entity
 
 import com.github.fastmirrorserver.controller.QueryController
-import com.github.fastmirrorserver.util.assemblyURI
+import com.github.fastmirrorserver.util.assemblyURL
 import org.ktorm.entity.Entity
-import org.ktorm.schema.*
+import org.ktorm.schema.Table
+import org.ktorm.schema.boolean
+import org.ktorm.schema.datetime
+import org.ktorm.schema.varchar
 import java.time.LocalDateTime
+import javax.servlet.http.HttpServletRequest
 
 interface Manifest : Entity<Manifest> {
     companion object: Entity.Factory<Manifest>()
@@ -19,15 +23,14 @@ interface Manifest : Entity<Manifest> {
     var enable: Boolean
 }
 
-fun Manifest.toResponse() = mapOf<String, Any>(
+fun Manifest.toResponse(request: HttpServletRequest) = mapOf<String, Any>(
     "name" to this.name,
     "mc_version" to this.mc_version,
     "core_version" to this.core_version,
     "update_time" to this.update_time,
     "sha1" to this.sha1,
     "filename" to this.filename,
-    "download_url" to assemblyURI(
-        QueryController.DOWNLOAD, mapOf(
+    "download_url" to request.assemblyURL(QueryController.DOWNLOAD, mapOf(
         "name" to this.name,
         "mc_version" to this.mc_version,
         "core_version" to this.core_version,

src/main/kotlin/com/github/fastmirrorserver/service/AuthorizationService.kt

@@ -12,7 +12,6 @@ import org.ktorm.database.Database
 import org.ktorm.dsl.eq
 import org.ktorm.entity.firstOrNull
 import org.ktorm.support.postgresql.bulkInsertOrUpdate
-import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import java.time.LocalDateTime
@@ -21,7 +20,6 @@ import javax.servlet.http.HttpServletResponse
 
 @Service
 class AuthorizationService {
-    private val logger = LoggerFactory.getLogger(AuthorizationService::class.java)
     @Autowired
     private lateinit var database: Database
     @Autowired
@@ -47,12 +45,6 @@ class AuthorizationService {
      * 同时检查账号密码(如果有)和session.
      */
     fun verification(request: HttpServletRequest, response: HttpServletResponse): Traceback {
-        trySetBasicURI(request) { 
-            if((scheme == "http" && serverPort == 80) ||(scheme == "https" && serverPort == 443))
-                "$scheme://$serverName"
-            else
-                "$scheme://$serverName:$serverPort"
-        }
         try { request.getAttribute("SESSION_ENTITY")?.let { return it as Traceback } } catch (_: Exception) { }
         val ip = request.remoteAddr
         val account = request.authorization?.let { getAccount(authorization = it) }

src/main/kotlin/com/github/fastmirrorserver/service/UploadTaskService.kt

@@ -44,7 +44,7 @@ class UploadTaskService {
         = pojo.update_time == manifest.update_time
             && pojo.sha1 == manifest.sha1
 
-    fun createTask(pojo: ManifestPOJO): Map<String, String?> {
+    fun createTask(pojo: ManifestPOJO, request: HttpServletRequest): Map<String, String?> {
         val entity = database.all_cores
             .querySpecificArtifact(pojo)
             .firstOrNull()
@@ -69,7 +69,7 @@ class UploadTaskService {
         }
         else insertOrUpdate(pojo)               //     是        是        是        是     创建任务
 
-        val task = tasks.createTask(pojo, pojo.upload_uri) ?: throw ApiException.CONFLICT_TASK
+        val task = tasks.createTask(pojo, pojo.uploadUrl(request)) ?: throw ApiException.CONFLICT_TASK
 
         return mapOf(
             "upload_uri" to task.uri,

src/main/kotlin/com/github/fastmirrorserver/util/Network.kt

@@ -18,9 +18,10 @@ val HttpServletRequest.authorization get() = this
             throw ApiException.AUTH_METHOD_NOT_SUPPORTED
         return@let body
     }
-
-private lateinit var basicURI: String
-fun trySetBasicURI(request: HttpServletRequest, lambda: HttpServletRequest.() -> String) {
-    if(!::basicURI.isInitialized) basicURI = lambda(request)
-}
-fun assemblyURI(path: String, map: Map<String, String>) = "$basicURI$path".template(map)
+val HttpServletRequest.host get() = 
+    if((scheme == "http" && serverPort == 80) ||(scheme == "https" && serverPort == 443))
+        "$scheme://$serverName"
+    else
+        "$scheme://$serverName:$serverPort"
+fun HttpServletRequest.assemblyURL(path: String, map: Map<String, String>)
+= "$host$path".template(map)