gns3-server 3.0.1__py3-none-any.whl → 3.0.3__py3-none-any.whl

gns3server/server.py

@@ -23,7 +23,6 @@ Start the program. Use main.py to load it.
 import os
 import datetime
 import locale
-import argparse
 import psutil
 import sys
 import asyncio
@@ -33,13 +32,10 @@ import uvicorn
 import secrets
 import string
 
-from gns3server.controller import Controller
-from gns3server.compute.port_manager import PortManager
 from gns3server.logger import init_logger
 from gns3server.version import __version__
 from gns3server.config import Config
 from gns3server.crash_report import CrashReport
-from gns3server.api.server import app
 from pydantic import ValidationError, SecretStr
 
 import logging
@@ -90,40 +86,13 @@ class Server:
         else:
             log.info(f"Current locale is {language}.{encoding}")
 
-    def _parse_arguments(self, argv):
+    def _setup_logging(self, args):
         """
-        Parse command line arguments and override local configuration
+        Setup logging.
 
-        :params args: Array of command line arguments
+        :param args: command line arguments
         """
 
-        parser = argparse.ArgumentParser(description=f"GNS3 server version {__version__}")
-        parser.add_argument("-v", "--version", help="show the version", action="version", version=__version__)
-        parser.add_argument("--host", help="run on the given host/IP address")
-        parser.add_argument("--port", help="run on the given port", type=int)
-        parser.add_argument("--ssl", action="store_true", help="run in SSL mode")
-        parser.add_argument("--config", help="Configuration file")
-        parser.add_argument("--certfile", help="SSL cert file")
-        parser.add_argument("--certkey", help="SSL key file")
-        parser.add_argument("-L", "--local", action="store_true", help="local mode (allows some insecure operations)")
-        parser.add_argument(
-            "-A", "--allow", action="store_true", help="allow remote connections to local console ports"
-        )
-        parser.add_argument("-q", "--quiet", default=False, action="store_true", help="do not show logs on stdout")
-        parser.add_argument("-d", "--debug", default=False, action="store_true", help="show debug logs")
-        parser.add_argument("--logfile", "--log", help="send output to logfile instead of console")
-        parser.add_argument("--logmaxsize", default=10000000, help="maximum logfile size in bytes (default is 10MB)")
-        parser.add_argument(
-            "--logbackupcount", default=10, help="number of historical log files to keep (default is 10)"
-        )
-        parser.add_argument(
-            "--logcompression", default=False, action="store_true", help="compress inactive (historical) logs"
-        )
-        parser.add_argument("--daemon", action="store_true", help="start as a daemon")
-        parser.add_argument("--pid", help="store process pid")
-        parser.add_argument("--profile", help="Settings profile (blank will use default settings files)")
-
-        args = parser.parse_args(argv)
         level = logging.INFO
         if args.debug:
             level = logging.DEBUG
@@ -137,6 +106,15 @@ class Server:
             quiet=args.quiet,
         )
 
+    @staticmethod
+    def _load_config_and_set_defaults(parser, args, argv=None):
+        """
+        Parse command line arguments and override local configuration
+
+        :param parser: ArgumentParser instance
+        :param args: command line arguments
+        """
+
         try:
             if args.config:
                 Config.instance(files=[args.config], profile=args.profile)
@@ -157,7 +135,10 @@ class Server:
         }
 
         parser.set_defaults(**defaults)
-        return parser.parse_args(argv)
+        if argv is None:
+            argv = sys.argv[1:]
+        args = parser.parse_args(argv)
+        return args
 
     @staticmethod
     def _set_config_defaults_from_command_line(args):
@@ -174,6 +155,8 @@ class Server:
         config.Server.enable_ssl = args.ssl
 
     def _signal_handling(self):
+
+        from gns3server.controller import Controller
         def signal_handler(signame, *args):
 
             try:
@@ -239,9 +222,10 @@ class Server:
             log.critical("Can't write pid file %s: %s", path, str(e))
             sys.exit(1)
 
