Commit Graph

64 Commits

Author SHA1 Message Date
Simon Chen
198c4ad9a0 MST-331 Add cors header configs to CMS so it can be turned on (#24571)
* MST-331 Add cors header configs to CMS so it can be turned on

* feedback
2020-07-24 08:09:41 -04:00
Sid Verma
c609451d2e [BD-14] Limit number of blocks allowed in content libraries (#24276)
* Enforce limit on number of blocks allowed in library (blockstore)

* Enforce limit on number of blocks allowed in library (modulestore)

* Changes from review feedback
2020-07-13 15:49:47 -04:00
Feanil Patel
278b747918 Don't fail to provision if we can't find the revision_config_file. 2020-06-08 16:21:30 -04:00
Aarif
98af9ce418 remove useless-supression warnings 2020-05-01 19:42:15 +05:00
Feanil Patel
db4fd4525e Don't explicitly set the email backend in production.py
We shouldn't be explicitly setting this here. It's already set in all of
our override files and not everyone who wants to use production.py wants
to use SES so we shouldn't hardcode it here.

Also move the other settings to above the config loading so that all
config can be overridden by the config file.
2020-04-22 11:20:46 -04:00
Feanil Patel
791666fb7e Remove redundant settings.
Now that we autoload most keys directly from the yaml file into the
settings context.  We don't need boilerplate of the form:

KEY = ENV_TOKENS.get('KEY', KEY)
KEY = AUTH_TOKENS.get('KEY', KEY)

which tries to get the value of KEY from the config file but if it's not
there it pulls it from the defaults found in common.py
2020-04-17 15:55:12 -04:00
Awais Jibran
804fac9358 Adds retry logic for software secure 2020-04-13 14:14:11 +05:00
Feanil Patel
bf320f038b Find more vars that are partially updated. 2020-04-09 15:27:28 -04:00
Feanil Patel
75f663791e Account for dicts that don't get replaced wholesale.
Right now we have a few settings that are not whoesale replaced but
piecemeal updated. So we remove them from the mass update.
2020-04-09 15:27:28 -04:00
Feanil Patel
7c0c71ca69 Auto load any keys/values from the yaml config file.
This should allow us to remove all the boilerplate code in this file
where a name is pulled from the config dict and put into the top level
namespace of the settings module.

We do this first so that any logic that adds more complex or dynamic
keys will still run and is safe.

Now that this is here we can start removing any simple boilerplate.
2020-04-09 15:27:28 -04:00
Waheed Ahmed
3dc3e10819 Revert "Adds retry logic for software secure." 2020-04-07 20:40:06 +05:00
Awais Jibran
4ead215665 Adds retry logic for ss.
1. Created a new celery queue with key `SOFTWARE_SECURE_VERIFICATION_ROUTING_KEY`.
2. Added a celery task with retry logic.
3. sorted imports with isort.
4. Changed deprecated `log.warn` => `log.warning`.
2020-04-06 15:16:56 +05:00
Awais Qureshi
0f002bafb8 BOM-1399
checking django-wiki and fixing deprecation warnings.
2020-03-16 14:37:18 +05:00
Samuel Walladge
badd608136 Allow overriding broker heartbeat (#21567)
BROKER_HEARTBEAT appears to interfere with the celery worker
configuration. If we want to disable or change the heartbeat interval,
It must be from these configuration options.

Just setting --without-heartbeat and/or --heartbeat-interval on the
workers does not fully work. Eg. --without-heartbeat disables sending
heartbeats, but BROKER_HEARTBEAT = 60 means that the connection will get
a 60s heartbeat interval negotiated.
2020-03-11 09:28:38 -04:00
Manjinder Singh
7d2ff9cd3f Removing all settings that have OIDC in name (#23251)
* Removing all settings that have OIDC in name

* Removing ENABLE_DOP_ADAPTER

* changes JWT_ISSUER value in devstack
2020-03-04 09:06:29 -05:00
Giovanni Cimolin da Silva
6305fbdfb6 Add mktg links override capability
This commit adds a feature that allows overriding any marketing URL, either by configuration on lms.env.json or SiteConfiguration, regardless if a marketing website is set up.
The links can be set by passing MKTG_URL_OVERRIDES to either `lms.env.json` or `SiteConfiguration`.
2020-02-25 13:51:58 -03:00
Ayub-khan
d3a02bc3e5 BOM-1121
-Updated middleware setting to use use middleware insted of
middleware_classes
-github install of django-method-override fork to support
new style middleware in django1.11
2020-02-11 14:35:26 +05:00
Ahtisham Shahid
0ce89b70eb Merge pull request #22873 from edx/ahtisham/PROD-1126
created separate const for search_index_update queue
2020-01-21 11:45:46 +05:00
Brandon Baker
4fc19f5d8c Add enterprise catalog url settings to CMS (#22895) 2020-01-17 14:26:42 -05:00
Ahtisham Shahid
7a026b7850 created const for update_search_index 2020-01-17 14:29:30 +05:00
Calen Pennington
dd5f85c870 Read STATICFILES_STORAGE_KWARGS from config to allow separate storage configuration for static assets 2020-01-07 14:03:37 -05:00
Calen Pennington
e654036d54 Load any AWS_ prefixed settings from ENV_TOKENS to allow S3Boto3Storage to be correctly configured 2020-01-03 11:16:03 -05:00
Calen Pennington
151b309225 Convert custom storage subclasses into mixins so that we can store to either the filesystem or S3 2020-01-02 14:49:19 -05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
2019-12-30 10:35:30 -05:00
Calen Pennington
11e163d420 Read the current edx-platform git revision from a file on disk 2019-12-17 07:44:28 -05:00
Robert Raposa
2202545aec remove studio signin and signup pages
This completes the work started in https://github.com/edx/edx-platform/pull/19453
to use the LMS login and registration for Studio, rather than Studio
providing its own implementation.

LMS login/registration are being used for the following reasons:
1. LMS logistration properly handles all SSO integrations.
2. A single logistration is simpler to maintain and understand.
3. Allows Studio to work more like all other IDAs that use LMS
logistration.

The original switch to use LMS logistration for Studio also added the
toggle `DISABLE_STUDIO_SSO_OVER_LMS` to provide the community some
additional time for switching. This commit removes this toggle, which
at this point means all deployments will use the LMS logistration.

This change requires sharing cookies across LMS and Studio. Should that
prove to be a problem for certain Open edX instances, there are
discussions of possible alternative solutions.
See https://github.com/edx/edx-platform/pull/19845#issuecomment-559154256

Detailed changes:
* Fix some Studio links that still went to old Studio signin and signup.
* Remove DISABLE_STUDIO_SSO_OVER_LMS feature toggle.
* Remove old studio signin and signup pages and templates.
* Fix url name "login", which had different meanings for Studio and LMS.
* Use the following settings: LOGIN_URL, FRONTEND_LOGIN_URL,
FRONTEND_LOGOUT_URL, and FRONTEND_REGISTER_URL.
* Redirect /signin and /signup to the LMS logistration.
* Add custom metric `uses_pattern_library`.
* Add custom metric `student_activate_account`.
* Add Django Settings to allow /signin, /signup, and /login_post to be
disabled once ready.

This work also relates to ARCH-218 and DEPR-6.

ARCH-1253
2019-12-04 02:36:36 -05:00
Matt Tuchfarber
59ac1b009a Add manual enrollment role choices to CMS
Required these be added to CMS since enterprise is installed in the CMS
and there are import failures when these keys don't exist
2019-11-14 11:42:37 -05:00
Braden MacDonald
05d7592eda Read CMS_BASE from the environment, define it explicitly as public host 2019-10-31 16:17:08 -07:00
Ned Batchelder
d585a8f71d URLs and settings for OpenAPI generation
API docs are now always available, no more toggle to enable them.
2019-09-17 16:54:27 -04:00
Albert (AJ) St. Aubin
9eabc2a8f9 Added FERNET_KEY information to the CMS configuration (#21561)
[ENT-2191]
2019-09-04 12:20:56 -04:00
Feanil Patel
3205cdab5f Merge pull request #21536 from edx/feanil/get_runserver_working
Fix errors when running runserver in python 3.
2019-09-03 11:06:25 -04:00
Feanil Patel
ca9cfb128c Fix errors when running runserver in python 3.
- The fields need to be unicode not bytes.  In python 2 it was auto
converting.
- The static url base has been allowed to be a unicode string for a
while.
2019-09-03 09:10:58 -04:00
Braden MacDonald
d3f6ed09d8 Learning Contexts, New XBlock Runtime, Blockstore API Client + Content Libraries
https://github.com/edx/edx-platform/pull/20645

This introduces:
* A new XBlock runtime that can read and write XBlocks that are persisted using
  Blockstore instead of Modulestore. The new runtime is currently isolated so
  that it can be tested without risk to the current courseware/runtime.
* Content Libraries v2, which store XBlocks in Blockstore not modulestore
* An API Client for Blockstore
* "Learning Context" plugin API. A learning context is a more abstract concept
  than a course; it's a collection of XBlocks that serves some learning purpose.
2019-08-30 10:31:15 -07:00
Feanil Patel
9925aaadb9 Be able to override this setting from yaml. 2019-08-16 15:09:13 -04:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
Cory Lee
a8fd936d27 Delete enterprise reporting secret because I believe it is not used anywhere (#21309) 2019-08-08 13:00:57 -04:00
Ayub khan
65efedc912 INCR-347 python3 compatibility 2019-07-19 13:52:49 +05:00
Kyle McCormick
35d88ae0e2 Load COURSE_CATALOG_API_URL setting from env in Studio 2019-07-17 11:05:44 -04:00
DawoudSheraz
c78779949e update login lockout params 2019-07-12 14:01:14 +05:00
Usman Khalid
0b27c62ca6 Convert VideoModule to VideoBlock.
Some deprecated functionality has been removed:

- Reading data field and transforms being applied in the init() method.
- The source field.
- The source_visible attribute.
2019-06-20 22:12:39 +05:00
Christopher Pappas
59a1d6ab41 ENT-1556 | Updating settings files to grab SYSTEM_WIDE_ROLE_CLASSES from config as expected
Moving rbac settings above plugins

Moving the setting above plugins in common.py for the lms and cms as well
2019-04-05 17:27:13 -04:00
Cory Lee
ac4845d052 DEPR-14 Remove AWS.py 2019-03-28 10:48:34 -04:00
Felipe Montoya
9195ec9f30 Addressing second feedback about redirect logic on logout behing feature flag 2019-03-11 13:09:13 -05:00
Felipe Montoya
14b4223b5e Addressing feedback 2019-03-11 12:02:38 -05:00
Felipe Montoya
80b977fff4 Make the studio login over the lms optional using a feature flag 2019-03-11 12:01:03 -05:00
Cory Lee
2108b69ff1 "Use single yaml config instead of two json configs"
This reverts commit 8c805999e6.
2019-03-05 11:27:36 -05:00
Mike Dikan
2c149ca6be Removing the Deprecated the 'external_auth' package in favor of 'third_party_auth' which is the current recommendation. 2019-03-02 16:06:46 -05:00
Cory Lee
8c805999e6 Revert "Use single yaml config instead of two json configs"
This reverts commit b0b8a76dd9.
2019-03-01 17:31:10 -05:00
Cory Lee
b0b8a76dd9 Use single yaml config instead of two json configs 2019-03-01 12:55:40 -05:00