github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-16 15:28:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge v4 to dev

Browse Source
This commit is contained in:
Bai
2024-06-24 15:43:40 +08:00
parent 165d030c8e 8bfbebf29e
commit dfde50c768
741 changed files with 27595 additions and 34433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/authentication/backends/passkey/fido.py
View File

@@ -109,7 +109,10 @@ def register_complete(request):
data = request.data
server = get_server(request)
state = request.session.pop("fido2_state")
auth_data = server.register_complete(state, response=data)
try:
auth_data = server.register_complete(state, response=data)
except ValueError as e:
raise ValidationError({'error': str(e)})
encoded = websafe_encode(auth_data.credential_data)
platform = get_current_platform(request)
name = data.pop("key_name", '') or platform

6
apps/authentication/backends/saml2/views.py
View File

@@ -50,7 +50,7 @@ class PrepareRequestMixin:
if idp_metadata_xml.strip():
xml_idp_settings = IdPMetadataParse.parse(idp_metadata_xml)
except Exception as err:
logger.warning('Failed to get IDP metadata XML settings, error: %s', str(err))
logger.warning('Failed to get IDP Metadata XML settings, error: %s', str(err))
url_idp_settings = None
try:
@@ -59,7 +59,7 @@ class PrepareRequestMixin:
idp_metadata_url, timeout=20
)
except Exception as err:
logger.warning('Failed to get IDP metadata URL settings, error: %s', str(err))
logger.warning('Failed to get IDP Metadata URL settings, error: %s', str(err))
idp_settings = url_idp_settings or xml_idp_settings
@@ -231,7 +231,7 @@ class Saml2EndSessionView(View, PrepareRequestMixin):
if settings.SAML2_LOGOUT_COMPLETELY:
saml_instance = self.init_saml_auth(request)
logger.debug(log_prompt.format('Log out IDP user session synchronously'))
logger.debug(log_prompt.format('Logout IDP user session synchronously'))
return HttpResponseRedirect(saml_instance.logout())
logger.debug(log_prompt.format('Redirect logout url'))