Merge pull request #4347 from NginxProxyManager/develop

v2.12.3

backend/models/dead_host.js

@@ -12,11 +12,7 @@ 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 = [
-	'is_deleted',
 	'enabled',
+	'is_deleted',
 	'tcp_forwarding',
 	'udp_forwarding',
 ];

backend/schema/common.json

@@ -68,38 +68,6 @@
 			"type": "integer",
 			"minimum": 0
 		},
-		"access_directive": {
-			"type": "string",
-			"enum": ["allow", "deny"]
-		},
-		"access_address": {
-			"oneOf": [
-				{
-					"type": "string",
-					"pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?$"
-				},
-				{
-					"type": "string",
-					"pattern": "^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?$"
-				},
-				{
-					"type": "string",
-					"pattern": "^all$"
-				}
-			]
-		},
-		"authorization_username": {
-			"type": "string",
-			"minLength": 1
-		},
-		"authorization_password": {
-			"type": "string",
-			"minLength": 1
-		},
-		"authorization_hint": {
-			"type": "string",
-			"minLength": 1
-		},
 		"domain_names": {
 			"description": "Domain Names separated by a comma",
 			"type": "array",

backend/schema/components/access-list-object.json

@@ -20,84 +20,34 @@
 			"type": "string",
 			"minLength": 1
 		},
+		"directive": {
+			"type": "string",
+			"enum": ["allow", "deny"]
+		},
+		"address": {
+			"oneOf": [
+				{
+					"type": "string",
+					"pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?$"
+				},
+				{
+					"type": "string",
+					"pattern": "^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?$"
+				},
+				{
+					"type": "string",
+					"pattern": "^all$"
+				}
+			]
+		},
 		"satisfy_any": {
 			"type": "boolean"
 		},
 		"pass_auth": {
 			"type": "boolean"
 		},
-		"meta": {
-			"type": "object"
-		},
-		"owner": {
-			"$ref": "./user-object.json"
-		},
-		"items": {
-			"type": "array",
-			"minItems": 0,
-			"items": {
-				"type": "object",
-				"required": ["id", "created_on", "modified_on", "access_list_id", "username", "password", "hint", "meta"],
-				"additionalProperties": false,
-				"properties": {
-					"id": {
-						"$ref": "../common.json#/properties/id"
-					},
-					"created_on": {
-						"$ref": "../common.json#/properties/created_on"
-					},
-					"modified_on": {
-						"$ref": "../common.json#/properties/modified_on"
-					},
-					"access_list_id": {
-						"$ref": "../common.json#/properties/access_list_id"
-					},
-					"username": {
-						"$ref": "../common.json#/properties/authorization_username"
-					},
-					"password": {
-						"$ref": "../common.json#/properties/authorization_password"
-					},
-					"hint": {
-						"$ref": "../common.json#/properties/authorization_hint"
-					},
 		"meta": {
 			"type": "object"
 		}
 	}
 }
-		},
-		"clients": {
-			"type": "array",
-			"minItems": 0,
-			"items": {
-				"type": "object",
-				"required": ["id", "created_on", "modified_on", "access_list_id", "address", "directive", "meta"],
-				"additionalProperties": false,
-				"properties": {
-					"id": {
-						"$ref": "../common.json#/properties/id"
-					},
-					"created_on": {
-						"$ref": "../common.json#/properties/created_on"
-					},
-					"modified_on": {
-						"$ref": "../common.json#/properties/modified_on"
-					},
-					"access_list_id": {
-						"$ref": "../common.json#/properties/access_list_id"
-					},
-					"address": {
-						"$ref": "../common.json#/properties/access_address"
-					},
-					"directive": {
-						"$ref": "../common.json#/properties/access_directive"
-					},
-					"meta": {
-						"type": "object"
-					}
-				}
-			}
-		}
-	}
-}

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

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

backend/schema/components/stream-list.json

@@ -1,7 +1,7 @@
 {
 	"type": "array",
-	"description": "Streams list",
+	"description": "Proxy Hosts list",
 	"items": {
-		"$ref": "./stream-object.json"
+		"$ref": "./proxy-host-object.json"
 	}
 }

backend/schema/paths/nginx/access-lists/get.json

@@ -14,7 +14,7 @@
 			"description": "Expansions",
 			"schema": {
 				"type": "string",
-				"enum": ["owner", "items", "clients"]
+				"enum": ["owner", "items", "clients", "proxy_hosts"]
 			}
 		}
 	],
@@ -35,54 +35,7 @@
 									"meta": {},
 									"satisfy_any": true,
 									"pass_auth": false,
