mirror of
https://github.com/apache/superset.git
synced 2026-07-10 00:35:39 +00:00
- add circular-import justification comment on the deferred get_default_port import - drop no-op continue in the per-type loop - add NOTE clarifying last_exc reflects the final (RSAKey) attempt - clarify docstring re paramiko 3.2+ PKey.from_path() and why it's unsafe here - strengthen ed25519/RSA tests with isinstance assertions on the parsed key type - add test for passphrase-protected key without password (PasswordRequiredException) - add test for an unparseable key (SSHException listing all attempted types) - de-duplicate test setup via _make_manager / _make_ssh_tunnel helpers - consistent assertion messages across key-type tests Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
219 lines
7.8 KiB
Python
219 lines
7.8 KiB
Python
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
from unittest.mock import Mock, patch
|
|
|
|
import pytest
|
|
import sshtunnel
|
|
from cryptography.hazmat.primitives.asymmetric import ec
|
|
from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
|
|
from cryptography.hazmat.primitives.asymmetric.rsa import (
|
|
generate_private_key as generate_rsa_key,
|
|
)
|
|
from cryptography.hazmat.primitives.serialization import (
|
|
BestAvailableEncryption,
|
|
Encoding,
|
|
NoEncryption,
|
|
PrivateFormat,
|
|
)
|
|
from paramiko import Ed25519Key, PasswordRequiredException, RSAKey, SSHException
|
|
|
|
from superset.extensions.ssh import SSHManager, SSHManagerFactory
|
|
|
|
|
|
def _make_manager() -> SSHManager:
|
|
app = Mock()
|
|
app.config = {
|
|
"SSH_TUNNEL_LOCAL_BIND_ADDRESS": "127.0.0.1",
|
|
"SSH_TUNNEL_TIMEOUT_SEC": 10.0,
|
|
"SSH_TUNNEL_PACKET_TIMEOUT_SEC": 10.0,
|
|
}
|
|
return SSHManager(app)
|
|
|
|
|
|
def _make_ssh_tunnel(private_key: str, private_key_password: str | None = None) -> Mock:
|
|
ssh_tunnel = Mock()
|
|
ssh_tunnel.server_address = "ssh.example.com"
|
|
ssh_tunnel.server_port = 22
|
|
ssh_tunnel.username = "tunneluser"
|
|
ssh_tunnel.password = None
|
|
ssh_tunnel.private_key = private_key
|
|
ssh_tunnel.private_key_password = private_key_password
|
|
return ssh_tunnel
|
|
|
|
|
|
def test_ssh_tunnel_timeout_setting() -> None:
|
|
app = Mock()
|
|
app.config = {
|
|
"SSH_TUNNEL_MAX_RETRIES": 2,
|
|
"SSH_TUNNEL_LOCAL_BIND_ADDRESS": "test",
|
|
"SSH_TUNNEL_TIMEOUT_SEC": 123.0,
|
|
"SSH_TUNNEL_PACKET_TIMEOUT_SEC": 321.0,
|
|
"SSH_TUNNEL_MANAGER_CLASS": "superset.extensions.ssh.SSHManager",
|
|
}
|
|
factory = SSHManagerFactory()
|
|
factory.init_app(app)
|
|
assert sshtunnel.TUNNEL_TIMEOUT == 123.0
|
|
assert sshtunnel.SSH_TIMEOUT == 321.0
|
|
|
|
|
|
def _make_ed25519_pem() -> str:
|
|
"""Generate a fresh OpenSSH-format ed25519 private key PEM."""
|
|
key = Ed25519PrivateKey.generate()
|
|
return key.private_bytes(
|
|
encoding=Encoding.PEM,
|
|
format=PrivateFormat.OpenSSH,
|
|
encryption_algorithm=NoEncryption(),
|
|
).decode()
|
|
|
|
|
|
def test_create_tunnel_accepts_ed25519_private_key() -> None:
|
|
"""
|
|
Regression for #24180: ed25519 SSH keys must be loadable for tunnel
|
|
setup. The bug surfaces as ``unpack requires 4 bytes`` because the
|
|
code unconditionally calls ``RSAKey.from_private_key`` regardless of
|
|
key type, which mis-parses the ed25519 byte stream.
|
|
|
|
The Superset UI accepts any key the user pastes, so the fix is to
|
|
detect the key type (or use ``paramiko.PKey.from_private_key`` once
|
|
paramiko exposes a polymorphic loader) rather than hard-coding RSA.
|
|
|
|
This test exercises ``create_tunnel`` end-to-end with a freshly
|
|
generated ed25519 key. It mocks ``sshtunnel.open_tunnel`` so the
|
|
test does not actually open a network connection — only the key
|
|
parsing path is exercised.
|
|
"""
|
|
manager = _make_manager()
|
|
ssh_tunnel = _make_ssh_tunnel(_make_ed25519_pem())
|
|
|
|
with patch("superset.extensions.ssh.sshtunnel.open_tunnel") as mock_open:
|
|
manager.create_tunnel(
|
|
ssh_tunnel, "postgresql://user:pass@db.example.com:5432/x"
|
|
)
|
|
|
|
# Key-type-agnostic loader must produce a paramiko PKey usable as ssh_pkey.
|
|
assert mock_open.called, "open_tunnel was never invoked — key parsing aborted"
|
|
forwarded_pkey = mock_open.call_args.kwargs["ssh_pkey"]
|
|
assert isinstance(forwarded_pkey, Ed25519Key)
|
|
|
|
|
|
def test_create_tunnel_accepts_rsa_private_key_unchanged() -> None:
|
|
"""
|
|
Companion to test_create_tunnel_accepts_ed25519_private_key: pin the
|
|
backward-compatible RSA path so a fix for ed25519 doesn't regress the
|
|
historically-supported RSA case. Uses a freshly generated RSA key in
|
|
OpenSSH format.
|
|
"""
|
|
rsa_pem = (
|
|
generate_rsa_key(public_exponent=65537, key_size=2048)
|
|
.private_bytes(
|
|
encoding=Encoding.PEM,
|
|
format=PrivateFormat.OpenSSH,
|
|
encryption_algorithm=NoEncryption(),
|
|
)
|
|
.decode()
|
|
)
|
|
|
|
manager = _make_manager()
|
|
ssh_tunnel = _make_ssh_tunnel(rsa_pem)
|
|
|
|
with patch("superset.extensions.ssh.sshtunnel.open_tunnel") as mock_open:
|
|
manager.create_tunnel(
|
|
ssh_tunnel, "postgresql://user:pass@db.example.com:5432/x"
|
|
)
|
|
|
|
assert mock_open.called, "open_tunnel was never invoked — RSA key parsing aborted"
|
|
assert isinstance(mock_open.call_args.kwargs["ssh_pkey"], RSAKey)
|
|
|
|
|
|
def test_create_tunnel_accepts_ecdsa_private_key() -> None:
|
|
"""
|
|
Companion to the ed25519 and RSA tests: verify ECDSAKey (the third type
|
|
in _SSH_KEY_TYPES) is reachable by _load_private_key. Uses NIST P-256,
|
|
the most common ECDSA curve in practice.
|
|
"""
|
|
ecdsa_pem = (
|
|
ec.generate_private_key(ec.SECP256R1())
|
|
.private_bytes(
|
|
encoding=Encoding.PEM,
|
|
format=PrivateFormat.OpenSSH,
|
|
encryption_algorithm=NoEncryption(),
|
|
)
|
|
.decode()
|
|
)
|
|
|
|
manager = _make_manager()
|
|
ssh_tunnel = _make_ssh_tunnel(ecdsa_pem)
|
|
|
|
with patch("superset.extensions.ssh.sshtunnel.open_tunnel") as mock_open:
|
|
manager.create_tunnel(
|
|
ssh_tunnel, "postgresql://user:pass@db.example.com:5432/x"
|
|
)
|
|
|
|
assert mock_open.called, "open_tunnel was never invoked — ECDSA key parsing aborted"
|
|
assert mock_open.call_args.kwargs["ssh_pkey"] is not None
|
|
|
|
|
|
def test_create_tunnel_passphrase_protected_key_without_password() -> None:
|
|
"""
|
|
A passphrase-protected key supplied without a passphrase must surface as
|
|
``PasswordRequiredException`` (an actionable "key requires passphrase"
|
|
signal) rather than being absorbed by the per-type loop and reported as a
|
|
generic "Unable to parse" error.
|
|
"""
|
|
encrypted_pem = (
|
|
Ed25519PrivateKey.generate()
|
|
.private_bytes(
|
|
encoding=Encoding.PEM,
|
|
format=PrivateFormat.OpenSSH,
|
|
encryption_algorithm=BestAvailableEncryption(b"correct horse"),
|
|
)
|
|
.decode()
|
|
)
|
|
|
|
manager = _make_manager()
|
|
ssh_tunnel = _make_ssh_tunnel(encrypted_pem, private_key_password=None)
|
|
|
|
with patch("superset.extensions.ssh.sshtunnel.open_tunnel") as mock_open:
|
|
with pytest.raises(PasswordRequiredException):
|
|
manager.create_tunnel(
|
|
ssh_tunnel, "postgresql://user:pass@db.example.com:5432/x"
|
|
)
|
|
|
|
assert not mock_open.called
|
|
|
|
|
|
def test_create_tunnel_invalid_key_raises_combined_error() -> None:
|
|
"""
|
|
When a key parses as none of the supported types, ``_load_private_key``
|
|
raises ``SSHException`` whose message lists every type that was attempted,
|
|
so the failure clearly communicates that all loaders were tried.
|
|
"""
|
|
manager = _make_manager()
|
|
ssh_tunnel = _make_ssh_tunnel("not a valid private key")
|
|
|
|
with patch("superset.extensions.ssh.sshtunnel.open_tunnel") as mock_open:
|
|
with pytest.raises(SSHException) as exc_info:
|
|
manager.create_tunnel(
|
|
ssh_tunnel, "postgresql://user:pass@db.example.com:5432/x"
|
|
)
|
|
|
|
message = str(exc_info.value)
|
|
assert "Ed25519Key" in message
|
|
assert "ECDSAKey" in message
|
|
assert "RSAKey" in message
|
|
assert not mock_open.called
|