Merge 30787f7ee3d1c73d01815b18581a48c54b066c6f into 79d28f03d035114b80dcd04845306ecb98175074

Merge pull request #4346 from Sander0542/feature/security-schemes-component
API Schema Improvements
2025-04-25 16:50:52 +00:00 · 2025-02-11 14:14:18 +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 15 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/proxy.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
@ -1,5 +1,4 @@
 add_header       X-Served-By $host;
-proxy_set_header Host $host;
 proxy_set_header X-Forwarded-Scheme $scheme;
 proxy_set_header X-Forwarded-Proto  $scheme;
 proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
Author	SHA1	Message	Date
Volker Braun	24562814fd	Merge 30787f7ee3d1c73d01815b18581a48c54b066c6f into 79d28f03d035114b80dcd04845306ecb98175074	2025-02-11 14:14:18 +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
Volker Braun	30787f7ee3	Host should be $proxy_host, not $host * $host is the Host sent by the user's browser. This is the correct setting if the service has built-in support for being proxied. * $proxy_host is the Host as if the browser would run on the proxy. This is the correct setting if the service does not have built-in support for reverse proxies. It is also the nginx default. * In nginx, you cannot unset the Host header. Configuring headers multiple times just sends multiple values with the http request. So there is no way to "fix" the Host by adding a custom header if it is already set. For these reasons, Host should not be set (and default to $proxy_host). In the unlikely case that your service needs something else you can then just set the header in the GUI. Fixes https://github.com/NginxProxyManager/nginx-proxy-manager/issues/2675	2023-10-08 13:20:45 +02:00