Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 28f7208

Browse files
jc21jc21
authoredSep 3, 2020
Merge pull request #592 from jc21/develop
v2.5.0
2 parents 74bfe49 + a6b9bd7 commit 28f7208

File tree

21 files changed

+380
-103
lines changed

21 files changed

+380
-103
lines changed
 

‎.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0
1+
2.5.0

‎README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<p align="center">
22
<img src="https://nginxproxymanager.com/github.png">
33
<br><br>
4-
<img src="https://img.shields.io/badge/version-2.4.0-green.svg?style=for-the-badge">
4+
<img src="https://img.shields.io/badge/version-2.5.0-green.svg?style=for-the-badge">
55
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
66
<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
77
</a>
@@ -173,6 +173,18 @@ Special thanks to the following contributors:
173173
<br /><sub><b>vrenjith</b></sub>
174174
</a>
175175
</td>
176+
<td align="center">
177+
<a href="https://github.com/duhruh">
178+
<img src="https://avatars2.githubusercontent.com/u/1133969?s=460&u=c0691e6131ec6d516416c1c6fcedb5034f877bbe&v=4" width="80px;" alt=""/>
179+
<br /><sub><b>David Rivera</b></sub>
180+
</a>
181+
</td>
182+
<td align="center">
183+
<a href="https://github.com/jipjan">
184+
<img src="https://avatars2.githubusercontent.com/u/1384618?s=460&v=4" width="80px;" alt=""/>
185+
<br /><sub><b>Jaap-Jan de Wit</b></sub>
186+
</a>
187+
</td>
176188
</tr>
177189
</table>
178190
<!-- markdownlint-enable -->

‎backend/internal/certificate.js

