url_prefix do not work in Glances < 4.2.0 nicolargo#2912

Author: nicolargo

docker-compose/glances.conf

@@ -36,7 +36,7 @@ max_processes_display=25
 # Set URL prefix for the WebUI and the API
 # Example: url_prefix=/glances/ => http://localhost/glances/
 # Note: The final / is mandatory
-# Default is no prefix (/)
+# Default is no prefix
 #url_prefix=/glances/
 # Set root path for WebUI statics files
 # Why ? On Debian system, WebUI statics files are not provided.

glances/outputs/glances_restful_api.py

@@ -112,10 +112,6 @@ def __init__(self, config=None, args=None):
             self._app = FastAPI()
             self._password = None
 
-        # Change the default root path
-        if self.url_prefix != '/':
-            self._app.include_router(APIRouter(prefix=self.url_prefix.rstrip('/')))
-
         # Set path for WebUI
         webui_root_path = config.get_value(
             'outputs', 'webui_root_path', default=os.path.dirname(os.path.realpath(__file__))
@@ -147,11 +143,15 @@ def __init__(self, config=None, args=None):
     def load_config(self, config):
         """Load the outputs section of the configuration file."""
         # Limit the number of processes to display in the WebUI
-        self.url_prefix = '/'
+        self.url_prefix = ''
         if config is not None and config.has_section('outputs'):
+            # Max process to display in the WebUI
             n = config.get_value('outputs', 'max_processes_display', default=None)
             logger.debug(f'Number of processes to display in the WebUI: {n}')
-            self.url_prefix = config.get_value('outputs', 'url_prefix', default='/')
+            # URL prefix
+            self.url_prefix = config.get_value('outputs', 'url_prefix', default='')
+            if self.url_prefix != '':
+                self.url_prefix = self.url_prefix.rstrip('/')
             logger.debug(f'URL prefix: {self.url_prefix}')
 
     def __update__(self):
@@ -179,7 +179,8 @@ def authentication(self, creds: Annotated[HTTPBasicCredentials, Depends(security
 
     def _router(self):
         """Define a custom router for Glances path."""
-        router = APIRouter()
+        # Create une main router
+        router = APIRouter(prefix=self.url_prefix)
 
         # REST API
         router.add_api_route(
@@ -278,7 +279,7 @@ def _router(self):
             router.add_api_route('/', response_class=HTMLResponse, endpoint=self._index)
 
             # Statics files
-            self._app.mount("/static", StaticFiles(directory=self.STATIC_PATH), name="static")
+            self._app.mount(urljoin(self.url_prefix, '/static'), StaticFiles(directory=self.STATIC_PATH), name="static")
 
             logger.info(f"Get WebUI in {self.STATIC_PATH}")