Merge f5373dd9cc6370d39bfed90790a6c15abf9fe512 into 79d28f03d035114b80dcd04845306ecb98175074

Merge pull request #4346 from Sander0542/feature/security-schemes-component
API Schema Improvements
2025-06-14 16:34:27 +00:00 · 2025-02-07 08:27:23 +01:00 · 2025-02-07 12:39:49 +10:00 · 2025-02-05 22:20:21 +01:00 · 2025-02-05 22:15:12 +01:00 · 2025-02-05 18:18:50 +01:00
5 changed files with 16 additions and 4 deletions
--- a/backend/models/dead_host.js
+++ b/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 {
--- a/backend/models/stream.js
+++ b/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',
 ];
--- a/backend/schema/components/proxy-host-object.json
+++ b/backend/schema/components/proxy-host-object.json
@ -22,8 +22,7 @@
 		"enabled",
 		"locations",
 		"hsts_enabled",
-		"hsts_subdomains",
-		"certificate"
+		"hsts_subdomains"
 	],
 	"additionalProperties": false,
 	"properties": {
--- a/backend/schema/swagger.json
+++ b/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": {
--- a/docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
@ -2,7 +2,7 @@ set $test "";
 if ($scheme = "http") {
 	set $test "H";
 }
-if ($request_uri = /.well-known/acme-challenge/test-challenge) {
+if ($request_uri ~ "^\/\.well-known\/acme-challenge\/(.*)") {
 	set $test "${test}T";
 }
 if ($test = H) {
Author	SHA1	Message	Date
EDIflyer	36a8ac634a	Merge f5373dd9cc6370d39bfed90790a6c15abf9fe512 into 79d28f03d035114b80dcd04845306ecb98175074	2025-02-07 08:27:23 +01:00
jc21	79d28f03d0	Merge pull request #4346 from Sander0542/feature/security-schemes-component All checks were successful Close stale issues and PRs / stale (push) Successful in 4s Details API Schema Improvements	2025-02-07 12:39:49 +10:00
Sander Jochems	df48b835c4	Update order to match others	2025-02-05 22:20:21 +01:00
Sander Jochems	8a1557154a	Add certificate fields to boolFields	2025-02-05 22:15:12 +01:00
Sander Jochems	a6af5ec2c7	Remove certificate as required from proxy host	2025-02-05 18:18:50 +01:00
Sander Jochems	14d7c35fd7	Fix whitespaces	2025-02-05 17:31:09 +01:00
Sander Jochems	cfcf78aaee	Set bearer auth security component	2025-02-05 17:29:40 +01:00
EDIflyer	f5373dd9cc	Merge branch 'NginxProxyManager:develop' into develop	2025-01-10 18:57:51 +00:00
EDIflyer	be5903f6c7	Merge branch 'NginxProxyManager:develop' into develop	2024-11-07 21:28:24 +00:00
EDIflyer	2bb99e68d8	Update force-ssl.conf Revised as per PR discussion.	2024-06-11 07:59:38 +01:00
EDIflyer	2d65d672c8	Merge branch 'develop' into develop	2024-06-10 20:10:42 +01:00
EDIflyer	2e528348b7	fix regex as per @lbogdan in https://github.com/NginxProxyManager/nginx-proxy-manager/pull/3121#discussion_r1621959578	2024-05-31 12:16:18 +01:00
EDIflyer	013310ded0	LetsEncrypt ACME redirect issue fixes #2881	2023-08-13 16:44:58 +01:00