+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<%- i18n('streams', 'forward-type-error') %>
+
-
diff --git a/frontend/js/app/nginx/stream/form.js b/frontend/js/app/nginx/stream/form.js
index be8fc8bc..cd012f9b 100644
--- a/frontend/js/app/nginx/stream/form.js
+++ b/frontend/js/app/nginx/stream/form.js
@@ -1,24 +1,38 @@
-const Mn = require('backbone.marionette');
-const App = require('../../main');
-const StreamModel = require('../../../models/stream');
-const template = require('./form.ejs');
+const Mn = require('backbone.marionette');
+const App = require('../../main');
+const StreamModel = require('../../../models/stream');
+const template = require('./form.ejs');
+const dns_providers = require('../../../../../global/certbot-dns-plugins');
require('jquery-serializejson');
require('jquery-mask-plugin');
require('selectize');
+const Helpers = require("../../../lib/helpers");
+const certListItemTemplate = require("../certificates-list-item.ejs");
+const i18n = require("../../i18n");
module.exports = Mn.View.extend({
template: template,
className: 'modal-dialog',
ui: {
- form: 'form',
- forwarding_host: 'input[name="forwarding_host"]',
- type_error: '.forward-type-error',
- buttons: '.modal-footer button',
- switches: '.custom-switch-input',
- cancel: 'button.cancel',
- save: 'button.save'
+ form: 'form',
+ forwarding_host: 'input[name="forwarding_host"]',
+ type_error: '.forward-type-error',
+ buttons: '.modal-footer button',
+ switches: '.custom-switch-input',
+ cancel: 'button.cancel',
+ save: 'button.save',
+ le_error_info: '#le-error-info',
+ certificate_select: 'select[name="certificate_id"]',
+ domain_names: 'input[name="domain_names"]',
+ dns_challenge_switch: 'input[name="meta[dns_challenge]"]',
+ dns_challenge_content: '.dns-challenge',
+ dns_provider: 'select[name="meta[dns_provider]"]',
+ credentials_file_content: '.credentials-file-content',
+ dns_provider_credentials: 'textarea[name="meta[dns_provider_credentials]"]',
+ propagation_seconds: 'input[name="meta[propagation_seconds]"]',
+ letsencrypt: '.letsencrypt'
},
events: {
@@ -48,6 +62,35 @@ module.exports = Mn.View.extend({
data.tcp_forwarding = !!data.tcp_forwarding;
data.udp_forwarding = !!data.udp_forwarding;
+ if (typeof data.meta === 'undefined') data.meta = {};
+ data.meta.letsencrypt_agree = data.meta.letsencrypt_agree == 1;
+ data.meta.dns_challenge = true;
+
+ if (data.meta.propagation_seconds === '') data.meta.propagation_seconds = undefined;
+
+ if (typeof data.domain_names === 'string' && data.domain_names) {
+ data.domain_names = data.domain_names.split(',');
+ }
+
+ // Check for any domain names containing wildcards, which are not allowed with letsencrypt
+ if (data.certificate_id === 'new') {
+ let domain_err = false;
+ if (!data.meta.dns_challenge) {
+ data.domain_names.map(function (name) {
+ if (name.match(/\*/im)) {
+ domain_err = true;
+ }
+ });
+ }
+
+ if (domain_err) {
+ alert(i18n('ssl', 'no-wildcard-without-dns'));
+ return;
+ }
+ } else {
+ data.certificate_id = parseInt(data.certificate_id, 10);
+ }
+
let method = App.Api.Nginx.Streams.create;
let is_new = true;
@@ -70,10 +113,108 @@ module.exports = Mn.View.extend({
});
})
.catch(err => {
- alert(err.message);
+ let more_info = '';
+ if (err.code === 500 && err.debug) {
+ try {
+ more_info = JSON.parse(err.debug).debug.stack.join("\n");
+ } catch (e) {
+ }
+ }
+ this.ui.le_error_info[0].innerHTML = `${err.message}${more_info !== '' ? `
${more_info}` : ''}`;
+ this.ui.le_error_info.show();
+ this.ui.le_error_info[0].scrollIntoView();
this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
+ this.ui.save.removeClass('btn-loading');
});
- }
+ },
+
+ 'change @ui.certificate_select': function () {
+ let id = this.ui.certificate_select.val();
+ if (id === 'new') {
+ this.ui.letsencrypt.show().find('input').prop('disabled', false);
+ this.ui.domain_names.prop('required', 'required');
+
+ this.ui.dns_challenge_switch
+ .prop('disabled', true)
+ .parents('.form-group')
+ .css('opacity', 0.5);
+
+ this.ui.dns_provider.prop('required', 'required');
+ const selected_provider = this.ui.dns_provider[0].options[this.ui.dns_provider[0].selectedIndex].value;
+ if (selected_provider != '' && dns_providers[selected_provider].credentials !== false) {
+ this.ui.dns_provider_credentials.prop('required', 'required');
+ }
+ this.ui.dns_challenge_content.show();
+ } else {
+ this.ui.letsencrypt.hide().find('input').prop('disabled', true);
+ }
+ },
+
+ 'change @ui.dns_provider': function () {
+ const selected_provider = this.ui.dns_provider[0].options[this.ui.dns_provider[0].selectedIndex].value;
+ if (selected_provider != '' && dns_providers[selected_provider].credentials !== false) {
+ this.ui.dns_provider_credentials.prop('required', 'required');
+ this.ui.dns_provider_credentials[0].value = dns_providers[selected_provider].credentials;
+ this.ui.credentials_file_content.show();
+ } else {
+ this.ui.dns_provider_credentials.prop('required', false);
+ this.ui.credentials_file_content.hide();
+ }
+ },
+ },
+
+ templateContext: {
+ getLetsencryptEmail: function () {
+ return App.Cache.User.get('email');
+ },
+ getDnsProvider: function () {
+ return typeof this.meta.dns_provider !== 'undefined' && this.meta.dns_provider != '' ? this.meta.dns_provider : null;
+ },
+ getDnsProviderCredentials: function () {
+ return typeof this.meta.dns_provider_credentials !== 'undefined' ? this.meta.dns_provider_credentials : '';
+ },
+ getPropagationSeconds: function () {
+ return typeof this.meta.propagation_seconds !== 'undefined' ? this.meta.propagation_seconds : '';
+ },
+ dns_plugins: dns_providers,
+ },
+
+ onRender: function () {
+ let view = this;
+
+ // Certificates
+ this.ui.le_error_info.hide();
+ this.ui.dns_challenge_content.hide();
+ this.ui.credentials_file_content.hide();
+ this.ui.letsencrypt.hide();
+ this.ui.certificate_select.selectize({
+ valueField: 'id',
+ labelField: 'nice_name',
+ searchField: ['nice_name', 'domain_names'],
+ create: false,
+ preload: true,
+ allowEmptyOption: true,
+ render: {
+ option: function (item) {
+ item.i18n = App.i18n;
+ item.formatDbDate = Helpers.formatDbDate;
+ return certListItemTemplate(item);
+ }
+ },
+ load: function (query, callback) {
+ App.Api.Nginx.Certificates.getAll()
+ .then(rows => {
+ callback(rows);
+ })
+ .catch(err => {
+ console.error(err);
+ callback();
+ });
+ },
+ onLoad: function () {
+ view.ui.certificate_select[0].selectize.setValue(view.model.get('certificate_id'));
+ }
+ });
},
initialize: function (options) {
diff --git a/frontend/js/i18n/messages.json b/frontend/js/i18n/messages.json
index 0bbde454..5aabbb0c 100644
--- a/frontend/js/i18n/messages.json
+++ b/frontend/js/i18n/messages.json
@@ -179,7 +179,8 @@
"delete-confirm": "Are you sure you want to delete this Stream?",
"help-title": "What is a Stream?",
"help-content": "A relatively new feature for Nginx, a Stream will serve to forward TCP/UDP traffic directly to another computer on the network.\nIf you're running game servers, FTP or SSH servers this can come in handy.",
- "search": "Search Incoming Port…"
+ "search": "Search Incoming Port…",
+ "ssl-certificate": "SSL Certificate for TCP Forwarding"
},
"certificates": {
"title": "SSL Certificates",
diff --git a/frontend/js/models/stream.js b/frontend/js/models/stream.js
index ba035429..390c4fb0 100644
--- a/frontend/js/models/stream.js
+++ b/frontend/js/models/stream.js
@@ -15,8 +15,11 @@ const model = Backbone.Model.extend({
udp_forwarding: false,
enabled: true,
meta: {},
+ certificate_id: 0,
+ domain_names: [],
// The following are expansions:
- owner: null
+ owner: null,
+ certificate: null
};
}
});