-									"proxy_host_count": 0,
+									"proxy_host_count": 0
-									"owner": {
-										"id": 1,
-										"created_on": "2024-10-07T22:43:55.000Z",
-										"modified_on": "2024-10-08T12:52:54.000Z",
-										"is_deleted": false,
-										"is_disabled": false,
-										"email": "admin@example.com",
-										"name": "Administrator",
-										"nickname": "some guy",
-										"avatar": "//www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?default=mm",
-										"roles": [
-											"admin"
-										]
-									},
-									"items": [
-										{
-											"id": 1,
-											"created_on": "2024-10-08T22:15:40.000Z",
-											"modified_on": "2024-10-08T22:15:40.000Z",
-											"access_list_id": 1,
-											"username": "admin",
-											"password": "",
-											"meta": {},
-											"hint": "a****"
-										},
-										{
-											"id": 2,
-											"created_on": "2024-10-08T22:15:40.000Z",
-											"modified_on": "2024-10-08T22:15:40.000Z",
-											"access_list_id": 1,
-											"username": "asdad",
-											"password": "",
-											"meta": {},
-											"hint": "a*****"
-										}
-									],
-									"clients": [
-										{
-											"id": 1,
-											"created_on": "2024-10-08T22:15:40.000Z",
-											"modified_on": "2024-10-08T22:15:40.000Z",
-											"access_list_id": 1,
-											"address": "127.0.0.1",
-											"directive": "allow",
-											"meta": {}
-										}
-									]
 								}
 							]
 						}

backend/schema/paths/nginx/access-lists/listID/get.json

@@ -17,15 +17,6 @@
 			},
 			"required": true,
 			"example": 1
-		},
-		{
-			"in": "query",
-			"name": "expand",
-			"description": "Expansions",
-			"schema": {
-				"type": "string",
-				"enum": ["owner", "items", "clients"]
-			}
 		}
 	],
 	"responses": {
@@ -37,61 +28,14 @@
 						"default": {
 							"value": {
 								"id": 1,
-								"created_on": "2024-10-08T22:15:40.000Z",
+								"created_on": "2020-01-30T09:36:08.000Z",
-								"modified_on": "2024-10-08T22:15:40.000Z",
+								"modified_on": "2020-01-30T09:41:04.000Z",
-								"owner_user_id": 1,
-								"name": "test1234",
-								"meta": {},
-								"satisfy_any": true,
-								"pass_auth": false,
-								"proxy_host_count": 0,
-								"owner": {
-									"id": 1,
-									"created_on": "2024-10-07T22:43:55.000Z",
-									"modified_on": "2024-10-08T12:52:54.000Z",
-									"is_deleted": false,
 								"is_disabled": false,
-									"email": "admin@example.com",
+								"email": "jc@jc21.com",
-									"name": "Administrator",
+								"name": "Jamie Curnow",
-									"nickname": "some guy",
+								"nickname": "James",
-									"avatar": "//www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?default=mm",
+								"avatar": "//www.gravatar.com/avatar/6193176330f8d38747f038c170ddb193?default=mm",
-									"roles": [
+								"roles": ["admin"]
-										"admin"
-									]
-								},
-								"items": [
-									{
-										"id": 1,
-										"created_on": "2024-10-08T22:15:40.000Z",
-										"modified_on": "2024-10-08T22:15:40.000Z",
-										"access_list_id": 1,
-										"username": "admin",
-										"password": "",
-										"meta": {},
-										"hint": "a****"
-									},
-									{
-										"id": 2,
-										"created_on": "2024-10-08T22:15:40.000Z",
-										"modified_on": "2024-10-08T22:15:40.000Z",
-										"access_list_id": 1,
-										"username": "asdad",
-										"password": "",
-										"meta": {},
-										"hint": "a*****"
-									}
-								],
-								"clients": [
-									{
-										"id": 1,
-										"created_on": "2024-10-08T22:15:40.000Z",
-										"modified_on": "2024-10-08T22:15:40.000Z",
-										"access_list_id": 1,
-										"address": "127.0.0.1",
-										"directive": "allow",
-										"meta": {}
-									}
-								]
 							}
 						}
 					},

backend/schema/paths/nginx/access-lists/listID/put.json

@@ -45,10 +45,11 @@
 								"additionalProperties": false,
 								"properties": {
 									"username": {
-										"$ref": "../../../../common.json#/properties/authorization_username"
+										"type": "string",
+										"minLength": 1
 									},
 									"password": {
-										"$ref": "../../../../common.json#/properties/authorization_password"
+										"type": "string"
 									}
 								}
 							}
