Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Increase the default SAML session expirary time to 15 minutes. #7664

Merged
merged 4 commits into from
Jun 11, 2020
Merged

Increase the default SAML session expirary time to 15 minutes. #7664

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4802788
Increase the default SAML session expirary time to 15 minutes.
clokep Jun 9, 2020
86f20cf
Add newsfragement.
clokep Jun 9, 2020
7b2b9c5
Regenerate the sample configuration.
clokep Jun 9, 2020
da44a47
Change example back to 5 minutes.
clokep Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7664.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Increase the default SAML session expirary time to 15 minutes.
4 changes: 2 additions & 2 deletions docs/sample_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,9 +1454,9 @@ saml2_config:

# The lifetime of a SAML session. This defines how long a user has to
# complete the authentication process, if allow_unsolicited is unset.
# The default is 5 minutes.
# The default is 15 minutes.
#
#saml_session_lifetime: 5m
#saml_session_lifetime: 15m

# An external module can be provided here as a custom solution to
# mapping attributes returned from a saml provider onto a matrix user.
Expand Down
6 changes: 3 additions & 3 deletions synapse/config/saml2_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def read_config(self, config, **kwargs):

# session lifetime: in milliseconds
self.saml2_session_lifetime = self.parse_duration(
saml2_config.get("saml_session_lifetime", "5m")
saml2_config.get("saml_session_lifetime", "15m")
)

template_dir = saml2_config.get("template_dir")
Expand Down Expand Up @@ -286,9 +286,9 @@ def generate_config_section(self, config_dir_path, server_name, **kwargs):

# The lifetime of a SAML session. This defines how long a user has to
# complete the authentication process, if allow_unsolicited is unset.
# The default is 5 minutes.
# The default is 15 minutes.
#
#saml_session_lifetime: 5m
#saml_session_lifetime: 15m
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the example is supposed to be something different to the default.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leaving it at 5m is probably reasonable then?


# An external module can be provided here as a custom solution to
# mapping attributes returned from a saml provider onto a matrix user.
Expand Down