Compare commits

..

No commits in common. "2541cc1c91218d14c2a5a6f1fc9447ebdb7a3fb2" and "5077f5f6ade368bc63873599d2bf70f535414fae" have entirely different histories.

7 changed files with 3 additions and 12 deletions

View File

@ -128,7 +128,7 @@ class FilterModule(object):
): ):
domain = domains.get('portfolio')[0] domain = domains.get('portfolio')[0]
sld_tld = ".".join(domain.split(".")[-2:]) # yields "example.com" sld_tld = ".".join(domain.split(".")[-2:]) # yields "example.com"
tokens.append(f"{sld_tld}") # yields "*.example.com" tokens.append(f"{sld_tld}") # yields "*.example.com"
# whitelist # whitelist
tokens += self.get_csp_whitelist(applications, application_id, directive) tokens += self.get_csp_whitelist(applications, application_id, directive)

View File

@ -20,8 +20,6 @@ csp:
unsafe-eval: true unsafe-eval: true
style-src: style-src:
unsafe-inline: true unsafe-inline: true
script-src:
unsafe-eval: true
whitelist: whitelist:
connect-src: connect-src:
- wss://espocrm.{{ primary_domain }} - wss://espocrm.{{ primary_domain }}

View File

@ -13,14 +13,11 @@ csp:
style-src: style-src:
- https://fonts.googleapis.com - https://fonts.googleapis.com
flags: flags:
script-src:
unsafe-eval: true
script-src-elem: script-src-elem:
unsafe-inline: true unsafe-inline: true
unsafe-eval: true unsafe-eval: true
style-src: style-src:
unsafe-inline: true unsafe-inline: true
unsafe-eval: true
domains: domains:
aliases: aliases:
- "analytics.{{ primary_domain }}" - "analytics.{{ primary_domain }}"

View File

@ -8,7 +8,7 @@ ldap:
users: False # Set true to filter users users: False # Set true to filter users
features: features:
matomo: true matomo: true
css: false # Temporary deactivated. Needs to be optimized for production use. css: true
portfolio_iframe: false portfolio_iframe: false
ldap: true ldap: true
central_database: true central_database: true

View File

@ -9,8 +9,6 @@ csp:
flags: flags:
script-src-elem: script-src-elem:
unsafe-inline: true unsafe-inline: true
script-src:
unsafe-inline: true
style-src: style-src:
unsafe-inline: true unsafe-inline: true
whitelist: whitelist:

View File

@ -4,8 +4,6 @@ features:
portfolio_iframe: false portfolio_iframe: false
csp: csp:
flags: flags:
script-src:
unsafe-eval: true
script-src-elem: script-src-elem:
unsafe-inline: true unsafe-inline: true
unsafe-eval: true unsafe-eval: true

View File

@ -77,7 +77,7 @@
(application_id): { (application_id): {
'csp': { 'csp': {
'hashes': { 'hashes': {
'script-src-elem': ( 'script-src': (
applications[application_id]['csp']['hashes'].get('script-src', []) applications[application_id]['csp']['hashes'].get('script-src', [])
+ [ matomo_tracking_code_one_liner ] + [ matomo_tracking_code_one_liner ]
) )