diff --git a/.version b/.version
index d8b69897..3cf561c0 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.12.0
+2.12.1
diff --git a/backend/internal/nginx.js b/backend/internal/nginx.js
index e936a783..8974e39c 100644
--- a/backend/internal/nginx.js
+++ b/backend/internal/nginx.js
@@ -164,7 +164,9 @@ const internalNginx = {
* @param {Object} host
* @returns {Promise}
*/
- generateConfig: (host_type, host) => {
+ generateConfig: (host_type, host_row) => {
+ // Prevent modifying the original object:
+ let host = JSON.parse(JSON.stringify(host_row));
const nice_host_type = internalNginx.getFileFriendlyHostType(host_type);
const renderEngine = utils.getRenderEngine();
diff --git a/backend/schema/components/proxy-host-object.json b/backend/schema/components/proxy-host-object.json
index a64a58c8..5098802b 100644
--- a/backend/schema/components/proxy-host-object.json
+++ b/backend/schema/components/proxy-host-object.json
@@ -23,9 +23,7 @@
"locations",
"hsts_enabled",
"hsts_subdomains",
- "certificate",
- "use_default_location",
- "ipv6"
+ "certificate"
],
"additionalProperties": false,
"properties": {
@@ -151,12 +149,6 @@
"$ref": "./access-list-object.json"
}
]
- },
- "use_default_location": {
- "type": "boolean"
- },
- "ipv6": {
- "type": "boolean"
}
}
}
diff --git a/backend/schema/components/redirection-host-object.json b/backend/schema/components/redirection-host-object.json
index 012f971e..10887284 100644
--- a/backend/schema/components/redirection-host-object.json
+++ b/backend/schema/components/redirection-host-object.json
@@ -28,7 +28,7 @@
},
"forward_scheme": {
"type": "string",
- "enum": ["$scheme", "http", "https"]
+ "enum": ["$scheme", "auto", "http", "https"]
},
"forward_domain_name": {
"description": "Domain Name",
diff --git a/backend/schema/components/setting-object.json b/backend/schema/components/setting-object.json
index 65ec2a08..b9c6a103 100644
--- a/backend/schema/components/setting-object.json
+++ b/backend/schema/components/setting-object.json
@@ -46,7 +46,10 @@
},
"meta": {
"description": "Extra metadata",
- "example": {},
+ "example": {
+ "redirect": "http://example.com",
+ "html": "404
"
+ },
"type": "object"
}
}
diff --git a/backend/schema/paths/nginx/dead-hosts/hostID/put.json b/backend/schema/paths/nginx/dead-hosts/hostID/put.json
index 6a0a57e3..f9505ed4 100644
--- a/backend/schema/paths/nginx/dead-hosts/hostID/put.json
+++ b/backend/schema/paths/nginx/dead-hosts/hostID/put.json
@@ -94,9 +94,7 @@
"avatar": "",
"roles": ["admin"]
},
- "certificate": null,
- "use_default_location": true,
- "ipv6": true
+ "certificate": null
}
}
},
diff --git a/backend/schema/paths/nginx/dead-hosts/post.json b/backend/schema/paths/nginx/dead-hosts/post.json
index 59313506..c8bbb693 100644
--- a/backend/schema/paths/nginx/dead-hosts/post.json
+++ b/backend/schema/paths/nginx/dead-hosts/post.json
@@ -79,9 +79,7 @@
"nickname": "Admin",
"avatar": "",
"roles": ["admin"]
- },
- "use_default_location": true,
- "ipv6": true
+ }
}
}
},
diff --git a/backend/schema/paths/nginx/proxy-hosts/hostID/put.json b/backend/schema/paths/nginx/proxy-hosts/hostID/put.json
index af73905d..5cab6e75 100644
--- a/backend/schema/paths/nginx/proxy-hosts/hostID/put.json
+++ b/backend/schema/paths/nginx/proxy-hosts/hostID/put.json
@@ -129,9 +129,7 @@
"roles": ["admin"]
},
"certificate": null,
- "access_list": null,
- "use_default_location": true,
- "ipv6": true
+ "access_list": null
}
}
},
diff --git a/backend/schema/paths/nginx/proxy-hosts/post.json b/backend/schema/paths/nginx/proxy-hosts/post.json
index 13f64161..85455fb6 100644
--- a/backend/schema/paths/nginx/proxy-hosts/post.json
+++ b/backend/schema/paths/nginx/proxy-hosts/post.json
@@ -114,9 +114,7 @@
"avatar": "//www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?default=mm",
"roles": ["admin"]
},
- "access_list": null,
- "use_default_location": true,
- "ipv6": true
+ "access_list": null
}
}
},
diff --git a/backend/schema/paths/nginx/redirection-hosts/hostID/put.json b/backend/schema/paths/nginx/redirection-hosts/hostID/put.json
index 870f16fc..fd97cbfa 100644
--- a/backend/schema/paths/nginx/redirection-hosts/hostID/put.json
+++ b/backend/schema/paths/nginx/redirection-hosts/hostID/put.json
@@ -114,9 +114,7 @@
"avatar": "",
"roles": ["admin"]
},
- "certificate": null,
- "use_default_location": true,
- "ipv6": true
+ "certificate": null
}
}
},
diff --git a/backend/schema/paths/nginx/redirection-hosts/post.json b/backend/schema/paths/nginx/redirection-hosts/post.json
index 3a9a05fe..5bfde2c3 100644
--- a/backend/schema/paths/nginx/redirection-hosts/post.json
+++ b/backend/schema/paths/nginx/redirection-hosts/post.json
@@ -99,9 +99,7 @@
"nickname": "Admin",
"avatar": "",
"roles": ["admin"]
- },
- "use_default_location": true,
- "ipv6": true
+ }
}
}
},
diff --git a/backend/schema/paths/nginx/streams/streamID/put.json b/backend/schema/paths/nginx/streams/streamID/put.json
index f3ef54d4..fbfdc901 100644
--- a/backend/schema/paths/nginx/streams/streamID/put.json
+++ b/backend/schema/paths/nginx/streams/streamID/put.json
@@ -129,9 +129,7 @@
"roles": ["admin"]
},
"certificate": null,
- "access_list": null,
- "use_default_location": true,
- "ipv6": true
+ "access_list": null
}
}
},
diff --git a/backend/schema/paths/settings/settingID/put.json b/backend/schema/paths/settings/settingID/put.json
index 5888ec05..4ca62429 100644
--- a/backend/schema/paths/settings/settingID/put.json
+++ b/backend/schema/paths/settings/settingID/put.json
@@ -13,7 +13,8 @@
"name": "settingID",
"schema": {
"type": "string",
- "minLength": 1
+ "minLength": 1,
+ "enum": ["default-site"]
},
"required": true,
"description": "Setting ID",
@@ -31,10 +32,21 @@
"minProperties": 1,
"properties": {
"value": {
- "$ref": "../../../components/setting-object.json#/properties/value"
+ "type": "string",
+ "minLength": 1,
+ "enum": ["congratulations", "404", "444", "redirect", "html"]
},
"meta": {
- "$ref": "../../../components/setting-object.json#/properties/meta"
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "redirect": {
+ "type": "string"
+ },
+ "html": {
+ "type": "string"
+ }
+ }
}
}
}
diff --git a/test/cypress/e2e/api/Settings.cy.js b/test/cypress/e2e/api/Settings.cy.js
new file mode 100644
index 00000000..6942760c
--- /dev/null
+++ b/test/cypress/e2e/api/Settings.cy.js
@@ -0,0 +1,124 @@
+///
+
+describe('Settings endpoints', () => {
+ let token;
+
+ before(() => {
+ cy.getToken().then((tok) => {
+ token = tok;
+ });
+ });
+
+ it('Get all settings', function() {
+ cy.task('backendApiGet', {
+ token: token,
+ path: '/api/settings',
+ }).then((data) => {
+ cy.validateSwaggerSchema('get', 200, '/settings', data);
+ expect(data.length).to.be.greaterThan(0);
+ });
+ });
+
+ it('Get default-site setting', function() {
+ cy.task('backendApiGet', {
+ token: token,
+ path: '/api/settings/default-site',
+ }).then((data) => {
+ cy.validateSwaggerSchema('get', 200, '/settings/{settingID}', data);
+ expect(data).to.have.property('id');
+ expect(data.id).to.be.equal('default-site');
+ });
+ });
+
+ it('Default Site congratulations', function() {
+ cy.task('backendApiPut', {
+ token: token,
+ path: '/api/settings/default-site',
+ data: {
+ value: 'congratulations',
+ },
+ }).then((data) => {
+ cy.validateSwaggerSchema('put', 200, '/settings/{settingID}', data);
+ expect(data).to.have.property('id');
+ expect(data.id).to.be.equal('default-site');
+ expect(data).to.have.property('value');
+ expect(data.value).to.be.equal('congratulations');
+ });
+ });
+
+ it('Default Site 404', function() {
+ cy.task('backendApiPut', {
+ token: token,
+ path: '/api/settings/default-site',
+ data: {
+ value: '404',
+ },
+ }).then((data) => {
+ cy.validateSwaggerSchema('put', 200, '/settings/{settingID}', data);
+ expect(data).to.have.property('id');
+ expect(data.id).to.be.equal('default-site');
+ expect(data).to.have.property('value');
+ expect(data.value).to.be.equal('404');
+ });
+ });
+
+ it('Default Site 444', function() {
+ cy.task('backendApiPut', {
+ token: token,
+ path: '/api/settings/default-site',
+ data: {
+ value: '444',
+ },
+ }).then((data) => {
+ cy.validateSwaggerSchema('put', 200, '/settings/{settingID}', data);
+ expect(data).to.have.property('id');
+ expect(data.id).to.be.equal('default-site');
+ expect(data).to.have.property('value');
+ expect(data.value).to.be.equal('444');
+ });
+ });
+
+ it('Default Site redirect', function() {
+ cy.task('backendApiPut', {
+ token: token,
+ path: '/api/settings/default-site',
+ data: {
+ value: 'redirect',
+ meta: {
+ redirect: 'https://www.google.com',
+ },
+ },
+ }).then((data) => {
+ cy.validateSwaggerSchema('put', 200, '/settings/{settingID}', data);
+ expect(data).to.have.property('id');
+ expect(data.id).to.be.equal('default-site');
+ expect(data).to.have.property('value');
+ expect(data.value).to.be.equal('redirect');
+ expect(data).to.have.property('meta');
+ expect(data.meta).to.have.property('redirect');
+ expect(data.meta.redirect).to.be.equal('https://www.google.com');
+ });
+ });
+
+ it('Default Site html', function() {
+ cy.task('backendApiPut', {
+ token: token,
+ path: '/api/settings/default-site',
+ data: {
+ value: 'html',
+ meta: {
+ html: 'hello world
'
+ },
+ },
+ }).then((data) => {
+ cy.validateSwaggerSchema('put', 200, '/settings/{settingID}', data);
+ expect(data).to.have.property('id');
+ expect(data.id).to.be.equal('default-site');
+ expect(data).to.have.property('value');
+ expect(data.value).to.be.equal('html');
+ expect(data).to.have.property('meta');
+ expect(data.meta).to.have.property('html');
+ expect(data.meta.html).to.be.equal('hello world
');
+ });
+ });
+});