Release 4.3.2

.github/workflows/entrypoint_nightly.yml

@@ -21,11 +21,11 @@ jobs:
       id-token: write
     needs: test
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
         with:
           submodules: true
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Install requirements

.github/workflows/entrypoint_prerelease.yml

@@ -8,16 +8,25 @@ on:
       - ".github/**"
       - "**.md"
 
+# creating a separate concurrency group for each PR
+# so that our "PR checks" are always running for the latest commit in the PR
+# and as PRs are updated we want to make sure "in progress" jobs are killed so we don't waste resources
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
+
 jobs:
   preprod_test:
     name: Pre-prod code testing
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
         with:
           submodules: false
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Find spawn.sh script version
@@ -35,13 +44,14 @@ jobs:
   build:
     name: Build Python 🐍 distributions
     runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
     needs: code_test
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
         with:
           submodules: true
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Install requirements

.github/workflows/entrypoint_pull_request.yml

@@ -37,11 +37,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
         with:
           submodules: true
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Install requirements

.github/workflows/entrypoint_release.yml

@@ -19,11 +19,11 @@ jobs:
       id-token: write
     needs: test
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
         with:
           submodules: true
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Install requirements

.github/workflows/sub_testing.yml

@@ -8,11 +8,11 @@ jobs:
     name: Code testing
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
         with:
           submodules: false
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.12"
       - name: Install requirements
@@ -31,14 +31,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         os: [win32, linux, darwin]
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@main
         with:
           submodules: false
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.12"
       - name: Install requirements

README.md

@@ -57,15 +57,5 @@ Below are some bullet points to better understand how Exegol works
   </a>
 </div>
 
