mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-10-28 03:02:22 +02:00
Merge pull request #2625 from markparonyan/3.0
feat(compute): option to disable compute authentication
This commit is contained in:
commit
a20e10f75a
@ -26,12 +26,29 @@ from gns3server.config import Config
|
|||||||
from typing import Optional, Union
|
from typing import Optional, Union
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
security = HTTPBasic()
|
security = HTTPBasic(auto_error=False)
|
||||||
|
|
||||||
|
|
||||||
def compute_authentication(credentials: Optional[HTTPBasicCredentials] = Depends(security)) -> None:
|
def compute_authentication(credentials: Optional[HTTPBasicCredentials] = Depends(security)) -> None:
|
||||||
|
"""
|
||||||
|
Authenticate compute requests.
|
||||||
|
|
||||||
|
Returns None if authentication is disabled or if authentication succeeds
|
||||||
|
Raises HTTPException if authentication is required but credentials are invalid
|
||||||
|
"""
|
||||||
|
|
||||||
server_settings = Config.instance().settings.Server
|
server_settings = Config.instance().settings.Server
|
||||||
|
|
||||||
|
if not server_settings.enable_http_auth:
|
||||||
|
return None
|
||||||
|
|
||||||
|
if credentials is None:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
|
detail="Invalid compute username or password",
|
||||||
|
headers={"WWW-Authenticate": "Basic"},
|
||||||
|
)
|
||||||
|
|
||||||
username = secrets.compare_digest(credentials.username, server_settings.compute_username)
|
username = secrets.compare_digest(credentials.username, server_settings.compute_username)
|
||||||
password = secrets.compare_digest(credentials.password, server_settings.compute_password.get_secret_value())
|
password = secrets.compare_digest(credentials.password, server_settings.compute_password.get_secret_value())
|
||||||
if not (username and password):
|
if not (username and password):
|
||||||
@ -44,6 +61,12 @@ def compute_authentication(credentials: Optional[HTTPBasicCredentials] = Depends
|
|||||||
async def ws_compute_authentication(websocket: WebSocket) -> Union[None, WebSocket]:
|
async def ws_compute_authentication(websocket: WebSocket) -> Union[None, WebSocket]:
|
||||||
"""
|
"""
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
server_settings = Config.instance().settings.Server
|
||||||
|
|
||||||
|
if not server_settings.enable_http_auth:
|
||||||
|
await websocket.accept()
|
||||||
|
return websocket
|
||||||
|
|
||||||
await websocket.accept()
|
await websocket.accept()
|
||||||
|
|
||||||
@ -68,7 +91,6 @@ async def ws_compute_authentication(websocket: WebSocket) -> Union[None, WebSock
|
|||||||
if not separator:
|
if not separator:
|
||||||
raise invalid_user_credentials_exc
|
raise invalid_user_credentials_exc
|
||||||
|
|
||||||
server_settings = Config.instance().settings.Server
|
|
||||||
username = secrets.compare_digest(username, server_settings.compute_username)
|
username = secrets.compare_digest(username, server_settings.compute_username)
|
||||||
password = secrets.compare_digest(password, server_settings.compute_password.get_secret_value())
|
password = secrets.compare_digest(password, server_settings.compute_password.get_secret_value())
|
||||||
if not (username and password):
|
if not (username and password):
|
||||||
|
|||||||
@ -91,6 +91,9 @@ udp_end_port_range = 30000
|
|||||||
; uBridge executable location, default: search in PATH
|
; uBridge executable location, default: search in PATH
|
||||||
;ubridge_path = ubridge
|
;ubridge_path = ubridge
|
||||||
|
|
||||||
|
; Option to enable or disable compute HTTP authentication
|
||||||
|
enable_http_auth = True
|
||||||
|
|
||||||
; Username for compute HTTP authentication, "gns3" is the default if not specified
|
; Username for compute HTTP authentication, "gns3" is the default if not specified
|
||||||
compute_username = gns3
|
compute_username = gns3
|
||||||
; Password for compute HTTP authentication, a randomly generated password is used if not specified
|
; Password for compute HTTP authentication, a randomly generated password is used if not specified
|
||||||
|
|||||||
@ -114,6 +114,7 @@ class BuiltinSymbolTheme(str, Enum):
|
|||||||
class ServerSettings(BaseModel):
|
class ServerSettings(BaseModel):
|
||||||
|
|
||||||
local: bool = False
|
local: bool = False
|
||||||
|
enable_http_auth: bool = True
|
||||||
name: str = f"{socket.gethostname()} (controller)"
|
name: str = f"{socket.gethostname()} (controller)"
|
||||||
protocol: ServerProtocol = ServerProtocol.http
|
protocol: ServerProtocol = ServerProtocol.http
|
||||||
host: str = "0.0.0.0"
|
host: str = "0.0.0.0"
|
||||||
|
|||||||
@ -240,7 +240,10 @@ class Server:
|
|||||||
|
|
||||||
self._set_config_defaults_from_command_line(args)
|
self._set_config_defaults_from_command_line(args)
|
||||||
config = Config.instance().settings
|
config = Config.instance().settings
|
||||||
if not config.Server.compute_password.get_secret_value():
|
|
||||||
|
if not config.Server.enable_http_auth:
|
||||||
|
log.info("Compute authentication is disabled")
|
||||||
|
elif not config.Server.compute_password.get_secret_value():
|
||||||
alphabet = string.ascii_letters + string.digits + string.punctuation
|
alphabet = string.ascii_letters + string.digits + string.punctuation
|
||||||
generated_password = ''.join(secrets.choice(alphabet) for _ in range(16))
|
generated_password = ''.join(secrets.choice(alphabet) for _ in range(16))
|
||||||
config.Server.compute_password = SecretStr(generated_password)
|
config.Server.compute_password = SecretStr(generated_password)
|
||||||
|
|||||||
@ -15,6 +15,7 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
from unittest.mock import patch, MagicMock
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from fastapi import FastAPI, status
|
from fastapi import FastAPI, status
|
||||||
@ -22,6 +23,8 @@ from httpx import AsyncClient
|
|||||||
|
|
||||||
from gns3server.version import __version__
|
from gns3server.version import __version__
|
||||||
from gns3server.compute.project import Project
|
from gns3server.compute.project import Project
|
||||||
|
from gns3server.config import Config
|
||||||
|
from gns3server.schemas.config import ServerSettings
|
||||||
|
|
||||||
pytestmark = pytest.mark.asyncio
|
pytestmark = pytest.mark.asyncio
|
||||||
|
|
||||||
@ -71,3 +74,20 @@ class TestComputeRoutes:
|
|||||||
|
|
||||||
response = await compute_client.get(app.url_path_for("compute:compute_statistics"))
|
response = await compute_client.get(app.url_path_for("compute:compute_statistics"))
|
||||||
assert response.status_code == status.HTTP_200_OK
|
assert response.status_code == status.HTTP_200_OK
|
||||||
|
|
||||||
|
|
||||||
|
async def test_compute_auth_disabled(self, app: FastAPI, compute_client: AsyncClient) -> None:
|
||||||
|
|
||||||
|
mock_settings = MagicMock()
|
||||||
|
mock_server_settings = MagicMock()
|
||||||
|
mock_server_settings.enable_http_auth = False
|
||||||
|
mock_server_settings.compute_username = "gns3"
|
||||||
|
mock_server_settings.compute_password.get_secret_value.return_value = "testpass"
|
||||||
|
mock_settings.settings.Server = mock_server_settings
|
||||||
|
|
||||||
|
with patch("gns3server.api.routes.compute.dependencies.authentication.Config.instance", return_value=mock_settings):
|
||||||
|
response = await compute_client.get(
|
||||||
|
app.url_path_for("compute:compute_version"),
|
||||||
|
auth=("wrong_user", "wrong_password")
|
||||||
|
)
|
||||||
|
assert response.status_code == status.HTTP_200_OK
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user