-    async def run(self):
+    async def run(self, parser, args):
 
-        args = self._parse_arguments(sys.argv[1:])
+        self._setup_logging(args)
+        args = self._load_config_and_set_defaults(parser, args)
 
         if args.pid:
             self._pid_lock(args.pid)
@@ -256,7 +240,6 @@ class Server:
 
         self._set_config_defaults_from_command_line(args)
         config = Config.instance().settings
-
         if not config.Server.compute_password.get_secret_value():
             alphabet = string.ascii_letters + string.digits + string.punctuation
             generated_password = ''.join(secrets.choice(alphabet) for _ in range(16))
@@ -267,9 +250,9 @@ class Server:
         else:
             log.info(f"Compute authentication is enabled with username '{config.Server.compute_username}'")
 
-        # we only support Python 3 version >= 3.8
-        if sys.version_info < (3, 8, 0):
-            raise SystemExit("Python 3.8 or higher is required")
+        # we only support Python 3 version >= 3.9
+        if sys.version_info < (3, 9, 0):
+            raise SystemExit("Python 3.9 or higher is required")
 
         log.info(
             "Running with Python {major}.{minor}.{micro} and has PID {pid}".format(
@@ -297,11 +280,13 @@ class Server:
         host = config.Server.host
         port = config.Server.port
 
+        from gns3server.compute.port_manager import PortManager
         PortManager.instance().console_host = host
         self._signal_handling()
 
         try:
             log.info(f"Starting server on {host}:{port}")
+            from gns3server.api.server import app
 
             # only show uvicorn access logs in debug mode
             access_log = False

gns3server/services/authentication.py

@@ -14,8 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-from jose import JWTError, jwt
+from joserfc import jwt
+from joserfc.jwk import OctKey
+from joserfc.errors import JoseError
 from datetime import datetime, timedelta, timezone
 import bcrypt
 
@@ -56,7 +57,8 @@ class AuthService:
             secret_key = DEFAULT_JWT_SECRET_KEY
             log.error("A JWT secret key must be configured to secure the server, using an unsecured default key!")
         algorithm = Config.instance().settings.Controller.jwt_algorithm
-        encoded_jwt = jwt.encode(to_encode, secret_key, algorithm=algorithm)
+        key = OctKey.import_key(secret_key)
+        encoded_jwt = jwt.encode({"alg": algorithm}, to_encode, key)
         return encoded_jwt
 
     def get_username_from_token(self, token: str, secret_key: str = None) -> Optional[str]:
@@ -73,11 +75,12 @@ class AuthService:
                 secret_key = DEFAULT_JWT_SECRET_KEY
                 log.error("A JWT secret key must be configured to secure the server, using an unsecured default key!")
             algorithm = Config.instance().settings.Controller.jwt_algorithm
-            payload = jwt.decode(token, secret_key, algorithms=[algorithm])
-            username: str = payload.get("sub")
+            key = OctKey.import_key(secret_key)
+            payload = jwt.decode(token, key, algorithms=[algorithm])
+            username: str = payload.claims.get("sub")
             if username is None:
                 raise credentials_exception
             token_data = TokenData(username=username)
-        except (JWTError, ValidationError):
+        except (JoseError, ValidationError, ValueError):
             raise credentials_exception
         return token_data.username

gns3server/static/web-ui/index.html

@@ -46,6 +46,6 @@
 
       gtag('config', 'G-0BT7QQV1W1');
     </script>
-  <script src="runtime.24fa95b7061d7056.js" type="module"></script><script src="polyfills.319c79dd175e50d0.js" type="module"></script><script src="main.e55eeff5c0ba1cf4.js" type="module"></script>
+  <script src="runtime.24fa95b7061d7056.js" type="module"></script><script src="polyfills.319c79dd175e50d0.js" type="module"></script><script src="main.2e807eb4bc32f838.js" type="module"></script>
 
 </body></html>