Maxim Shulga
eef0e453bf
The password could only be given through the PASSWORD variable, so Docker Compose and Swarm secrets were unusable and the password sat in the container environment. PASSWORD_FILE and TOKEN_FILE read a secret from a mounted file. Only trailing newlines are stripped, since secret files are usually written with one and a password that silently carries it just fails to authenticate; everything else, including surrounding spaces, belongs to the secret. Setting both a variable and a file for one secret is rejected rather than resolved by precedence, because the two are meant to be the same value and quietly picking one hides the mistake until authentication fails. The installed seaf-cli supports token authentication and ignores the password when a token is given, so sync now passes -T instead of -p. The account password no longer appears in any command line. The token does, because seaf-cli accepts credentials only as arguments, but a token can be revoked on the server. This is documented in the README. Both secrets are masked before a command is logged. Tests cover newline handling, empty and missing files, conflicting sources, and that neither secret reaches the logs. Requests are now blocked in tests: the client retries with backoff, so a test that reached the network appeared to hang instead of failing.
40 lines
1.0 KiB
Python
40 lines
1.0 KiB
Python
"""Make ``dsc.client`` importable outside the container.
|
|
|
|
``seafile`` and ``pysearpc`` ship with the Seafile CLI AppImage and only exist
|
|
inside the image. The application tests must not need a live server or that
|
|
AppImage, so a stub module stands in for the RPC client.
|
|
"""
|
|
|
|
import sys
|
|
import types
|
|
from unittest import mock
|
|
|
|
import pytest
|
|
|
|
|
|
def _install_seafile_stub():
|
|
if "seafile" in sys.modules:
|
|
return
|
|
seafile = types.ModuleType("seafile")
|
|
seafile.RpcClient = mock.MagicMock(name="RpcClient")
|
|
sys.modules["seafile"] = seafile
|
|
|
|
|
|
_install_seafile_stub()
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def no_network(monkeypatch):
|
|
"""
|
|
Fail loudly instead of reaching the network.
|
|
|
|
The client retries failed requests with backoff, so a test that
|
|
accidentally makes a real request appears to hang rather than fail.
|
|
"""
|
|
import requests
|
|
|
|
def blocked(self, method, url, *args, **kwargs):
|
|
raise AssertionError(f"Test attempted a real request: {method} {url}")
|
|
|
|
monkeypatch.setattr(requests.Session, "request", blocked)
|