diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 7a38777b79..e9272941be 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -599,6 +599,13 @@ if FEATURES.get('ENABLE_OAUTH2_PROVIDER'): OAUTH_OIDC_ISSUER = ENV_TOKENS['OAUTH_OIDC_ISSUER'] OAUTH_ENFORCE_SECURE = ENV_TOKENS.get('OAUTH_ENFORCE_SECURE', True) OAUTH_ENFORCE_CLIENT_SECURE = ENV_TOKENS.get('OAUTH_ENFORCE_CLIENT_SECURE', True) + # Defaults for the following are defined in lms.envs.common + OAUTH_EXPIRE_DELTA = datetime.timedelta( + days=ENV_TOKENS.get('OAUTH_EXPIRE_CONFIDENTIAL_CLIENT_DAYS', OAUTH_EXPIRE_CONFIDENTIAL_CLIENT_DAYS) + ) + OAUTH_EXPIRE_DELTA_PUBLIC = datetime.timedelta( + days=ENV_TOKENS['OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS', OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS]) + ##### ADVANCED_SECURITY_CONFIG ##### ADVANCED_SECURITY_CONFIG = ENV_TOKENS.get('ADVANCED_SECURITY_CONFIG', {}) diff --git a/lms/envs/common.py b/lms/envs/common.py index 75ae7e2199..35940efbac 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -29,9 +29,10 @@ Longer TODO: # and throws spurious errors. Therefore, we disable invalid-name checking. # pylint: disable=invalid-name +import datetime +import imp import sys import os -import imp from path import Path as path from warnings import simplefilter @@ -441,6 +442,9 @@ OAUTH_OIDC_USERINFO_HANDLERS = ( 'oauth2_handler.UserInfoHandler' ) +OAUTH_EXPIRE_CONFIDENTIAL_CLIENT_DAYS = 365 +OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS = 30 + ################################## TEMPLATE CONFIGURATION ##################################### # Mako templating # TODO: Move the Mako templating into a different engine in TEMPLATES below.