diff --git a/.version b/.version index dedcc7d..5d9ade1 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.9.1 +2.9.2 diff --git a/README.md b/README.md index 2ec9395..9841921 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@



- + diff --git a/backend/package.json b/backend/package.json index b4edda6..2130c7b 100644 --- a/backend/package.json +++ b/backend/package.json @@ -19,7 +19,7 @@ "jsonwebtoken": "^8.5.1", "knex": "^0.20.13", "liquidjs": "^9.11.10", - "lodash": "^4.17.19", + "lodash": "^4.17.21", "moment": "^2.24.0", "mysql": "^2.18.1", "node-rsa": "^1.0.8", diff --git a/backend/templates/proxy_host.conf b/backend/templates/proxy_host.conf index e547968..538b85e 100644 --- a/backend/templates/proxy_host.conf +++ b/backend/templates/proxy_host.conf @@ -53,6 +53,12 @@ proxy_http_version 1.1; {% include "_hsts.conf" %} + {% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %} + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $http_connection; + proxy_http_version 1.1; + {% endif %} + # Proxy! include conf.d/include/proxy.conf; } diff --git a/backend/yarn.lock b/backend/yarn.lock index 84d7223..84180c2 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -2024,10 +2024,10 @@ lodash.once@^4.0.0: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= -lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== +lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" diff --git a/docs/yarn.lock b/docs/yarn.lock index 857e41d..eeff7b2 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -5993,9 +5993,9 @@ lodash.uniq@^4.5.0: integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.3, lodash@^4.17.5: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== loglevel@^1.6.8: version "1.6.8" @@ -9632,9 +9632,9 @@ url-parse-lax@^3.0.0: prepend-http "^2.0.0" url-parse@^1.4.3, url-parse@^1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" - integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg== + version "1.5.0" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.0.tgz#90aba6c902aeb2d80eac17b91131c27665d5d828" + integrity sha512-9iT6N4s93SMfzunOyDPe4vo4nLcSu1yq0IQK1gURmjm8tQNlM6loiuCRrKG1hHGXfB2EWd6H4cGi7tGdaygMFw== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" diff --git a/frontend/yarn.lock b/frontend/yarn.lock index b14a492..bea9e87 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -3541,9 +3541,9 @@ homedir-polyfill@^1.0.1: parse-passwd "^1.0.0" hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== html-minifier-terser@^5.0.1: version "5.1.1" @@ -4278,9 +4278,9 @@ lodash.some@^4.6.0: integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= lodash@^4.0.0, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@~4.17.10: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== longest@^1.0.1: version "1.0.1" diff --git a/global/certbot-dns-plugins.js b/global/certbot-dns-plugins.js index 0c4e3b3..85592b3 100644 --- a/global/certbot-dns-plugins.js +++ b/global/certbot-dns-plugins.js @@ -20,6 +20,16 @@ */ module.exports = { + //####################################################// + acmedns: { + display_name: 'ACME-DNS', + package_name: 'certbot-dns-acmedns', + package_version: '0.1.0', + dependencies: '', + credentials: `certbot_dns_acmedns:dns_acmedns_api_url = http://acmedns-server/ +certbot_dns_acmedns:dns_acmedns_registration_file = /data/acme-registration.json`, + full_plugin_name: 'certbot-dns-acmedns:dns-acmedns', + }, aliyun: { display_name: 'Aliyun', package_name: 'certbot-dns-aliyun', @@ -30,6 +40,32 @@ certbot_dns_aliyun:dns_aliyun_access_key_secret = 1234567890abcdef1234567890abcd full_plugin_name: 'certbot-dns-aliyun:dns-aliyun', }, //####################################################// + azure: { + display_name: 'Azure', + package_name: 'certbot-dns-azure', + package_version: '1.1.0', + dependencies: '', + credentials: `# This plugin supported API authentication using either Service Principals or utilizing a Managed Identity assigned to the virtual machine. +# Regardless which authentication method used, the identity will need the “DNS Zone Contributor” role assigned to it. +# As multiple Azure DNS Zones in multiple resource groups can exist, the config file needs a mapping of zone to resource group ID. Multiple zones -> ID mappings can be listed by using the key dns_azure_zoneX where X is a unique number. At least 1 zone mapping is required. + +# Using a service principal (option 1) +dns_azure_sp_client_id = 912ce44a-0156-4669-ae22-c16a17d34ca5 +dns_azure_sp_client_secret = E-xqXU83Y-jzTI6xe9fs2YC~mck3ZzUih9 +dns_azure_tenant_id = ed1090f3-ab18-4b12-816c-599af8a88cf7 + +# Using used assigned MSI (option 2) +# dns_azure_msi_client_id = 912ce44a-0156-4669-ae22-c16a17d34ca5 + +# Using system assigned MSI (option 3) +# dns_azure_msi_system_assigned = true + +# Zones (at least one always required) +dns_azure_zone1 = example.com:/subscriptions/c135abce-d87d-48df-936c-15596c6968a5/resourceGroups/dns1 +dns_azure_zone2 = example.org:/subscriptions/99800903-fb14-4992-9aff-12eaf2744622/resourceGroups/dns2`, + full_plugin_name: 'dns-azure', + }, + //####################################################// cloudflare: { display_name: 'Cloudflare', package_name: 'certbot-dns-cloudflare', @@ -40,6 +76,22 @@ dns_cloudflare_api_token = 0123456789abcdef0123456789abcdef01234567`, full_plugin_name: 'dns-cloudflare', }, //####################################################// + cloudns: { + display_name: 'ClouDNS', + package_name: 'certbot-dns-cloudns', + package_version: '0.4.0', + dependencies: '', + credentials: `# Target user ID (see https://www.cloudns.net/api-settings/) + dns_cloudns_auth_id=1234 + # Alternatively, one of the following two options can be set: + # dns_cloudns_sub_auth_id=1234 + # dns_cloudns_sub_auth_user=foobar + + # API password + dns_cloudns_auth_password=password1`, + full_plugin_name: 'dns-cloudns', + }, + //####################################################// cloudxns: { display_name: 'CloudXNS', package_name: 'certbot-dns-cloudxns', @@ -71,6 +123,15 @@ certbot_dns_cpanel:cpanel_password = hunter2`, full_plugin_name: 'certbot-dns-cpanel:cpanel', }, //####################################################// + duckdns: { + display_name: 'DuckDNS', + package_name: 'certbot-dns-duckdns', + package_version: '0.5', + dependencies: '', + credentials: 'dns_duckdns_token=', + full_plugin_name: 'dns-duckdns', + }, + //####################################################// digitalocean: { display_name: 'DigitalOcean', package_name: 'certbot-dns-digitalocean', @@ -120,6 +181,17 @@ certbot_dns_dnspod:dns_dnspod_api_token = "DNSPOD-API-TOKEN"`, full_plugin_name: 'certbot-dns-dnspod:dns-dnspod', }, //####################################################// + eurodns: { + display_name: 'EuroDNS', + package_name: 'certbot-dns-eurodns', + package_version: '0.0.4', + dependencies: '', + credentials: `dns_eurodns_applicationId = myuser +dns_eurodns_apiKey = mysecretpassword +dns_eurodns_endpoint = https://rest-api.eurodns.com/user-api-gateway/proxy`, + full_plugin_name: 'certbot-dns-eurodns:dns-eurodns', + }, + //####################################################// gandi: { display_name: 'Gandi Live DNS', package_name: 'certbot_plugin_gandi', @@ -254,6 +326,16 @@ certbot_dns_powerdns:dns_powerdns_api_key = AbCbASsd!@34`, full_plugin_name: 'certbot-dns-powerdns:dns-powerdns', }, //####################################################// + regru: { + display_name: 'reg.ru', + package_name: 'certbot-regru', + package_version: '1.0.2', + dependencies: '', + credentials: `certbot_regru:dns_username=username +certbot_regru:dns_password=password`, + full_plugin_name: 'certbot-regru:dns', + }, + //####################################################// rfc2136: { display_name: 'RFC 2136', package_name: 'certbot-dns-rfc2136', @@ -283,26 +365,6 @@ aws_secret_access_key=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY`, full_plugin_name: 'dns-route53', }, //####################################################// - vultr: { - display_name: 'Vultr', - package_name: 'certbot-dns-vultr', - package_version: '1.0.3', - dependencies: '', - credentials: 'certbot_dns_vultr:dns_vultr_key = YOUR_VULTR_API_KEY', - full_plugin_name: 'certbot-dns-vultr:dns-vultr', - }, - //####################################################// - eurodns: { - display_name: 'EuroDNS', - package_name: 'certbot-dns-eurodns', - package_version: '0.0.4', - dependencies: '', - credentials: `dns_eurodns_applicationId = myuser -dns_eurodns_apiKey = mysecretpassword -dns_eurodns_endpoint = https://rest-api.eurodns.com/user-api-gateway/proxy`, - full_plugin_name: 'certbot-dns-eurodns:dns-eurodns', - }, - //####################################################// transip: { display_name: 'TransIP', package_name: 'certbot-dns-transip', @@ -313,22 +375,12 @@ certbot_dns_transip:dns_transip_key_file = /etc/letsencrypt/transip-rsa.key`, full_plugin_name: 'certbot-dns-transip:dns-transip', }, //####################################################// - acmedns: { - display_name: 'ACME-DNS', - package_name: 'certbot-dns-acmedns', - package_version: '0.1.0', - dependencies: '', - credentials: `certbot_dns_acmedns:dns_acmedns_api_url = http://acmedns-server/ -certbot_dns_acmedns:dns_acmedns_registration_file = /data/acme-registration.json`, - full_plugin_name: 'certbot-dns-acmedns:dns-acmedns', - }, - //####################################################// - duckdns: { - display_name: 'DuckDNS', - package_name: 'certbot-dns-duckdns', - package_version: '0.5', + vultr: { + display_name: 'Vultr', + package_name: 'certbot-dns-vultr', + package_version: '1.0.3', dependencies: '', - credentials: '', - full_plugin_name: 'certbot-dns-duckdns:dns-duckdns', + credentials: 'certbot_dns_vultr:dns_vultr_key = YOUR_VULTR_API_KEY', + full_plugin_name: 'certbot-dns-vultr:dns-vultr', }, }; diff --git a/test/yarn.lock b/test/yarn.lock index 9250783..bee66c8 100644 --- a/test/yarn.lock +++ b/test/yarn.lock @@ -1670,15 +1670,10 @@ lodash.once@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= -lodash@^4.17.14, lodash@^4.17.15: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== - -lodash@^4.17.19: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== +lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== log-symbols@3.0.0: version "3.0.0"