revert(server): desperate

diennea · Aug 30, 2024 · a6bad96 · a6bad96
1 parent 7e5ea16
commit a6bad96
Show file tree

Hide file tree

Showing 33 changed files with 496 additions and 717 deletions.
diff --git a/carapace-server/src/main/java/org/carapaceproxy/api/CertificatesResource.java b/carapace-server/src/main/java/org/carapaceproxy/api/CertificatesResource.java
@@ -28,8 +28,8 @@
 import static org.carapaceproxy.utils.APIUtils.certificateModeToString;
 import static org.carapaceproxy.utils.APIUtils.certificateStateToString;
 import static org.carapaceproxy.utils.APIUtils.stringToCertificateMode;
-import static org.carapaceproxy.core.ssl.CertificatesUtils.createKeystore;
-import static org.carapaceproxy.core.ssl.CertificatesUtils.loadKeyStoreFromFile;
+import static org.carapaceproxy.utils.CertificatesUtils.createKeystore;
+import static org.carapaceproxy.utils.CertificatesUtils.loadKeyStoreFromFile;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -74,7 +74,7 @@
 import org.carapaceproxy.server.config.ConfigurationNotValidException;
 import org.carapaceproxy.server.config.SSLCertificateConfiguration;
 import org.carapaceproxy.server.config.SSLCertificateConfiguration.CertificateMode;
-import org.carapaceproxy.core.ssl.CertificatesUtils;
+import org.carapaceproxy.utils.CertificatesUtils;
 
 /**
  * Access to certificates

diff --git a/carapace-server/src/main/java/org/carapaceproxy/api/ListenersResource.java b/carapace-server/src/main/java/org/carapaceproxy/api/ListenersResource.java
@@ -27,7 +27,9 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import lombok.Data;
+import org.carapaceproxy.client.EndpointKey;
 import org.carapaceproxy.core.HttpProxyServer;
+import org.carapaceproxy.server.config.NetworkListenerConfiguration;
 
 /**
  * Access to listeners
@@ -57,21 +59,21 @@ public static final class ListenerBean {
     @GET
     public Map<String, ListenerBean> getAllListeners() {
         HttpProxyServer server = (HttpProxyServer) context.getAttribute("server");
-        return server.getListeners()
-                .getListeningChannels()
-                .values()
-                .stream()
-                .collect(Collectors.toMap(
-                        channel -> channel.getHostPort().toString(),
-                        channel -> new ListenerBean(
-                                channel.getHostPort().host(),
-                                channel.getHostPort().port(),
-                                channel.getConfig().isSsl(),
-                                channel.getConfig().getSslCiphers(),
-                                channel.getConfig().getSslProtocols(),
-                                channel.getConfig().getDefaultCertificate(),
-                                channel.getTotalRequests()
-                        )));
+
+        return server.getListeners().getListeningChannels().entrySet().stream().map(listener -> {
+            NetworkListenerConfiguration config = listener.getValue().getConfig();
+            int port = listener.getKey().port();
+            ListenerBean bean = new ListenerBean(
+                    config.getHost(),
+                    port,
+                    config.isSsl(),
+                    config.getSslCiphers(),
+                    config.getSslProtocols(),
+                    config.getDefaultCertificate(),
+                    (int) listener.getValue().getTotalRequests().get()
+            );
+            return Map.entry(EndpointKey.make(config.getHost(), port).getHostPort(), bean);
+        }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
     }
 
 }
diff --git a/carapace-server/src/main/java/org/carapaceproxy/client/EndpointKey.java b/carapace-server/src/main/java/org/carapaceproxy/client/EndpointKey.java
@@ -20,7 +20,6 @@
 package org.carapaceproxy.client;
 
 import lombok.Data;
-import org.carapaceproxy.server.config.HostPort;
 
 /**
  * Identifier of an endpoint
@@ -33,10 +32,6 @@ public final class EndpointKey {
     private final String host;
     private final int port;
 
-    public static EndpointKey make(HostPort hostPort) {
-        return new EndpointKey(hostPort.host(), hostPort.port());
-    }
-
     public static EndpointKey make(String host, int port) {
         return new EndpointKey(host, port);
     }

diff --git a/carapace-server/src/main/java/org/carapaceproxy/configstore/ConfigurationStoreUtils.java b/carapace-server/src/main/java/org/carapaceproxy/configstore/ConfigurationStoreUtils.java
@@ -28,8 +28,8 @@
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Base64;
-import static org.carapaceproxy.core.ssl.CertificatesUtils.createKeystore;
-import static org.carapaceproxy.core.ssl.CertificatesUtils.readChainFromKeystore;
+import static org.carapaceproxy.utils.CertificatesUtils.createKeystore;
+import static org.carapaceproxy.utils.CertificatesUtils.readChainFromKeystore;
 
 public final class ConfigurationStoreUtils {
 

diff --git a/carapace-server/src/main/java/org/carapaceproxy/core/DisposableChannelListener.java b/carapace-server/src/main/java/org/carapaceproxy/core/DisposableChannelListener.java
diff --git a/carapace-server/src/main/java/org/carapaceproxy/core/HttpProxyServer.java b/carapace-server/src/main/java/org/carapaceproxy/core/HttpProxyServer.java
@@ -227,11 +227,11 @@ public class HttpProxyServer implements AutoCloseable {
     @Getter
     private int listenersOffsetPort = 0;
 
-    public static HttpProxyServer buildForTests(String host, int port, EndpointMapper mapper, File baseDir) throws ConfigurationNotValidException, InterruptedException {
+    public static HttpProxyServer buildForTests(String host, int port, EndpointMapper mapper, File baseDir) throws ConfigurationNotValidException {
         HttpProxyServer res = new HttpProxyServer(mapper, baseDir.getAbsoluteFile());
         res.currentConfiguration.addListener(new NetworkListenerConfiguration(host, port));
         res.proxyRequestsManager.reloadConfiguration(res.currentConfiguration, mapper.getBackends().values());
-        // res.getListeners().reloadConfiguration(res.currentConfiguration); // todo maybe not needed
+
         return res;
     }