Browse Source

[CVE][Py3] Bump Mako and djangomako packages to fix high severity CVE (#3031)

Harsh Gupta 3 years ago
parent
commit
19d8fe752c
2 changed files with 2 additions and 9 deletions
  1. 2 2
      desktop/core/requirements.txt
  2. 0 7
      desktop/core/src/desktop/settings.py

+ 2 - 2
desktop/core/requirements.txt

@@ -24,6 +24,7 @@ django-nose==1.4.7
 django_opentracing==1.1.0
 django_opentracing==1.1.0
 django_prometheus==1.0.15
 django_prometheus==1.0.15
 django-webpack-loader==1.0.0
 django-webpack-loader==1.0.0
+djangomako==1.3.2
 djangorestframework-simplejwt==5.2.0
 djangorestframework-simplejwt==5.2.0
 djangorestframework==3.12.2
 djangorestframework==3.12.2
 eventlet==0.30.2
 eventlet==0.30.2
@@ -37,7 +38,7 @@ kazoo==2.8.0
 kerberos==1.3.0
 kerberos==1.3.0
 lockfile==0.12.2
 lockfile==0.12.2
 lxml==4.9.1
 lxml==4.9.1
-Mako==1.1.4
+Mako==1.2.3
 Markdown==3.1
 Markdown==3.1
 nose==1.3.7
 nose==1.3.7
 openpyxl==3.0.9
 openpyxl==3.0.9
@@ -70,7 +71,6 @@ tabulate==0.8.9
 thrift==0.13.0
 thrift==0.13.0
 thrift-sasl==0.4.2
 thrift-sasl==0.4.2
 git+https://github.com/gethue/django-babel.git
 git+https://github.com/gethue/django-babel.git
-git+https://github.com/gethue/django-mako.git
 werkzeug==2.0.1  # Should remove it here and from devtools.mk
 werkzeug==2.0.1  # Should remove it here and from devtools.mk
 django-utils-six==2.0
 django-utils-six==2.0
 six==1.16.0
 six==1.16.0

+ 0 - 7
desktop/core/src/desktop/settings.py

@@ -138,12 +138,6 @@ STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'build', 'static')
 STATIC_ROOT = os.path.join(BASE_DIR, 'build', 'static')
 
 
 
 
-# List of callables that know how to import templates from various sources.
-GTEMPLATE_LOADERS = (
-  'django.template.loaders.filesystem.Loader',
-  'django.template.loaders.app_directories.Loader'
-)
-
 MIDDLEWARE = [
 MIDDLEWARE = [
     # The order matters
     # The order matters
     'desktop.middleware.MetricsMiddleware',
     'desktop.middleware.MetricsMiddleware',
@@ -255,7 +249,6 @@ TEMPLATES = [
     'NAME': 'mako',
     'NAME': 'mako',
     'OPTIONS': {
     'OPTIONS': {
       'context_processors': GTEMPLATE_CONTEXT_PROCESSORS,
       'context_processors': GTEMPLATE_CONTEXT_PROCESSORS,
-      'loaders': GTEMPLATE_LOADERS,
     },
     },
   },
   },
   {
   {