diff --git a/server/requirements.txt b/server/requirements.txt index f0cfb95..ac4d257 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -34,9 +34,9 @@ blinker==1.7.0 # raven # sentry-sdk # superdesk-core -boto3==1.34.72 +boto3==1.34.84 # via superdesk-core -botocore==1.34.72 +botocore==1.34.84 # via # boto3 # s3transfer @@ -94,7 +94,7 @@ cryptography==42.0.5 # pyhanko-certvalidator cssselect2==0.7.0 # via svglib -deepdiff==6.7.1 +deepdiff==7.0.1 # via superdesk-planning deprecated==1.2.14 # via limits @@ -102,7 +102,7 @@ draftjs-exporter[lxml]==2.1.7 # via superdesk-core ecs-logging==2.1.0 # via elastic-apm -elastic-apm[flask]==6.21.4.post8347027212 +elastic-apm[flask]==6.22.0 # via superdesk-core elasticsearch==7.13.4 # via @@ -168,7 +168,7 @@ httplib2==0.22.0 # via oauth2client icalendar==4.0.9 # via superdesk-planning -idna==3.6 +idna==3.7 # via requests importlib-resources==6.4.0 # via limits @@ -246,7 +246,7 @@ pyasn1-modules==0.4.0 # via # google-auth # oauth2client -pycparser==2.21 +pycparser==2.22 # via cffi pyhanko==0.18.0 # via xhtml2pdf @@ -268,7 +268,7 @@ pyparsing==3.1.2 # via # httplib2 # pyrtf3 -pypdf==4.1.0 +pypdf==4.2.0 # via xhtml2pdf pypng==0.20220715.0 # via qrcode @@ -362,10 +362,11 @@ tinycss2==1.2.1 # via # cssselect2 # svglib -typing-extensions==4.10.0 +typing-extensions==4.11.0 # via # jwcrypto # limits + # pypdf # qrcode # superdesk-core tzlocal==2.1 diff --git a/server/settings.py b/server/settings.py index a8adba7..201b12b 100644 --- a/server/settings.py +++ b/server/settings.py @@ -187,7 +187,6 @@ "DATETIME_FORMAT": "H.mm D.M.YYYY", "COVERAGE_DATE_FORMAT": "D.M.YYYY", "COVERAGE_DATE_TIME_FORMAT": "H.mm D.M.YYYY", - # server formats "DATE_FORMAT_HEADER": "d.M.yyyy H.mm", "NOTIFICATION_EMAIL_TIME_FORMAT": "H.mm", @@ -201,10 +200,16 @@ else True ) -AUTH_PROVIDERS.append({ - "_id": "azure", - "name": lazy_gettext("Azure"), - "auth_type": AuthProviderType.SAML, -}) +AUTH_PROVIDERS.append( + { + "_id": "azure", + "name": lazy_gettext("Azure"), + "auth_type": AuthProviderType.SAML, + } +) + +CONTENTAPI_ELASTICSEARCH_SETTINGS["settings"]["analysis"]["analyzer"][ + "html_field_analyzer" +]["filter"] = ["lowercase"] -CONTENTAPI_ELASTICSEARCH_SETTINGS["settings"]["analysis"]["analyzer"]["html_field_analyzer"]["filter"] = ["lowercase"] +SAML_AUTH_ENABLED = bool(os.environ.get("SAML_PATH", False))