@@ -60,10 +61,23 @@
 								"additionalProperties": false,
 								"properties": {
 									"address": {
-										"$ref": "../../../../common.json#/properties/access_address"
+										"oneOf": [
+											{
+												"type": "string",
+												"pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?$"
+											},
+											{
+												"type": "string",
+												"pattern": "^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?$"
+											},
+											{
+												"type": "string",
+												"pattern": "^all$"
+											}
+										]
 									},
 									"directive": {
-										"$ref": "../../../../common.json#/properties/access_directive"
+										"$ref": "../../../../components/access-list-object.json#/properties/directive"
 									}
 								}
 							}
@@ -83,9 +97,9 @@
 							"value": {
 								"id": 1,
 								"created_on": "2024-10-08T22:15:40.000Z",
-								"modified_on": "2024-10-08T22:15:40.000Z",
+								"modified_on": "2024-10-08T22:34:34.000Z",
 								"owner_user_id": 1,
-								"name": "test1234",
+								"name": "test123!!",
 								"meta": {},
 								"satisfy_any": true,
 								"pass_auth": false,
@@ -134,7 +148,8 @@
 										"directive": "allow",
 										"meta": {}
 									}
-								]
+								],
+								"proxy_hosts": []
 							}
 						}
 					},

backend/schema/paths/nginx/access-lists/post.json

@@ -33,10 +33,12 @@
 								"additionalProperties": false,
 								"properties": {
 									"username": {
-										"$ref": "../../../common.json#/properties/authorization_username"
+										"type": "string",
+										"minLength": 1
 									},
 									"password": {
-										"$ref": "../../../common.json#/properties/authorization_password"
+										"type": "string",
+										"minLength": 1
 									}
 								}
 							}
@@ -48,10 +50,23 @@
 								"additionalProperties": false,
 								"properties": {
 									"address": {
-										"$ref": "../../../common.json#/properties/access_address"
+										"oneOf": [
+											{
+												"type": "string",
+												"pattern": "^([0-9]{1,3}\\.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?$"
+											},
+											{
+												"type": "string",
+												"pattern": "^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?$"
+											},
+											{
+												"type": "string",
+												"pattern": "^all$"
+											}
+										]
 									},
 									"directive": {
-										"$ref": "../../../common.json#/properties/access_directive"
+										"$ref": "../../../components/access-list-object.json#/properties/directive"
 									}
 								}
 							}
@@ -115,6 +130,7 @@
 										"hint": "a*****"
 									}
 								],
+								"proxy_hosts": [],
 								"clients": [
 									{
 										"id": 1,

backend/schema/paths/nginx/certificates/certID/get.json

@@ -17,15 +17,6 @@
 			},
 			"required": true,
 			"example": 1
-		},
-		{
-			"in": "query",
-			"name": "expand",
-			"description": "Expansions",
-			"schema": {
-				"type": "string",
-				"enum": ["owner"]
-			}
 		}
 	],
 	"responses": {

backend/schema/paths/nginx/dead-hosts/hostID/get.json

@@ -17,15 +17,6 @@
 			},
 			"required": true,
 			"example": 1
-		},
-		{
-			"in": "query",
-			"name": "expand",
-			"description": "Expansions",
-			"schema": {
-				"type": "string",
-				"enum": ["owner", "certificate"]
-			}
 		}
 	],
 	"responses": {

backend/schema/paths/nginx/proxy-hosts/hostID/get.json

@@ -17,15 +17,6 @@
 			},
 			"required": true,
 			"example": 1
-		},
-		{
-			"in": "query",
-			"name": "expand",
-			"description": "Expansions",
-			"schema": {
-				"type": "string",
-				"enum": ["access_list", "owner", "certificate"]
-			}
 		}
 	],
 	"responses": {

backend/schema/paths/nginx/redirection-hosts/hostID/get.json

@@ -17,15 +17,6 @@
 			},
 			"required": true,
 			"example": 1
-		},
-		{
-			"in": "query",
-			"name": "expand",
-			"description": "Expansions",
-			"schema": {
-				"type": "string",
-				"enum": ["owner", "certificate"]
-			}
 		}
 	],
 	"responses": {

backend/schema/paths/nginx/streams/streamID/get.json

@@ -17,15 +17,6 @@
 			},
 			"required": true,
 			"example": 2
-		},
-		{
-			"in": "query",
-			"name": "expand",
-			"description": "Expansions",
-			"schema": {
-				"type": "string",
-				"enum": ["owner", "certificate"]
-			}
 		}
 	],
 	"responses": {

backend/schema/paths/users/userID/get.json

@@ -26,15 +26,6 @@
 			"required": true,
 			"description": "User ID or 'me' for yourself",
 			"example": 1
-		},
-		{
-			"in": "query",
-			"name": "expand",
-			"description": "Expansions",
-			"schema": {
-				"type": "string",
-				"enum": ["permissions"]
-			}
 		}
 	],
 	"responses": {

backend/schema/swagger.json

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