-Dramelac and I work at *Capgemini* and we thank them for allocating some time for us to develop and maintain Exegol! Visit Capgemini website at https://www.capgemini.com/.
-
-___
-
-<div align="center">
-  <a href="https://www.hackthebox.com/" title="Follow">
-    <img width="300" src="https://exegol.readthedocs.io/en/latest/_images/hackthebox.png">
-  </a>
-</div>
-
-We also thank *HackTheBox* for continuously supporting the community and for helping us financially to acquire the necessary hardware for supporting multiple architectures (AMD64, ARM64). Show some love at https://www.hackthebox.com/ !
+Dramelac and I work at [Capgemini](https://www.capgemini.com/) and we thank them for believing in the project since day 1, and for allowing us to have this personal initiative keep going.
 

exegol/config/ConstantConfig.py

@@ -5,7 +5,7 @@
 class ConstantConfig:
     """Constant parameters information"""
     # Exegol Version
-    version: str = "4.3.1"
+    version: str = "4.3.2"
 
     # Exegol documentation link
     documentation: str = "https://exegol.rtfd.io/"

exegol/config/EnvInfo.py

@@ -1,6 +1,8 @@
 import json
+import os
 import platform
 from enum import Enum
+from pathlib import Path
 from typing import Optional, Any, List
 
 from exegol.config.ConstantConfig import ConstantConfig
@@ -17,6 +19,11 @@ class HostOs(Enum):
         LINUX = "Linux"
         MAC = "Mac"
 
+    class DisplayServer(Enum):
+        """Dictionary class for static Display Server"""
+        WAYLAND = "Wayland"
+        X11 = "X11"
+
     class DockerEngine(Enum):
         """Dictionary class for static Docker engine name"""
         WLS2 = "WSL2"
@@ -107,6 +114,20 @@ def getHostOs(cls) -> HostOs:
         assert cls.__docker_host_os is not None
         return cls.__docker_host_os
 
+    @classmethod
+    def getDisplayServer(cls) -> DisplayServer:
+        """Returns the display server
+        Can be 'X11' or 'Wayland'"""
+        session_type = os.getenv("XDG_SESSION_TYPE", "x11")
+        if session_type == "wayland":
+            return cls.DisplayServer.WAYLAND
+        elif session_type == "x11":
+            return cls.DisplayServer.X11
+        else:
+            # Should return an error
+            logger.warning(f"Unknown session type {session_type}. Using X11 as fallback.")
+            return cls.DisplayServer.X11
+
     @classmethod
     def getWindowsRelease(cls) -> str:
         # Cache check
@@ -128,6 +149,11 @@ def isMacHost(cls) -> bool:
         """Return true if macOS is detected on the host"""
         return cls.getHostOs() == cls.HostOs.MAC
 
+    @classmethod
+    def isWaylandAvailable(cls) -> bool:
+        """Return true if wayland is detected on the host"""
+        return cls.getDisplayServer() == cls.DisplayServer.WAYLAND or bool(os.getenv("WAYLAND_DISPLAY"))
+
     @classmethod
     def isDockerDesktop(cls) -> bool:
         """Return true if docker desktop is used on the host"""

exegol/config/UserConfig.py

@@ -124,7 +124,7 @@ def _process_data(self):
         # Desktop section
         desktop_data = config_data.get("desktop", {})
         self.desktop_default_enable = self._load_config_bool(desktop_data, 'enabled_by_default', self.desktop_default_enable)
-        self.desktop_default_proto = self._load_config_str(desktop_data, 'default_proto', self.desktop_default_proto, choices=self.desktop_available_proto)
+        self.desktop_default_proto = self._load_config_str(desktop_data, 'default_protocol', self.desktop_default_proto, choices=self.desktop_available_proto)
         self.desktop_default_localhost = self._load_config_bool(desktop_data, 'localhost_by_default', self.desktop_default_localhost)
 
     def get_configs(self) -> List[str]:

exegol/console/TUI.py

@@ -451,10 +451,10 @@ def __buildContainerRecapTable(container: ExegolContainerTemplate):
             recap.add_row("[bold blue]Comment[/bold blue]", comment)
         if passwd:
             recap.add_row(f"[bold blue]Credentials[/bold blue]", f"[deep_sky_blue3]{container.config.getUsername()}[/deep_sky_blue3] : [deep_sky_blue3]{passwd}[/deep_sky_blue3]")
-        recap.add_row("[bold blue]Desktop[/bold blue]", container.config.getDesktopConfig())
+        recap.add_row("[bold blue]Remote Desktop[/bold blue]", container.config.getDesktopConfig())
         if creation_date:
             recap.add_row("[bold blue]Creation date[/bold blue]", creation_date)
-        recap.add_row("[bold blue]X11[/bold blue]", boolFormatter(container.config.isGUIEnable()))
+        recap.add_row("[bold blue]Console GUI[/bold blue]", boolFormatter(container.config.isGUIEnable()) + container.config.getTextGuiSockets())
         recap.add_row("[bold blue]Network[/bold blue]", container.config.getTextNetworkMode())
         recap.add_row("[bold blue]Timezone[/bold blue]", boolFormatter(container.config.isTimezoneShared()))
         recap.add_row("[bold blue]Exegol resources[/bold blue]", boolFormatter(container.config.isExegolResourcesEnable()) +

exegol/manager/ExegolManager.py

@@ -234,9 +234,9 @@ def print_version(cls):
     @classmethod
     def print_sponsors(cls):
         """Show exegol sponsors"""
-        logger.success(
-            """We thank [link=https://www.capgemini.com/fr-fr/carrieres/offres-emploi/][blue]Capgemini[/blue][/link] for supporting the project [bright_black](helping with dev)[/bright_black] :pray:""")
-        logger.success("""We thank [link=https://www.hackthebox.com/][green]HackTheBox[/green][/link] for sponsoring the [bright_black]multi-arch[/bright_black] support :green_heart:""")
+        #logger.success("""We thank [link=https://www.capgemini.com/fr-fr/carrieres/offres-emploi/][blue]Capgemini[/blue][/link] for supporting the project [bright_black](helping with dev)[/bright_black] :pray:""")
+        #logger.success("""We thank [link=https://www.hackthebox.com/][green]HackTheBox[/green][/link] for sponsoring the [bright_black]multi-arch[/bright_black] support :green_heart:""")
+        pass
 
     @classmethod
     def __loadOrInstallImage(cls,

exegol/manager/UpdateManager.py

@@ -250,7 +250,7 @@ def __compareVersion(cls, version) -> bool:
     def __get_current_version(cls):
         """Get the current version of the exegol wrapper. Handle dev version and release stable version depending on the current version."""
         current_version = ConstantConfig.version
-        if re.search(r'[a-z]', ConstantConfig.version, re.IGNORECASE):
+        if re.search(r'[a-z]', ConstantConfig.version, re.IGNORECASE) and ConstantConfig.git_source_installation:
             module = ExegolModules().getWrapperGit(fast_load=True)
             if module.isAvailable:
                 current_version = str(module.get_current_commit())[:8]
@@ -259,12 +259,19 @@ def __get_current_version(cls):
     @staticmethod
     def display_current_version():
         """Get the current version of the exegol wrapper. Handle dev version and release stable version depending on the current version."""
-        commit_version = ""
-        if re.search(r'[a-z]', ConstantConfig.version, re.IGNORECASE):
+        version_details = ""
+        if ConstantConfig.git_source_installation:
             module = ExegolModules().getWrapperGit(fast_load=True)
             if module.isAvailable:
-                commit_version = f" [bright_black]\\[{str(module.get_current_commit())[:8]}][/bright_black]"
-        return f"[blue]v{ConstantConfig.version}[/blue]{commit_version}"
+                current_branch = module.getCurrentBranch()
+                commit_version = ""
+                if re.search(r'[a-z]', ConstantConfig.version, re.IGNORECASE):
+                    commit_version = "-" + str(module.get_current_commit())[:8]
+                if current_branch is None:
+                    current_branch = "HEAD"
+                if current_branch != "master" or commit_version != "":
+                    version_details = f" [bright_black]\\[{current_branch}{commit_version}][/bright_black]"
+        return f"[blue]v{ConstantConfig.version}[/blue]{version_details}"
 
     @classmethod
     def __tagUpdateAvailable(cls, latest_version, current_version=None):
@@ -347,6 +354,8 @@ def __buildSource(cls, build_name: Optional[str] = None) -> str:
 
         # Choose dockerfile
         profiles = cls.listBuildProfiles(profiles_path=build_path)
+        if len(profiles) == 0:
+            logger.critical(f"No build profile found in {build_path}. Check your exegol installation, it seems to be broken...")
         build_profile: Optional[str] = ParametersManager().build_profile
         build_dockerfile: Optional[str] = None
         if build_profile is not None: