Skip to content
/ kvmd Public

Commit da4da97

Browse files
committed
Revert "pikvm/pikvm#1459: TOTP valid_window=5"
This reverts commit b6c73ac.
1 parent b6c73ac commit da4da97

File tree

4 files changed

+2
-8
lines changed

4 files changed

+2
-8
lines changed

kvmd/apps/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ def _get_config_scheme() -> dict:
370370
},
371371

372372
"totp": {
373-
"valid_window": Option(1, type=functools.partial(valid_number, min=0, max=5)),
374373
"secret": {
375374
"file": Option("/etc/kvmd/totp.secret", type=valid_abs_path, if_empty=""),
376375
},

kvmd/apps/kvmd/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ def main(argv: (list[str] | None)=None) -> None:
8686
external_kwargs=(config.auth.external._unpack(ignore=["type"]) if config.auth.external.type else {}),
8787

8888
totp_secret_path=config.auth.totp.secret.file,
89-
totp_valid_window=config.auth.totp.valid_window,
9089
),
9190
info_manager=InfoManager(global_config),
9291
log_reader=(LogReader() if config.log_reader.enabled else None),

kvmd/apps/kvmd/auth.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535

3636
# =====
37-
class AuthManager: # pylint: disable=too-many-instance-attributes
37+
class AuthManager:
3838
def __init__(
3939
self,
4040
enabled: bool,
@@ -47,7 +47,6 @@ def __init__(
4747
external_type: str,
4848
external_kwargs: dict,
4949

50-
totp_valid_window: int,
5150
totp_secret_path: str,
5251
) -> None:
5352

@@ -71,7 +70,6 @@ def __init__(
7170
self.__external_service = get_auth_service_class(external_type)(**external_kwargs)
7271
get_logger().info("Using external auth service %r", self.__external_service.get_plugin_name())
7372

74-
self.__totp_valid_window = totp_valid_window
7573
self.__totp_secret_path = totp_secret_path
7674

7775
self.__tokens: dict[str, str] = {} # {token: user}
@@ -97,7 +95,7 @@ async def authorize(self, user: str, passwd: str) -> bool:
9795
secret = file.read().strip()
9896
if secret:
9997
code = passwd[-6:]
100-
if not pyotp.TOTP(secret).verify(code, valid_window=self.__totp_valid_window):
98+
if not pyotp.TOTP(secret).verify(code):
10199
get_logger().error("Got access denied for user %r by TOTP", user)
102100
return False
103101
passwd = passwd[:-6]

testenv/tests/apps/kvmd/test_auth.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ async def _get_configured_manager(
6969
external_type=("htpasswd" if external_path else ""),
7070
external_kwargs=(_make_service_kwargs(external_path) if external_path else {}),
7171

72-
totp_valid_window=0,
7372
totp_secret_path="",
7473
)
7574

@@ -201,7 +200,6 @@ async def test_ok__disabled() -> None:
201200
external_type="",
202201
external_kwargs={},
203202

204-
totp_valid_window=0,
205203
totp_secret_path="",
206204
)
207205

0 commit comments

Comments
 (0)