Fixing issue #2755: updating config storage inside HTTPServer

Sources/Vapor/HTTP/Server/HTTPServer.swift

@@ -232,8 +232,23 @@ public final class HTTPServer: Server {
         return connection.channel.closeFuture
     }
 
+    public var configuration: Configuration {
+        get { _configuration }
+        set {
+            guard !didStart else {
+                _configuration.logger.warning("Cannot modify server configuration after server has been started.")
+                return
+            }
+            _configuration = newValue
+        }
+    }
+
     private let responder: Responder
-    private var configuration: Configuration
+    private var _configuration: Configuration {
+        willSet {
+            self.application.storage[Application.HTTP.Server.ConfigurationKey.self] = newValue
+        }
+    }
     private let eventLoopGroup: EventLoopGroup
 
     private var connection: HTTPServerConnection?
@@ -250,7 +265,7 @@ public final class HTTPServer: Server {
     ) {
         self.application = application
         self.responder = responder
-        self.configuration = configuration
+        self._configuration = configuration
         self.eventLoopGroup = eventLoopGroup
         self.didStart = false
         self.didShutdown = false

Tests/VaporTests/ApplicationTests.swift

@@ -172,4 +172,37 @@ final class ApplicationTests: XCTestCase {
         XCTAssertEqual(returnedConfig.hostname, "0.0.0.0")
         XCTAssertEqual(returnedConfig.port, 0)
     }
+
+    func testConfigurationAddressDetailsReflectedWhenProvidedThroughServeCommand() throws {
+        let app = Application(.testing)
+        defer { app.shutdown() }
+
+        struct AddressConfig: Content {
+            let hostname: String
+            let port: Int
+        }
+
+        app.get("hello") { req -> AddressConfig in
+            let config = AddressConfig(hostname: req.application.http.server.configuration.hostname, port: req.application.http.server.configuration.port)
+            return config
+        }
+
+        app.environment.arguments = ["vapor", "serve", "--hostname", "0.0.0.0", "--port", "3000"]
+        XCTAssertNoThrow(try app.start())
+
+        XCTAssertNotNil(app.http.server.shared.localAddress)
+        XCTAssertEqual("0.0.0.0", app.http.server.configuration.hostname)
+        XCTAssertEqual(3000, app.http.server.configuration.port)
+
+        guard let localAddress = app.http.server.shared.localAddress,
+              localAddress.ipAddress != nil,
+              let port = localAddress.port else {
+            XCTFail("couldn't get ip/port from \(app.http.server.shared.localAddress.debugDescription)")
+            return
+        }
+        let response = try app.client.get("http://localhost:\(port)/hello").wait()
+        let returnedConfig = try response.content.decode(AddressConfig.self)
+        XCTAssertEqual(returnedConfig.hostname, "0.0.0.0")
+        XCTAssertEqual(returnedConfig.port, 3000)
+    }
 }