Skip to content

Commit d6591f4

Browse files
committed
Fix change of setting format
1 parent 7aab834 commit d6591f4

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

sonar/platform.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,9 @@ def get_settings(self, settings_list: Optional[list[str]] = None) -> dict[str, a
411411
settings_dict = {k: settings.get_object(endpoint=self, key=k) for k in settings_list}
412412
platform_settings = {}
413413
for v in settings_dict.values():
414-
platform_settings |= v.to_json()
414+
d = v.to_json()
415+
platform_settings |= {d["key"]: d["value"]}
416+
log.info("PLAT_SETTINGS = %s", util.json_dump(platform_settings))
415417
return platform_settings
416418

417419
def __settings(self, settings_list: types.KeyList = None, include_not_set: bool = False) -> dict[str, settings.Setting]:
@@ -752,11 +754,13 @@ def _audit_token_max_lifetime(self, audit_settings: types.ConfigSettings) -> lis
752754
if lifetime_setting is None:
753755
log.info("Token maximum lifetime setting not found, skipping audit")
754756
return []
755-
max_lifetime = util.to_days(self.get_setting(settings.TOKEN_MAX_LIFETIME))
757+
max_lifetime = util.to_days(lifetime_setting.value)
758+
max_allowed = audit_settings.get("audit.tokens.maxAge", 90)
756759
if max_lifetime is None:
757760
return [Problem(get_rule(RuleId.TOKEN_LIFETIME_UNLIMITED), self.external_url)]
758-
if max_lifetime > audit_settings.get("audit.tokens.maxAge", 90):
759-
return [Problem(get_rule(RuleId.TOKEN_LIFETIME_TOO_HIGH), self.external_url, max_lifetime, audit_settings.get("audit.tokens.maxAge", 90))]
761+
if max_lifetime > max_allowed:
762+
return [Problem(get_rule(RuleId.TOKEN_LIFETIME_TOO_HIGH), self.external_url, max_lifetime, max_allowed)]
763+
log.info("Maximum token lifetime (%d days) is lower than the audit max (%d days)", max_lifetime, max_allowed)
760764
return []
761765

762766
def is_mqr_mode(self) -> bool:

0 commit comments

Comments
 (0)