fix: update IRC service port references from 6667 to 6697 for enhanced security

- Changed all instances of the default IRC port from 6667 to 6697 across test configurations and fixtures.
- Updated connection details in various test classes to ensure compatibility with the new secure port.
- Adjusted comments and documentation to reflect the port change and clarify the use of TLS for the IRC service.

Author: kzndotsh

tests/conftest.py

@@ -67,8 +67,7 @@ def prepared_config_dir(tmp_path):
 unrealircd_container = container(
     image="{unrealircd_image.id}",
     ports={
-        "6667/tcp": None,  # Main IRC port
-        "6697/tcp": None,  # TLS port
+        "6697/tcp": None,  # Main IRC port (TLS only)
     },
     volumes={
         "{prepared_config_dir}": {"bind": "/home/unrealircd/unrealircd/conf", "mode": "rw"},
@@ -168,7 +167,7 @@ def docker_cleanup():
     return ["down -v"]
 
 
-def is_irc_service_responsive(host, port=6667):
+def is_irc_service_responsive(host, port=6697):
     """Check if IRC service is responsive."""
     import socket
 
@@ -185,7 +184,7 @@ def is_irc_service_responsive(host, port=6667):
 @pytest.fixture(scope="session")
 def irc_service(docker_ip, docker_services):
     """Ensure IRC service is up and responsive."""
-    port = docker_services.port_for("unrealircd", 6667)
+    port = docker_services.port_for("unrealircd", 6697)
     url = f"{docker_ip}:{port}"
 
     docker_services.wait_until_responsive(
@@ -218,7 +217,7 @@ def sample_config_data() -> dict:
     return {
         "irc_server": {
             "host": "localhost",
-            "port": 6667,
+            "port": 6697,
             "ssl_port": 6697,
             "network_name": "test.network",
         },
@@ -314,7 +313,7 @@ def docker_compose_helper(compose_file: Path, project_root: Path) -> DockerCompo
 class IRCTestHelper:
     """Helper class for IRC-related testing operations."""
 
-    def __init__(self, host: str = "localhost", port: int = 6667):
+    def __init__(self, host: str = "localhost", port: int = 6697):
         self.host = host
         self.port = port
 
@@ -489,7 +488,7 @@ def _inject_controller_if_needed(request):
             # Set up connection details
             container_ports = controller.get_container_ports()
             request.instance.hostname = "localhost"
-            request.instance.port = container_ports.get("6667/tcp", 6667)
+            request.instance.port = container_ports.get("6697/tcp", 6697)
 
 
 @pytest.fixture(autouse=True)

tests/controllers/unrealircd_controller.py

@@ -63,7 +63,7 @@ def __init__(self, test_config, container_fixture=None):
         # Set port from container if available
         if self.container:
             container_ports = self.get_container_ports()
-            self.port = container_ports.get("6667/tcp", 6667)
+            self.port = container_ports.get("6697/tcp", 6697)
 
     def create_config(self) -> None:
         """Create the configuration directory and basic files."""
@@ -93,7 +93,7 @@ def run(
         # The container is already running via pytest-docker-tools
         # Get the actual mapped ports from the container
         container_ports = self.get_container_ports()
-        self.port = container_ports.get("6667/tcp", port)
+        self.port = container_ports.get("6697/tcp", port)
         if ssl:
             self.tls_port = container_ports.get("6697/tcp", port + 30)
 

tests/fixtures/irc_test_data.py

@@ -6,7 +6,7 @@
 IRC_SERVER_CONFIGS = {
     "basic": {
         "host": "localhost",
-        "port": 6667,
+        "port": 6697,
         "ssl_port": 6697,
         "network": "TestNet",
         "description": "Basic test IRC server",

tests/fixtures/sample_data.py

@@ -9,7 +9,7 @@
         "description": "Test IRC Server",
         "network": "TestNet",
     },
-    "listen": [{"port": 6667, "ssl": False}, {"port": 6697, "ssl": True}],
+    "listen": [{"port": 6697, "ssl": True}],
     "operators": [{"name": "testop", "password": "$2a$10$hashedpassword", "class": "netadmin"}],
 }
 
@@ -19,7 +19,7 @@
     "services": {
         "ircd": {
             "image": "unrealircd:latest",
-            "ports": ["6667:6667", "6697:6697"],
+            "ports": ["6697:6697"],
             "volumes": ["./data:/data"],
             "environment": ["IRC_NETWORK=testnet"],
         },
@@ -35,7 +35,7 @@
 SAMPLE_IRC_LOGS = [
     "[2024-01-01 12:00:00] IRC Server starting",
     "[2024-01-01 12:00:01] Loading configuration",
-    "[2024-01-01 12:00:02] Server ready on port 6667",
+    "[2024-01-01 12:00:02] Server ready on port 6697",
     "[2024-01-01 12:00:05] Client connecting: testuser",
     "[2024-01-01 12:00:06] JOIN #testchannel testuser",
 ]

tests/integration/test_clients.py

@@ -119,7 +119,7 @@ async def on_quit(self, user, reason=None):
 class IRCClientTest(client.SimpleIRCClient if client else object):
     """IRC client for testing purposes using the python-irc library."""
 
-    def __init__(self, host: str = "localhost", port: int = 6667):
+    def __init__(self, host: str = "localhost", port: int = 6697):
         if client:
             client.SimpleIRCClient.__init__(self)
         self.host = host
@@ -265,7 +265,7 @@ async def test_pydle_basic_connection(self, controller):
         # Set up connection details from controller
         container_ports = self.controller.get_container_ports()
         self.hostname = "localhost"
-        self.port = container_ports.get("6667/tcp", 6667)
+        self.port = container_ports.get("6697/tcp", 6697)
 
         client = PydleTestBot(f"pydle_test_{int(time.time())}")
 
@@ -292,7 +292,7 @@ async def test_pydle_channel_operations(self, controller):
         # Set up connection details from controller
         container_ports = self.controller.get_container_ports()
         self.hostname = "localhost"
-        self.port = container_ports.get("6667/tcp", 6667)
+        self.port = container_ports.get("6697/tcp", 6697)
 
         client = PydleTestBot(f"pydle_chan_{int(time.time())}")
 
@@ -325,7 +325,7 @@ async def test_pydle_messaging(self, controller):
         # Set up connection details from controller
         container_ports = self.controller.get_container_ports()
         self.hostname = "localhost"
-        self.port = container_ports.get("6667/tcp", 6667)
+        self.port = container_ports.get("6697/tcp", 6697)
 
         client1 = PydleTestBot(f"pydle_msg1_{int(time.time())}")
         client2 = PydleTestBot(f"pydle_msg2_{int(time.time())}")
@@ -376,7 +376,7 @@ async def test_pydle_private_messaging(self, controller):
         # Set up connection details from controller
         container_ports = self.controller.get_container_ports()
         self.hostname = "localhost"
-        self.port = container_ports.get("6667/tcp", 6667)
+        self.port = container_ports.get("6697/tcp", 6697)
 
         client1 = PydleTestBot(f"pydle_priv1_{int(time.time())}")
         client2 = PydleTestBot(f"pydle_priv2_{int(time.time())}")
@@ -424,7 +424,7 @@ def irc_client(self, controller):
         self.controller = controller
         container_ports = self.controller.get_container_ports()
         self.hostname = "localhost"
-        self.port = container_ports.get("6667/tcp", 6667)
+        self.port = container_ports.get("6697/tcp", 6697)
 
         client = IRCClientTest(self.hostname, self.port)
         yield client

tests/integration/test_irc_functionality.py

@@ -17,7 +17,7 @@ def test_irc_server_connection(self, irc_helper):
         # This test requires an actual IRC server to be running
         # It will skip if no server is available
         if not irc_helper.wait_for_irc_server(timeout=10):
-            pytest.skip("No IRC server running on localhost:6667")
+            pytest.skip("No IRC server running on localhost:6697")
 
         # If we get here, server is running, test basic connection
         response = irc_helper.send_irc_command("PING test")
@@ -125,7 +125,7 @@ def test_irc_connection_mock(self, mock_socket):
         # Create a mock helper object
         helper = Mock()
         helper.host = "localhost"
-        helper.port = 6667
+        helper.port = 6697
         helper.send_irc_command = Mock(return_value=":server 001 test :Welcome")
 
         response = helper.send_irc_command("TEST")

tests/integration/test_protocol.py

@@ -37,15 +37,28 @@ def controller(unrealircd_container, prepared_config_dir):
 class TestConnectionProtocol(BaseServerTestCase):
     """Test basic IRC connection and registration protocols."""
 
-    def setup_method(self, method, controller):
+    def setup_method(self, method):
         """Override setup to use controller fixture."""
-        self.controller = controller
+        # Controller will be injected via autouse fixture
+        if hasattr(self, "controller") and self.controller is not None:
+            # Set default test parameters
+            self.password = None
+            self.ssl = True  # Port 6697 is TLS-only
+            self.run_services = False
+            self.faketime = None
+            self.server_support = None
+
+            # Run the controller (hostname/port already set by inject_controller fixture)
+            self.controller.run(
+                self.hostname,
+                self.port,
+                password=self.password,
+                ssl=self.ssl,
+                run_services=self.run_services,
+                faketime=self.faketime,
+            )
+
         self.clients = {}
-        self.server_support = None
-        # Set up connection details from controller
-        container_ports = self.controller.get_container_ports()
-        self.hostname = "localhost"
-        self.port = container_ports.get("6667/tcp", 6667)
 
     @mark_specifications("RFC1459", "RFC2812")
     @pytest.mark.integration
@@ -134,7 +147,7 @@ def setup_method(self, method):
         if hasattr(self, "controller") and self.controller is not None:
             # Set default test parameters
             self.password = None
-            self.ssl = False
+            self.ssl = True  # Port 6697 is TLS-only
             self.run_services = False
             self.faketime = None
             self.server_support = None
@@ -209,7 +222,7 @@ def setup_method(self, method):
         if hasattr(self, "controller") and self.controller is not None:
             # Set default test parameters
             self.password = None
-            self.ssl = False
+            self.ssl = True  # Port 6697 is TLS-only
             self.run_services = False
             self.faketime = None
             self.server_support = None
@@ -324,7 +337,7 @@ def setup_method(self, method):
         if hasattr(self, "controller") and self.controller is not None:
             # Set default test parameters
             self.password = None
-            self.ssl = False
+            self.ssl = True  # Port 6697 is TLS-only
             self.run_services = False
             self.faketime = None
             self.server_support = None
@@ -411,7 +424,7 @@ def setup_method(self, method):
         if hasattr(self, "controller") and self.controller is not None:
             # Set default test parameters
             self.password = None
-            self.ssl = False
+            self.ssl = True  # Port 6697 is TLS-only
             self.run_services = False
             self.faketime = None
             self.server_support = None

tests/integration/test_services.py

@@ -16,7 +16,7 @@
 class IRCIntegrationClient:
     """Enhanced IRC client for service integration testing."""
 
-    def __init__(self, host: str = "localhost", port: int = 6667, use_ssl: bool = False):
+    def __init__(self, host: str = "localhost", port: int = 6697, use_ssl: bool = True):
         self.host = host
         self.port = port
         self.use_ssl = use_ssl

tests/legacy/integration/test_docker_services.py

@@ -1,13 +1,11 @@
 """Integration tests for Docker services."""
 
-import pytest
-import time
 import socket
-import subprocess
-import requests
-from pathlib import Path
+import time
+
 import docker
-import os
+import pytest
+import requests
 
 
 class TestDockerServices:
@@ -57,9 +55,7 @@ def running_services(self, docker_client, project_root):
         """Ensure Docker services are running for integration tests."""
         # Check if services are already running
         try:
-            containers = docker_client.containers.list(
-                filters={"label": "com.docker.compose.project=irc.atl.chat"}
-            )
+            containers = docker_client.containers.list(filters={"label": "com.docker.compose.project=irc.atl.chat"})
 
             if not containers:
                 pytest.skip("Docker services not running. Run 'make up' first.")
@@ -81,18 +77,14 @@ def test_unrealircd_container_running(self, running_services):
                 unrealircd_container = container
                 break
 
-        assert unrealircd_container is not None, (
-            "UnrealIRCd container should be running"
-        )
+        assert unrealircd_container is not None, "UnrealIRCd container should be running"
         assert unrealircd_container.status == "running", "UnrealIRCd should be running"
 
         # Check health status if available
         container_info = unrealircd_container.attrs
         health = container_info.get("State", {}).get("Health", {}).get("Status")
         if health:
-            assert health in ["healthy", "starting"], (
-                f"UnrealIRCd health status: {health}"
-            )
+            assert health in ["healthy", "starting"], f"UnrealIRCd health status: {health}"
 
     @pytest.mark.integration
     @pytest.mark.docker
@@ -125,15 +117,15 @@ def test_webpanel_container_running(self, running_services):
     @pytest.mark.slow
     def test_irc_ports_open(self, running_services):
         """Test that IRC ports are open and accepting connections."""
-        ports_to_test = [6667, 6697]  # Standard IRC and SSL ports
+        ports_to_test = [6697]  # TLS only
 
         for port in ports_to_test:
             with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
                 sock.settimeout(5)
                 try:
                     result = sock.connect_ex(("localhost", port))
                     assert result == 0, f"Port {port} should be open"
-                except socket.error:
+                except OSError:
                     pytest.fail(f"Could not connect to port {port}")
 
     @pytest.mark.integration
@@ -165,9 +157,7 @@ def test_container_logs_accessible(self, running_services):
         for container in running_services:
             try:
                 logs = container.logs(tail=10)
-                assert logs is not None, (
-                    f"Logs should be accessible for {container.name}"
-                )
+                assert logs is not None, f"Logs should be accessible for {container.name}"
             except docker.errors.DockerException:
                 pytest.fail(f"Could not access logs for {container.name}")
 
@@ -188,9 +178,7 @@ def test_service_dependencies(self, running_services):
 
         if unrealircd_start and atheme_start:
             # Atheme should start after UnrealIRCd
-            assert atheme_start > unrealircd_start, (
-                "Atheme should start after UnrealIRCd"
-            )
+            assert atheme_start > unrealircd_start, "Atheme should start after UnrealIRCd"
 
     @pytest.mark.integration
     @pytest.mark.docker
@@ -202,9 +190,7 @@ def test_container_resource_limits(self, running_services):
             # Check if memory limits are set (optional but good practice)
             memory_limit = config.get("Memory")
             if memory_limit:
-                assert memory_limit > 0, (
-                    f"Container {container.name} should have memory limit"
-                )
+                assert memory_limit > 0, f"Container {container.name} should have memory limit"
 
     @pytest.mark.integration
     @pytest.mark.docker
@@ -215,7 +201,7 @@ def test_environment_variables_passed(self, running_services, project_root):
         if env_file.exists():
             # Read expected variables
             expected_vars = {}
-            with open(env_file, "r") as f:
+            with open(env_file) as f:
                 for line in f:
                     line = line.strip()
                     if line and not line.startswith("#") and "=" in line:
@@ -234,24 +220,18 @@ def test_environment_variables_passed(self, running_services, project_root):
 
                     # Check some key variables are present
                     for var in ["TZ", "PUID", "PGID"]:
-                        assert var in env_dict, (
-                            f"Environment variable {var} should be set"
-                        )
+                        assert var in env_dict, f"Environment variable {var} should be set"
 
     @pytest.mark.integration
     @pytest.mark.docker
     @pytest.mark.slow
     def test_container_restart_policy(self, running_services):
         """Test that containers have appropriate restart policies."""
         for container in running_services:
-            restart_policy = container.attrs.get("HostConfig", {}).get(
-                "RestartPolicy", {}
-            )
+            restart_policy = container.attrs.get("HostConfig", {}).get("RestartPolicy", {})
 
             # Most services should have unless-stopped policy
-            if (
-                "ssl-monitor" not in container.name
-            ):  # SSL monitor might have different policy
+            if "ssl-monitor" not in container.name:  # SSL monitor might have different policy
                 assert restart_policy.get("Name") in ["unless-stopped", "always"], (
                     f"Container {container.name} should have restart policy"
                 )