Add useSSL flag to ServerAddress.Tcp

This also adds support for rptools-maptool+tcps URIs to connect to SSL
servers over the command-line.

This adds the useSSL flag to an existing variant as the minimal change.

package/linux/launcher.desktop

@@ -6,5 +6,5 @@ Icon=/opt/maptool/lib/${projectName}${developerRelease}.png
 Terminal=false
 Type=Application
 Categories=Game
-MimeType=application/maptool;x-scheme-handler/rptools-maptool+registry;x-scheme-handler/rptools-maptool+lan;x-scheme-handler/rptools-maptool+tcp
+MimeType=application/maptool;x-scheme-handler/rptools-maptool+registry;x-scheme-handler/rptools-maptool+lan;x-scheme-handler/rptools-maptool+tcp;x-scheme-handler/rptools-maptool+tcps
 StartupWMClass=net-rptools-maptool-client-LaunchInstructions

package/windows/main.wxs

@@ -173,6 +173,19 @@
             <RegistryValue Type="string" Value="&quot;[INSTALLDIR]$(var.JpAppName).exe&quot; &quot;%1&quot;" />
           </RegistryKey>
         </RegistryKey>
+        <RegistryKey Root="HKCR"
+         Key="rptools-maptool+tcps"
+         ForceCreateOnInstall="yes"
+         ForceDeleteOnUninstall="yes">
+          <RegistryValue Type="string" Name="URL Protocol" Value=""/>
+          <RegistryValue Type="string" Value="URL:MapTool SSL connect"/>
+          <RegistryKey Key="DefaultIcon">
+            <RegistryValue Type="string" Value="[INSTALLDIR]$(var.JpAppName).exe" />
+          </RegistryKey>
+          <RegistryKey Key="shell\open\command">
+            <RegistryValue Type="string" Value="&quot;[INSTALLDIR]$(var.JpAppName).exe&quot; &quot;%1&quot;" />
+          </RegistryKey>
+        </RegistryKey>
       <?endif?>
     </Component>
 

src/main/java/net/rptools/clientserver/ConnectionFactory.java

@@ -15,11 +15,9 @@
 package net.rptools.clientserver;
 
 import java.awt.EventQueue;
-import java.net.ServerSocket;
 import java.net.Socket;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 import net.rptools.clientserver.simple.connection.Connection;
 import net.rptools.clientserver.simple.connection.SocketConnection;

src/main/java/net/rptools/maptool/client/ServerAddress.java

@@ -103,19 +103,28 @@ public URI toUri() {
     }
   }
 
-  record Tcp(@Nonnull String address, int port) implements ServerAddress {
+  record Tcp(@Nonnull String address, int port, boolean useSSL) implements ServerAddress {
     @Override
     @Nonnull
     public RemoteServerConfig findServer() {
-      return new RemoteServerConfig.Socket(
-          address(), port() == -1 ? ServerConfig.DEFAULT_PORT : port());
+      var port = port();
+      if (port == -1) {
+        port = ServerConfig.DEFAULT_PORT;
+      }
+
+      if (useSSL) {
+        return new RemoteServerConfig.SSLSocket(address(), port);
+      }
+
+      return new RemoteServerConfig.Socket(address(), port);
     }
 
     @Override
     @Nonnull
     public URI toUri() {
       try {
-        return new URI("rptools-maptool+tcp", null, address(), port(), "/", null, null);
+        var scheme = useSSL() ? "rptools-maptool+tcps" : "rptools-maptool+tcp";
+        return new URI(scheme, null, address(), port(), "/", null, null);
       } catch (URISyntaxException e) {
         throw new AssertionError(
             "Scheme and path are given and the path is absolute and IP address authorities are all valid so this should be infallible",
@@ -173,14 +182,14 @@ static ServerAddress parse(@Nonnull String s)
         return new ServerAddress.Lan(serviceIdentifier);
 
       case "rptools-maptool+tcp":
+      case "rptools-maptool+tcps":
         if (host == null) {
-          throw new IllegalArgumentException("rptools-maptool+tcp URIs must have a host");
+          throw new IllegalArgumentException(scheme + " URIs must have a host");
         }
         if (path != null && !path.isEmpty() && !path.equals("/")) {
-          throw new IllegalArgumentException(
-              "rptools-maptool+tcp URIs must have no path or just /");
+          throw new IllegalArgumentException(scheme + " URIs must have no path or just /");
         }
-        return new ServerAddress.Tcp(host, port);
+        return new ServerAddress.Tcp(host, port, scheme.endsWith("s"));
 
       case null:
       default:

src/main/java/net/rptools/maptool/client/ui/connectioninfodialog/ConnectionInfoDialog.java

@@ -107,7 +107,9 @@ public ConnectionInfoDialog(MapToolServer server) {
                         return null;
                       }
                       return new ServerAddress.Tcp(
-                          NetUtil.formatAddress(localAddresses.ipv4().get(0)), server.getPort());
+                          NetUtil.formatAddress(localAddresses.ipv4().get(0)),
+                          server.getPort(),
+                          false);
                     });
     Supplier<CompletableFuture<ServerAddress.Tcp>> getLocalV6 =
         () ->
@@ -119,7 +121,9 @@ public ConnectionInfoDialog(MapToolServer server) {
                         return null;
                       }
                       return new ServerAddress.Tcp(
-                          NetUtil.formatAddress(localAddresses.ipv6().get(0)), server.getPort());
+                          NetUtil.formatAddress(localAddresses.ipv6().get(0)),
+                          server.getPort(),
+                          false);
                     });
     Supplier<CompletableFuture<ServerAddress.Tcp>> getExternal =
         () ->
@@ -131,7 +135,7 @@ public ConnectionInfoDialog(MapToolServer server) {
                         return null;
                       }
                       return new ServerAddress.Tcp(
-                          NetUtil.formatAddress(address), server.getPort());
+                          NetUtil.formatAddress(address), server.getPort(), false);
                     });
     registerCopyButton(panel, "registryUriCopyButton", getServerName, ServerAddress::toUri);
     registerCopyButton(panel, "registryHttpUrlCopyButton", getServerName, ServerAddress::toHttpUrl);