Merge da22e0777eebd779c2b7c87e3876aad32d5d3252 into 79d28f03d035114b80dcd04845306ecb98175074

API Schema Improvements

.version

@@ -1 +1 @@
-2.12.2
+2.12.3

README.md

@@ -1,7 +1,7 @@
 <p align="center">
 	<img src="https://nginxproxymanager.com/github.png">
 	<br><br>
-	<img src="https://img.shields.io/badge/version-2.12.2-green.svg?style=for-the-badge">
+	<img src="https://img.shields.io/badge/version-2.12.3-green.svg?style=for-the-badge">
 	<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
 		<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
 	</a>

backend/internal/access-list.js

@@ -508,8 +508,13 @@ const internalAccessList = {
 								if (typeof item.password !== 'undefined' && item.password.length) {
 									logger.info('Adding: ' + item.username);
 
-									utils.execFile('/usr/bin/htpasswd', ['-b', htpasswd_file, item.username, item.password])
-										.then((/*result*/) => {
+									utils.execFile('openssl', ['passwd', '-apr1', item.password])
+										.then((res) => {
+											try {
+												fs.appendFileSync(htpasswd_file, item.username + ':' + res + '\n', {encoding: 'utf8'});
+											} catch (err) {
+												reject(err);
+											}
 											next();
 										})
 										.catch((err) => {

backend/models/dead_host.js

@@ -12,7 +12,11 @@ Model.knex(db);
 
 const boolFields = [
 	'is_deleted',
+	'ssl_forced',
+	'http2_support',
 	'enabled',
+	'hsts_enabled',
+	'hsts_subdomains',
 ];
 
 class DeadHost extends Model {

backend/models/stream.js

@@ -8,8 +8,8 @@ const now         = require('./now_helper');
 Model.knex(db);
 
 const boolFields = [
-	'enabled',
 	'is_deleted',
+	'enabled',
 	'tcp_forwarding',
 	'udp_forwarding',
 ];

backend/schema/components/proxy-host-object.json

@@ -22,8 +22,7 @@
 		"enabled",
 		"locations",
 		"hsts_enabled",
-		"hsts_subdomains",
-		"certificate"
+		"hsts_subdomains"
 	],
 	"additionalProperties": false,
 	"properties": {

backend/schema/swagger.json

@@ -9,6 +9,15 @@
 			"url": "http://127.0.0.1:81/api"
 		}
 	],
+	"components": {
+		"securitySchemes": {
+			"bearerAuth": {
+				"type": "http",
+				"scheme": "bearer",
+				"bearerFormat": "JWT"
+			}
+		}
+	},
 	"paths": {
 		"/": {
 			"get": {

frontend/js/app/controller.js

@@ -26,7 +26,7 @@ module.exports = {
 	 * Users
 	 */
 	showUsers: function () {
-        let controller = this;
+		const controller = this;
 		if (Cache.User.isAdmin()) {
 			require(['./main', './users/main'], (App, View) => {
 				controller.navigate('/users');
@@ -93,8 +93,7 @@ module.exports = {
 	 * Dashboard
 	 */
 	showDashboard: function () {
-        let controller = this;
-
+		const controller = this;
 		require(['./main', './dashboard/main'], (App, View) => {
 			controller.navigate('/');
 			App.UI.showAppContent(new View());
@@ -106,7 +105,7 @@ module.exports = {
 	 */
 	showNginxProxy: function () {
 		if (Cache.User.isAdmin() || Cache.User.canView('proxy_hosts')) {
-            let controller = this;
+			const controller = this;
 
 			require(['./main', './nginx/proxy/main'], (App, View) => {
 				controller.navigate('/nginx/proxy');
@@ -146,8 +145,7 @@ module.exports = {
 	 */
 	showNginxRedirection: function () {
 		if (Cache.User.isAdmin() || Cache.User.canView('redirection_hosts')) {
-            let controller = this;
-
+			const controller = this;
 			require(['./main', './nginx/redirection/main'], (App, View) => {
 				controller.navigate('/nginx/redirection');
 				App.UI.showAppContent(new View());
@@ -186,8 +184,7 @@ module.exports = {
 	 */
 	showNginxStream: function () {
 		if (Cache.User.isAdmin() || Cache.User.canView('streams')) {
-            let controller = this;
-
+			const controller = this;
 			require(['./main', './nginx/stream/main'], (App, View) => {
 				controller.navigate('/nginx/stream');
 				App.UI.showAppContent(new View());
@@ -226,8 +223,7 @@ module.exports = {
 	 */
 	showNginxDead: function () {
 		if (Cache.User.isAdmin() || Cache.User.canView('dead_hosts')) {
-            let controller = this;
-
+			const controller = this;
 			require(['./main', './nginx/dead/main'], (App, View) => {
 				controller.navigate('/nginx/404');
 				App.UI.showAppContent(new View());
@@ -278,8 +274,7 @@ module.exports = {
 	 */
 	showNginxAccess: function () {
 		if (Cache.User.isAdmin() || Cache.User.canView('access_lists')) {
-            let controller = this;
-
+			const controller = this;
 			require(['./main', './nginx/access/main'], (App, View) => {
 				controller.navigate('/nginx/access');
 				App.UI.showAppContent(new View());
@@ -318,8 +313,7 @@ module.exports = {
 	 */
 	showNginxCertificates: function () {
 		if (Cache.User.isAdmin() || Cache.User.canView('certificates')) {
-            let controller = this;
-
+			const controller = this;
 			require(['./main', './nginx/certificates/main'], (App, View) => {
 				controller.navigate('/nginx/certificates');
 				App.UI.showAppContent(new View());
@@ -383,7 +377,7 @@ module.exports = {
 	 * Audit Log
 	 */
 	showAuditLog: function () {
-        let controller = this;
+		const controller = this;
 		if (Cache.User.isAdmin()) {
 			require(['./main', './audit-log/main'], (App, View) => {
 				controller.navigate('/audit-log');
@@ -411,7 +405,7 @@ module.exports = {
 	 * Settings
 	 */
 	showSettings: function () {
-        let controller = this;
+		const controller = this;
 		if (Cache.User.isAdmin()) {
 			require(['./main', './settings/main'], (App, View) => {
 				controller.navigate('/settings');

frontend/js/app/dashboard/main.js

@@ -24,7 +24,7 @@ module.exports = Mn.View.extend({
 	},
 
 	templateContext: function () {
-        let view = this;
+		const view = this;
 
 		return {
 			getUserName: function () {
@@ -48,8 +48,8 @@ module.exports = Mn.View.extend({
 	},
 
 	onRender: function () {
-        let view = this;
-
+		const view = this;
+		if (typeof view.stats.hosts === 'undefined') {
 			Api.Reports.getHostStats()
 				.then(response => {
 					if (!view.isDestroyed()) {
@@ -60,6 +60,7 @@ module.exports = Mn.View.extend({
 				.catch(err => {
 					console.log(err);
 				});
+		}
 	},
 
 	/**
@@ -70,8 +71,7 @@ module.exports = Mn.View.extend({
 
 		// calculate the available columns based on permissions for the objects
 		// and store as a variable
-        //let view = this;
-        let perms = ['proxy_hosts', 'redirection_hosts', 'streams', 'dead_hosts'];
+		const perms = ['proxy_hosts', 'redirection_hosts', 'streams', 'dead_hosts'];
 
 		perms.map(perm => {
 			this.columns += Cache.User.isAdmin() || Cache.User.canView(perm) ? 1 : 0;

global/certbot-dns-plugins.json

@@ -161,11 +161,11 @@
 	},
 	"domainoffensive": {
 		"name": "DomainOffensive (do.de)",
-		"package_name": "certbot-dns-do",
-		"version": "~=0.31.0",
+		"package_name": "certbot-dns-domainoffensive",
+		"version": "~=2.0.0",
 		"dependencies": "",
 		"credentials": "dns_do_api_token = YOUR_DO_DE_AUTH_TOKEN",
-		"full_plugin_name": "dns-do"
+		"full_plugin_name": "dns-domainoffensive"
 	},
 	"domeneshop": {
 		"name": "Domeneshop",
@@ -534,5 +534,13 @@
 		"dependencies": "",
 		"credentials": "edgedns_client_secret = as3d1asd5d1a32sdfsdfs2d1asd5=\nedgedns_host = sdflskjdf-dfsdfsdf-sdfsdfsdf.luna.akamaiapis.net\nedgedns_access_token = kjdsi3-34rfsdfsdf-234234fsdfsdf\nedgedns_client_token = dkfjdf-342fsdfsd-23fsdfsdfsdf",
 		"full_plugin_name": "edgedns"
+	},
+	"zoneedit": {
+		"name": "ZoneEdit",
+		"package_name": "certbot-dns-zoneedit",
+		"version": "~=0.3.2",
+		"dependencies": "--no-deps dnspython",
+		"credentials": "dns_zoneedit_user = <login-user-id>\ndns_zoneedit_token = <dyn-authentication-token>",
+		"full_plugin_name": "dns-zoneedit"
  	}
 }