Lines changed: 115 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const internalCertificate = {
7777
.where('id', certificate.id)
7878
.andWhere('provider', 'letsencrypt')
7979
.patch({
80-
expires_on: certificateModel.raw('FROM_UNIXTIME(' + cert_info.dates.to + ')')
80+
expires_on: moment(cert_info.dates.to, 'X').format('YYYY-MM-DD HH:mm:ss')
8181
});
8282
})
8383
.catch((err) => {
@@ -141,36 +141,60 @@ const internalCertificate = {
141141
});
142142
})
143143
.then((in_use_result) => {
144-
// 3. Generate the LE config
145-
return internalNginx.generateLetsEncryptRequestConfig(certificate)
146-
.then(internalNginx.reload)
147-
.then(() => {
144+
// Is CloudFlare, no config needed, so skip 3 and 5.
145+
if (data.meta.cloudflare_use) {
146+
return internalNginx.reload().then(() => {
148147
// 4. Request cert
149-
return internalCertificate.requestLetsEncryptSsl(certificate);
150-
})
151-
.then(() => {
152-
// 5. Remove LE config
153-
return internalNginx.deleteLetsEncryptRequestConfig(certificate);
154-
})
155-
.then(internalNginx.reload)
156-
.then(() => {
157-
// 6. Re-instate previously disabled hosts
158-
return internalCertificate.enableInUseHosts(in_use_result);
159-
})
160-
.then(() => {
161-
return certificate;
148+
return internalCertificate.requestLetsEncryptCloudFlareDnsSsl(certificate, data.meta.cloudflare_token);
162149
})
163-
.catch((err) => {
164-
// In the event of failure, revert things and throw err back
165-
return internalNginx.deleteLetsEncryptRequestConfig(certificate)
166-
.then(() => {
167-
return internalCertificate.enableInUseHosts(in_use_result);
168-
})
169-
.then(internalNginx.reload)
170-
.then(() => {
171-
throw err;
172-
});
173-
});
150+
.then(internalNginx.reload)
151+
.then(() => {
152+
// 6. Re-instate previously disabled hosts
153+
return internalCertificate.enableInUseHosts(in_use_result);
154+
})
155+
.then(() => {
156+
return certificate;
157+
})
158+
.catch((err) => {
159+
// In the event of failure, revert things and throw err back
160+
return internalCertificate.enableInUseHosts(in_use_result)
161+
.then(internalNginx.reload)
162+
.then(() => {
163+
throw err;
164+
});
165+
});
166+
} else {
167+
// 3. Generate the LE config
168+
return internalNginx.generateLetsEncryptRequestConfig(certificate)
169+
.then(internalNginx.reload)
170+
.then(() => {
171+
// 4. Request cert
172+
return internalCertificate.requestLetsEncryptSsl(certificate);
173+
})
174+
.then(() => {
175+
// 5. Remove LE config
176+
return internalNginx.deleteLetsEncryptRequestConfig(certificate);
177+
})
178+
.then(internalNginx.reload)
179+
.then(() => {
180+
// 6. Re-instate previously disabled hosts
181+
return internalCertificate.enableInUseHosts(in_use_result);
182+
})
183+
.then(() => {
184+
return certificate;
185+
})
186+
.catch((err) => {
187+
// In the event of failure, revert things and throw err back
188+
return internalNginx.deleteLetsEncryptRequestConfig(certificate)
189+
.then(() => {
190+
return internalCertificate.enableInUseHosts(in_use_result);
191+
})
192+
.then(internalNginx.reload)
193+
.then(() => {
194+
throw err;
195+
});
196+
});
197+
}
174198
})
175199
.then(() => {
176200
// At this point, the letsencrypt cert should exist on disk.
@@ -180,7 +204,7 @@ const internalCertificate = {
180204
return certificateModel
181205
.query()
182206
.patchAndFetchById(certificate.id, {
183-
expires_on: certificateModel.raw('FROM_UNIXTIME(' + cert_info.dates.to + ')')
207+
expires_on: moment(cert_info.dates.to, 'X').format('YYYY-MM-DD HH:mm:ss')
184208
})
185209
.then((saved_row) => {
186210
// Add cert data for audit log
@@ -558,7 +582,7 @@ const internalCertificate = {
558582
// TODO: This uses a mysql only raw function that won't translate to postgres
559583
return internalCertificate.update(access, {
560584
id: data.id,
561-
expires_on: certificateModel.raw('FROM_UNIXTIME(' + validations.certificate.dates.to + ')'),
585+
expires_on: moment(validations.certificate.dates.to, 'X').format('YYYY-MM-DD HH:mm:ss'),
562586
domain_names: [validations.certificate.cn],
563587
meta: _.clone(row.meta) // Prevent the update method from changing this value that we'll use later
564588
})
@@ -733,7 +757,6 @@ const internalCertificate = {
733757
'--agree-tos ' +
734758
'--email "' + certificate.meta.letsencrypt_email + '" ' +
735759
'--preferred-challenges "dns,http" ' +
736-
'--webroot ' +
737760
'--domains "' + certificate.domain_names.join(',') + '" ' +
738761
(le_staging ? '--staging' : '');
739762

@@ -748,6 +771,39 @@ const internalCertificate = {
748771
});
749772
},
750773

774+
/**
775+
* @param {Object} certificate the certificate row
776+
* @param {String} apiToken the cloudflare api token
777+
* @returns {Promise}
778+
*/
779+
requestLetsEncryptCloudFlareDnsSsl: (certificate, apiToken) => {
780+
logger.info('Requesting Let\'sEncrypt certificates via Cloudflare DNS for Cert #' + certificate.id + ': ' + certificate.domain_names.join(', '));
781+
782+
let tokenLoc = '~/cloudflare-token';
783+
let storeKey = 'echo "dns_cloudflare_api_token = ' + apiToken + '" > ' + tokenLoc;
784+
785+
let cmd =
786+
storeKey + ' && ' +
787+
certbot_command + ' certonly --non-interactive ' +
788+
'--cert-name "npm-' + certificate.id + '" ' +
789+
'--agree-tos ' +
790+
'--email "' + certificate.meta.letsencrypt_email + '" ' +
791+
'--domains "' + certificate.domain_names.join(',') + '" ' +
792+
'--dns-cloudflare --dns-cloudflare-credentials ' + tokenLoc +
793+
(le_staging ? ' --staging' : '')
794+
+ ' && rm ' + tokenLoc;
795+
796+
if (debug_mode) {
797+
logger.info('Command:', cmd);
798+
}
799+
800+
return utils.exec(cmd).then((result) => {
801+
logger.info(result);
802+
return result;
803+
});
804+
},
805+
806+
751807
/**
752808
* @param {Access} access
753809
* @param {Object} data
@@ -761,15 +817,17 @@ const internalCertificate = {
761817
})
762818
.then((certificate) => {
763819
if (certificate.provider === 'letsencrypt') {
764-
return internalCertificate.renewLetsEncryptSsl(certificate)
820+
let renewMethod = certificate.meta.cloudflare_use ? internalCertificate.renewLetsEncryptCloudFlareSsl : internalCertificate.renewLetsEncryptSsl;
821+
822+
return renewMethod(certificate)
765823
.then(() => {
766824
return internalCertificate.getCertificateInfoFromFile('/etc/letsencrypt/live/npm-' + certificate.id + '/fullchain.pem');
767825
})
768826
.then((cert_info) => {
769827
return certificateModel
770828
.query()
771829
.patchAndFetchById(certificate.id, {
772-
expires_on: certificateModel.raw('FROM_UNIXTIME(' + cert_info.dates.to + ')')
830+
expires_on: moment(cert_info.dates.to, 'X').format('YYYY-MM-DD HH:mm:ss')
773831
});
774832
})
775833
.then((updated_certificate) => {
@@ -815,6 +873,29 @@ const internalCertificate = {
815873
});
816874
},
817875

876+
/**
877+
* @param {Object} certificate the certificate row
878+
* @returns {Promise}
879+
*/
880+
renewLetsEncryptCloudFlareSsl: (certificate) => {
881+
logger.info('Renewing Let\'sEncrypt certificates for Cert #' + certificate.id + ': ' + certificate.domain_names.join(', '));
882+
883+
let cmd = certbot_command + ' renew --non-interactive ' +
884+
'--cert-name "npm-' + certificate.id + '" ' +
885+
'--disable-hook-validation ' +
886+
(le_staging ? '--staging' : '');
887+
888+
if (debug_mode) {
889+
logger.info('Command:', cmd);
890+
}
891+
892+
return utils.exec(cmd)
893+
.then((result) => {
894+
logger.info(result);
895+
return result;
896+
});
897+
},
898+
818899
/**
819900
* @param {Object} certificate the certificate row
820901
* @param {Boolean} [throw_errors]
@@ -824,7 +905,6 @@ const internalCertificate = {
824905
logger.info('Revoking Let\'sEncrypt certificates for Cert #' + certificate.id + ': ' + certificate.domain_names.join(', '));
825906

826907
let cmd = certbot_command + ' revoke --non-interactive ' +
827-
'--config "' + le_config + '" ' +
828908
'--cert-path "/etc/letsencrypt/live/npm-' + certificate.id + '/fullchain.pem" ' +
829909
'--delete-after-revoke ' +
830910
(le_staging ? '--staging' : '');

‎backend/models/now_helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Model.knex(db);
66

77
module.exports = function () {
88
if (config.database.knex && config.database.knex.client === 'sqlite3') {
9-
return Model.raw('date(\'now\')');
9+
return Model.raw('datetime(\'now\',\'localtime\')');
1010
} else {
1111
return Model.raw('NOW()');
1212
}

‎backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"ajv": "^6.12.0",
88
"batchflow": "^0.4.0",
9-
"bcrypt": "^4.0.1",
9+
"bcrypt": "^5.0.0",
1010
"body-parser": "^1.19.0",
1111
"compression": "^1.7.4",
1212
"config": "^3.3.1",

‎backend/schema/endpoints/certificates.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@
4141
},
4242
"letsencrypt_agree": {
4343
"type": "boolean"
44+
},
45+
"cloudflare_use": {
46+
"type": "boolean"
47+
},
48+
"cloudflare_token": {
49+
"type": "string"
4450
}
4551
}
4652
}

‎backend/yarn.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,13 @@ batchflow@^0.4.0:
249249
resolved "https://registry.yarnpkg.com/batchflow/-/batchflow-0.4.0.tgz#7d419df79b6b7587b06f9ea34f96ccef6f74e5b5"
250250
integrity sha1-fUGd95trdYewb56jT5bM72905bU=
251251

252-
bcrypt@^4.0.1:
253-
version "4.0.1"
254-
resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-4.0.1.tgz#06e21e749a061020e4ff1283c1faa93187ac57fe"
255-
integrity sha512-hSIZHkUxIDS5zA2o00Kf2O5RfVbQ888n54xQoF/eIaquU4uaLxK8vhhBdktd0B3n2MjkcAWzv4mnhogykBKOUQ==
252+
bcrypt@^5.0.0:
253+
version "5.0.0"
254+
resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-5.0.0.tgz#051407c7cd5ffbfb773d541ca3760ea0754e37e2"
255+
integrity sha512-jB0yCBl4W/kVHM2whjfyqnxTmOHkCX4kHEa5nYKSoGeYe8YrjTYTc87/6bwt1g8cmV0QrbhKriETg9jWtcREhg==
256256
dependencies:
257-
node-addon-api "^2.0.0"
258-
node-pre-gyp "0.14.0"
257+
node-addon-api "^3.0.0"
258+
node-pre-gyp "0.15.0"
259259

260260
bignumber.js@9.0.0:
261261
version "9.0.0"
@@ -2166,7 +2166,7 @@ mixin-deep@^1.2.0:
21662166
for-in "^1.0.2"
21672167
is-extendable "^1.0.1"
21682168

2169-
mkdirp@^0.5.0, mkdirp@^0.5.1:
2169+
mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3:
21702170
version "0.5.5"
21712171
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
21722172
integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -2235,7 +2235,7 @@ natural-compare@^1.4.0:
22352235
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
22362236
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
22372237

2238-
needle@^2.2.1:
2238+
needle@^2.2.1, needle@^2.5.0:
22392239
version "2.5.0"
22402240
resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz#e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0"
22412241
integrity sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==
@@ -2254,19 +2254,19 @@ nice-try@^1.0.4:
22542254
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
22552255
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
22562256

2257-
node-addon-api@^2.0.0:
2258-
version "2.0.2"
2259-
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32"
2260-
integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==
2257+
node-addon-api@^3.0.0:
2258+
version "3.0.0"
2259+
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.0.0.tgz#812446a1001a54f71663bed188314bba07e09247"
2260+
integrity sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==
22612261

2262-
node-pre-gyp@0.14.0:
2263-
version "0.14.0"
2264-
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
2265-
integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
2262+
node-pre-gyp@0.15.0:
2263+
version "0.15.0"
2264+
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz#c2fc383276b74c7ffa842925241553e8b40f1087"
2265+
integrity sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==
22662266
dependencies:
22672267
detect-libc "^1.0.2"
2268-
mkdirp "^0.5.1"
2269-
needle "^2.2.1"
2268+
mkdirp "^0.5.3"
2269+
needle "^2.5.0"
22702270
nopt "^4.0.1"
22712271
npm-packlist "^1.1.6"
22722272
npmlog "^4.0.2"

‎docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ ENV NODE_ENV=production
1717

1818
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \
1919
&& apk update \
20-
&& apk add python2 certbot jq \
20+
&& apk add python2 py-pip certbot jq \
21+
&& pip install certbot-dns-cloudflare \
2122
&& rm -rf /var/cache/apk/*
2223

2324
ENV NPM_BUILD_VERSION="${BUILD_VERSION}" NPM_BUILD_COMMIT="${BUILD_COMMIT}" NPM_BUILD_DATE="${BUILD_DATE}"

‎docker/dev/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ ENV S6_FIX_ATTRS_HIDDEN=1
77

88
RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \
99
&& apk update \
10-
&& apk add python2 certbot jq \
10+
&& apk add python2 py-pip certbot jq \
11+
&& pip install certbot-dns-cloudflare \
1112
&& rm -rf /var/cache/apk/*
1213

1314
# Task

‎docker/rootfs/etc/nginx/nginx.conf

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ http {
2727
tcp_nodelay on;
2828
client_body_temp_path /tmp/nginx/body 1 2;
2929
keepalive_timeout 90s;
30-
proxy_connect_timeout 90s;
31-
proxy_send_timeout 90s;
32-
proxy_read_timeout 90s;
30+
proxy_connect_timeout 90s;
31+
proxy_send_timeout 90s;
32+
proxy_read_timeout 90s;
3333
ssl_prefer_server_ciphers on;
3434
gzip on;
3535
proxy_ignore_client_abort off;
@@ -60,6 +60,9 @@ http {
6060
# Real IP Determination
6161
# Docker subnet:
6262
set_real_ip_from 172.0.0.0/8;
63+
# Local subnets:
64+
set_real_ip_from 10.0.0.0/8;
65+
set_real_ip_from 192.0.0.0/8;
6366
# NPM generated CDN ip ranges:
6467
include conf.d/include/ip_ranges.conf;
6568
# always put the following 2 lines after ip subnets:

‎docs/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7679,9 +7679,9 @@ pretty-time@^1.1.0:
76797679
integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==
76807680

76817681
prismjs@^1.13.0, prismjs@^1.20.0:
7682-
version "1.20.0"
7683-
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.20.0.tgz#9b685fc480a3514ee7198eac6a3bf5024319ff03"
7684-
integrity sha512-AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ==
7682+
version "1.21.0"
7683+
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.21.0.tgz#36c086ec36b45319ec4218ee164c110f9fc015a3"
7684+
integrity sha512-uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw==
76857685
optionalDependencies:
76867686
clipboard "^2.0.0"
76877687

‎frontend/js/app/nginx/certificates/form.ejs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,24 @@
2020
<input name="meta[letsencrypt_email]" type="email" class="form-control" placeholder="" value="<%- getLetsencryptEmail() %>" required>
2121
</div>
2222
</div>
23+
24+
<!-- CloudFlare -->
25+
<div class="col-sm-12 col-md-12">
26+
<div class="form-group">
27+
<label class="custom-switch">
28+
<input type="checkbox" class="custom-switch-input" name="meta[cloudflare_use]" value="1">
29+
<span class="custom-switch-indicator"></span>
30+
<span class="custom-switch-description"><%= i18n('ssl', 'use-cloudflare') %></span>
31+
</label>
32+
</div>
33+
</div>
34+
<div class="col-sm-12 col-md-12 cloudflare">
35+
<div class="form-group">
36+
<label class="form-label">CloudFlare DNS API Token <span class="form-required">*</span></label>
37+
<input type="text" name="meta[cloudflare_token]" class="form-control" id="cloudflare_token">
38+
</div>
39+
</div>
40+
2341
<div class="col-sm-12 col-md-12">
2442
<div class="form-group">
2543
<label class="custom-switch">

‎frontend/js/app/nginx/certificates/form.js

Lines changed: 51 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,69 @@ module.exports = Mn.View.extend({
1313
max_file_size: 102400,
1414

1515
ui: {
16-
form: 'form',
17-
domain_names: 'input[name="domain_names"]',
18-
buttons: '.modal-footer button',
19-
cancel: 'button.cancel',
20-
save: 'button.save',
21-
other_certificate: '#other_certificate',
22-
other_certificate_label: '#other_certificate_label',
23-
other_certificate_key: '#other_certificate_key',
24-
other_certificate_key_label: '#other_certificate_key_label',
25-
other_intermediate_certificate: '#other_intermediate_certificate',
16+
form: 'form',
17+
domain_names: 'input[name="domain_names"]',
18+
buttons: '.modal-footer button',
19+
cancel: 'button.cancel',
20+
save: 'button.save',
21+
other_certificate: '#other_certificate',
22+
other_certificate_label: '#other_certificate_label',
23+
other_certificate_key: '#other_certificate_key',
24+
cloudflare_switch: 'input[name="meta[cloudflare_use]"]',
25+
cloudflare_token: 'input[name="meta[cloudflare_token]"',
26+
cloudflare: '.cloudflare',
27+
other_certificate_key_label: '#other_certificate_key_label',
28+
other_intermediate_certificate: '#other_intermediate_certificate',
2629
other_intermediate_certificate_label: '#other_intermediate_certificate_label'
2730
},
2831

2932
events: {
33+
'change @ui.cloudflare_switch': function() {
34+
let checked = this.ui.cloudflare_switch.prop('checked');
35+
if (checked) {
36+
this.ui.cloudflare_token.prop('required', 'required');
37+
this.ui.cloudflare.show();
38+
} else {
39+
this.ui.cloudflare_token.prop('required', false);
40+
this.ui.cloudflare.hide();
41+
}
42+
},
3043
'click @ui.save': function (e) {
3144
e.preventDefault();
3245

3346
if (!this.ui.form[0].checkValidity()) {
3447
$('<input type="submit">').hide().appendTo(this.ui.form).click().remove();
48+
$(this).removeClass('btn-loading');
3549
return;
3650
}
3751

3852
let view = this;
3953
let data = this.ui.form.serializeJSON();
4054
data.provider = this.model.get('provider');
4155

56+
57+
58+
let domain_err = false;
59+
if (!data.meta.cloudflare_use) {
60+
data.domain_names.split(',').map(function (name) {
61+
if (name.match(/\*/im)) {
62+
domain_err = true;
63+
}
64+
});
65+
}
66+
67+
if (domain_err) {
68+
alert('Cannot request Let\'s Encrypt Certificate for wildcard domains when not using CloudFlare DNS');
69+
return;
70+
}
71+
4272
// Manipulate
4373
if (typeof data.meta !== 'undefined' && typeof data.meta.letsencrypt_agree !== 'undefined') {
4474
data.meta.letsencrypt_agree = !!data.meta.letsencrypt_agree;
4575
}
76+
if (typeof data.meta !== 'undefined' && typeof data.meta.cloudflare_use !== 'undefined') {
77+
data.meta.cloudflare_use = !!data.meta.cloudflare_use;
78+
}
4679

4780
if (typeof data.domain_names === 'string' && data.domain_names) {
4881
data.domain_names = data.domain_names.split(',');
@@ -84,6 +117,7 @@ module.exports = Mn.View.extend({
84117
}
85118

86119
this.ui.buttons.prop('disabled', true).addClass('btn-disabled');
120+
this.ui.save.addClass('btn-loading');
87121

88122
// compile file data
89123
let form_data = new FormData();
@@ -122,6 +156,7 @@ module.exports = Mn.View.extend({
122156
.catch(err => {
123157
alert(err.message);
124158
this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
159+
this.ui.save.removeClass('btn-loading');
125160
});
126161
},
127162
'change @ui.other_certificate_key': function(e){
@@ -144,6 +179,10 @@ module.exports = Mn.View.extend({
144179

145180
getLetsencryptAgree: function () {
146181
return typeof this.meta.letsencrypt_agree !== 'undefined' ? this.meta.letsencrypt_agree : false;
182+
},
183+
184+
getCloudflareUse: function () {
185+
return typeof this.meta.cloudflare_use !== 'undefined' ? this.meta.cloudflare_use : false;
147186
}
148187
},
149188

@@ -158,8 +197,9 @@ module.exports = Mn.View.extend({
158197
text: input
159198
};
160199
},
161-
createFilter: /^(?:[^.*]+\.?)+[^.]$/
200+
createFilter: /^(?:[^.]+\.?)+[^.]$/
162201
});
202+
this.ui.cloudflare.hide();
163203
},
164204

165205
initialize: function (options) {

‎frontend/js/app/nginx/certificates/list/item.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</div>
2929
</td>
3030
<td>
31-
<%- i18n('ssl', provider) %>
31+
<%- i18n('ssl', provider) %><% if (meta.cloudflare_use) { %> - CloudFlare DNS<% } %>
3232
</td>
3333
<td class="<%- isExpired() ? 'text-danger' : '' %>">
3434
<%- formatDbDate(expires_on, 'Do MMMM YYYY, h:mm a') %>

‎frontend/js/app/nginx/dead/form.ejs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,23 @@
7373
</div>
7474
</div>
7575

76+
<!-- CloudFlare -->
77+
<div class="col-sm-12 col-md-12 letsencrypt">
78+
<div class="form-group">
79+
<label class="custom-switch">
80+
<input type="checkbox" class="custom-switch-input" name="meta[cloudflare_use]" value="1">
81+
<span class="custom-switch-indicator"></span>
82+
<span class="custom-switch-description"><%= i18n('ssl', 'use-cloudflare') %></span>
83+
</label>
84+
</div>
85+
</div>
86+
<div class="col-sm-12 col-md-12 cloudflare letsencrypt">
87+
<div class="form-group">
88+
<label class="form-label">CloudFlare DNS API Token <span class="form-required">*</span></label>
89+
<input type="text" name="meta[cloudflare_token]" class="form-control" id="cloudflare_token">
90+
</div>
91+
</div>
92+
7693
<!-- Lets encrypt -->
7794
<div class="col-sm-12 col-md-12 letsencrypt">
7895
<div class="form-group">

‎frontend/js/app/nginx/dead/form.js

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ module.exports = Mn.View.extend({
2323
hsts_enabled: 'input[name="hsts_enabled"]',
2424
hsts_subdomains: 'input[name="hsts_subdomains"]',
2525
http2_support: 'input[name="http2_support"]',
26+
cloudflare_switch: 'input[name="meta[cloudflare_use]"]',
27+
cloudflare_token: 'input[name="meta[cloudflare_token]"',
28+
cloudflare: '.cloudflare',
2629
letsencrypt: '.letsencrypt'
2730
},
2831

@@ -31,10 +34,12 @@ module.exports = Mn.View.extend({
3134
let id = this.ui.certificate_select.val();
3235
if (id === 'new') {
3336
this.ui.letsencrypt.show().find('input').prop('disabled', false);
37+
this.ui.cloudflare.hide();
3438
} else {
3539
this.ui.letsencrypt.hide().find('input').prop('disabled', true);
3640
}
3741

42+
3843
let enabled = id === 'new' || parseInt(id, 10) > 0;
3944

4045
let inputs = this.ui.ssl_forced.add(this.ui.http2_support);
@@ -76,6 +81,17 @@ module.exports = Mn.View.extend({
7681
}
7782
},
7883

84+
'change @ui.cloudflare_switch': function() {
85+
let checked = this.ui.cloudflare_switch.prop('checked');
86+
if (checked) {
87+
this.ui.cloudflare_token.prop('required', 'required');
88+
this.ui.cloudflare.show();
89+
} else {
90+
this.ui.cloudflare_token.prop('required', false);
91+
this.ui.cloudflare.hide();
92+
}
93+
},
94+
7995
'click @ui.save': function (e) {
8096
e.preventDefault();
8197

@@ -98,20 +114,23 @@ module.exports = Mn.View.extend({
98114
}
99115

100116
// Check for any domain names containing wildcards, which are not allowed with letsencrypt
101-
if (data.certificate_id === 'new') {
117+
if (data.certificate_id === 'new') {
102118
let domain_err = false;
103-
data.domain_names.map(function (name) {
104-
if (name.match(/\*/im)) {
105-
domain_err = true;
106-
}
107-
});
119+
if (!data.meta.cloudflare_use) {
120+
data.domain_names.map(function (name) {
121+
if (name.match(/\*/im)) {
122+
domain_err = true;
123+
}
124+
});
125+
}
108126

109127
if (domain_err) {
110-
alert('Cannot request Let\'s Encrypt Certificate for wildcard domains');
128+
alert('Cannot request Let\'s Encrypt Certificate for wildcard domains without CloudFlare DNS.');
111129
return;
112130
}
113131

114-
data.meta.letsencrypt_agree = data.meta.letsencrypt_agree === '1';
132+
data.meta.cloudflare_use = data.meta.cloudflare_use === '1';
133+
data.meta.letsencrypt_agree = data.meta.letsencrypt_agree === '1';
115134
} else {
116135
data.certificate_id = parseInt(data.certificate_id, 10);
117136
}
@@ -127,6 +146,8 @@ module.exports = Mn.View.extend({
127146
}
128147

129148
this.ui.buttons.prop('disabled', true).addClass('btn-disabled');
149+
this.ui.save.addClass('btn-loading');
150+
130151
method(data)
131152
.then(result => {
132153
view.model.set(result);
@@ -140,6 +161,7 @@ module.exports = Mn.View.extend({
140161
.catch(err => {
141162
alert(err.message);
142163
this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
164+
this.ui.save.removeClass('btn-loading');
143165
});
144166
}
145167
},

‎frontend/js/app/nginx/proxy/form.ejs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,23 @@
141141
</div>
142142
</div>
143143

144+
<!-- CloudFlare -->
145+
<div class="col-sm-12 col-md-12 letsencrypt">
146+
<div class="form-group">
147+
<label class="custom-switch">
148+
<input type="checkbox" class="custom-switch-input" name="meta[cloudflare_use]" value="1">
149+
<span class="custom-switch-indicator"></span>
150+
<span class="custom-switch-description"><%= i18n('ssl', 'use-cloudflare') %></span>
151+
</label>
152+
</div>
153+
</div>
154+
<div class="col-sm-12 col-md-12 cloudflare letsencrypt">
155+
<div class="form-group">
156+
<label class="form-label">CloudFlare DNS API Token <span class="form-required">*</span></label>
157+
<input type="text" name="meta[cloudflare_token]" class="form-control" id="cloudflare_token">
158+
</div>
159+
</div>
160+
144161
<!-- Lets encrypt -->
145162
<div class="col-sm-12 col-md-12 letsencrypt">
146163
<div class="form-group">

‎frontend/js/app/nginx/proxy/form.js

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ module.exports = Mn.View.extend({
3333
hsts_enabled: 'input[name="hsts_enabled"]',
3434
hsts_subdomains: 'input[name="hsts_subdomains"]',
3535
http2_support: 'input[name="http2_support"]',
36+
cloudflare_switch: 'input[name="meta[cloudflare_use]"]',
37+
cloudflare_token: 'input[name="meta[cloudflare_token]"',
38+
cloudflare: '.cloudflare',
3639
forward_scheme: 'select[name="forward_scheme"]',
3740
letsencrypt: '.letsencrypt'
3841
},
@@ -46,6 +49,7 @@ module.exports = Mn.View.extend({
4649
let id = this.ui.certificate_select.val();
4750
if (id === 'new') {
4851
this.ui.letsencrypt.show().find('input').prop('disabled', false);
52+
this.ui.cloudflare.hide();
4953
} else {
5054
this.ui.letsencrypt.hide().find('input').prop('disabled', true);
5155
}
@@ -91,6 +95,17 @@ module.exports = Mn.View.extend({
9195
}
9296
},
9397

98+
'change @ui.cloudflare_switch': function() {
99+
let checked = this.ui.cloudflare_switch.prop('checked');
100+
if (checked) {
101+
this.ui.cloudflare_token.prop('required', 'required');
102+
this.ui.cloudflare.show();
103+
} else {
104+
this.ui.cloudflare_token.prop('required', false);
105+
this.ui.cloudflare.hide();
106+
}
107+
},
108+
94109
'click @ui.add_location_btn': function (e) {
95110
e.preventDefault();
96111

@@ -134,20 +149,23 @@ module.exports = Mn.View.extend({
134149
}
135150

136151
// Check for any domain names containing wildcards, which are not allowed with letsencrypt
137-
if (data.certificate_id === 'new') {
152+
if (data.certificate_id === 'new') {
138153
let domain_err = false;
139-
data.domain_names.map(function (name) {
140-
if (name.match(/\*/im)) {
141-
domain_err = true;
142-
}
143-
});
154+
if (!data.meta.cloudflare_use) {
155+
data.domain_names.map(function (name) {
156+
if (name.match(/\*/im)) {
157+
domain_err = true;
158+
}
159+
});
160+
}
144161

145162
if (domain_err) {
146-
alert('Cannot request Let\'s Encrypt Certificate for wildcard domains');
163+
alert('Cannot request Let\'s Encrypt Certificate for wildcard domains without CloudFlare DNS.');
147164
return;
148165
}
149166

150-
data.meta.letsencrypt_agree = data.meta.letsencrypt_agree === '1';
167+
data.meta.cloudflare_use = data.meta.cloudflare_use === '1';
168+
data.meta.letsencrypt_agree = data.meta.letsencrypt_agree === '1';
151169
} else {
152170
data.certificate_id = parseInt(data.certificate_id, 10);
153171
}
@@ -163,6 +181,8 @@ module.exports = Mn.View.extend({
163181
}
164182

165183
this.ui.buttons.prop('disabled', true).addClass('btn-disabled');
184+
this.ui.save.addClass('btn-loading');
185+
166186
method(data)
167187
.then(result => {
168188
view.model.set(result);
@@ -176,6 +196,7 @@ module.exports = Mn.View.extend({
176196
.catch(err => {
177197
alert(err.message);
178198
this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
199+
this.ui.save.removeClass('btn-loading');
179200
});
180201
}
181202
},
@@ -203,7 +224,7 @@ module.exports = Mn.View.extend({
203224
text: input
204225
};
205226
},
206-
createFilter: /^(?:\*\.)?(?:[^.*]+\.?)+[^.]$/
227+
createFilter: /^(?:\.)?(?:[^.*]+\.?)+[^.]$/
207228
});
208229

209230
// Access Lists

‎frontend/js/app/nginx/redirection/form.ejs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,23 @@
9797
</div>
9898
</div>
9999

100+
<!-- CloudFlare -->
101+
<div class="col-sm-12 col-md-12 letsencrypt">
102+
<div class="form-group">
103+
<label class="custom-switch">
104+
<input type="checkbox" class="custom-switch-input" name="meta[cloudflare_use]" value="1">
105+
<span class="custom-switch-indicator"></span>
106+
<span class="custom-switch-description"><%= i18n('ssl', 'use-cloudflare') %></span>
107+
</label>
108+
</div>
109+
</div>
110+
<div class="col-sm-12 col-md-12 cloudflare letsencrypt">
111+
<div class="form-group">
112+
<label class="form-label">CloudFlare DNS API Token <span class="form-required">*</span></label>
113+
<input type="text" name="meta[cloudflare_token]" class="form-control" id="cloudflare_token">
114+
</div>
115+
</div>
116+
100117
<!-- Lets encrypt -->
101118
<div class="col-sm-12 col-md-12 letsencrypt">
102119
<div class="form-group">

‎frontend/js/app/nginx/redirection/form.js

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ module.exports = Mn.View.extend({
2323
hsts_enabled: 'input[name="hsts_enabled"]',
2424
hsts_subdomains: 'input[name="hsts_subdomains"]',
2525
http2_support: 'input[name="http2_support"]',
26+
cloudflare_switch: 'input[name="meta[cloudflare_use]"]',
27+
cloudflare_token: 'input[name="meta[cloudflare_token]"',
28+
cloudflare: '.cloudflare',
2629
letsencrypt: '.letsencrypt'
2730
},
2831

@@ -31,6 +34,7 @@ module.exports = Mn.View.extend({
3134
let id = this.ui.certificate_select.val();
3235
if (id === 'new') {
3336
this.ui.letsencrypt.show().find('input').prop('disabled', false);
37+
this.ui.cloudflare.hide();
3438
} else {
3539
this.ui.letsencrypt.hide().find('input').prop('disabled', true);
3640
}
@@ -76,6 +80,17 @@ module.exports = Mn.View.extend({
7680
}
7781
},
7882

83+
'change @ui.cloudflare_switch': function() {
84+
let checked = this.ui.cloudflare_switch.prop('checked');
85+
if (checked) {
86+
this.ui.cloudflare_token.prop('required', 'required');
87+
this.ui.cloudflare.show();
88+
} else {
89+
this.ui.cloudflare_token.prop('required', false);
90+
this.ui.cloudflare.hide();
91+
}
92+
},
93+
7994
'click @ui.save': function (e) {
8095
e.preventDefault();
8196

@@ -100,20 +115,23 @@ module.exports = Mn.View.extend({
100115
}
101116

102117
// Check for any domain names containing wildcards, which are not allowed with letsencrypt
103-
if (data.certificate_id === 'new') {
118+
if (data.certificate_id === 'new') {
104119
let domain_err = false;
105-
data.domain_names.map(function (name) {
106-
if (name.match(/\*/im)) {
107-
domain_err = true;
108-
}
109-
});
120+
if (!data.meta.cloudflare_use) {
121+
data.domain_names.map(function (name) {
122+
if (name.match(/\*/im)) {
123+
domain_err = true;
124+
}
125+
});
126+
}
110127

111128
if (domain_err) {
112-
alert('Cannot request Let\'s Encrypt Certificate for wildcard domains');
129+
alert('Cannot request Let\'s Encrypt Certificate for wildcard domains without CloudFlare DNS.');
113130
return;
114131
}
115132

116-
data.meta.letsencrypt_agree = data.meta.letsencrypt_agree === '1';
133+
data.meta.cloudflare_use = data.meta.cloudflare_use === '1';
134+
data.meta.letsencrypt_agree = data.meta.letsencrypt_agree === '1';
117135
} else {
118136
data.certificate_id = parseInt(data.certificate_id, 10);
119137
}
@@ -129,6 +147,8 @@ module.exports = Mn.View.extend({
129147
}
130148

131149
this.ui.buttons.prop('disabled', true).addClass('btn-disabled');
150+
this.ui.save.addClass('btn-loading');
151+
132152
method(data)
133153
.then(result => {
134154
view.model.set(result);
@@ -142,6 +162,7 @@ module.exports = Mn.View.extend({
142162
.catch(err => {
143163
alert(err.message);
144164
this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
165+
this.ui.save.removeClass('btn-loading');
145166
});
146167
}
147168
},

‎frontend/js/i18n/messages.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@
101101
"letsencrypt-email": "Email Address for Let's Encrypt",
102102
"letsencrypt-agree": "I Agree to the <a href=\"{url}\" target=\"_blank\">Let's Encrypt Terms of Service</a>",
103103
"delete-ssl": "The SSL certificates attached will NOT be removed, they will need to be removed manually.",
104-
"hosts-warning": "These domains must be already configured to point to this installation"
104+
"hosts-warning": "These domains must be already configured to point to this installation",
105+
"use-cloudflare": "Use CloudFlare DNS verification"
105106
},
106107
"proxy-hosts": {
107108
"title": "Proxy Hosts",

0 commit comments

Comments
 (0)
Please sign in to comment.