Merge 6c5dbf54e7 into 79d28f03d0

API Schema Improvements

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": {

backend/templates/_location.conf

@@ -2,8 +2,8 @@
     {{ advanced_config }}
 
     proxy_set_header Host $host;
-    proxy_set_header X-Forwarded-Scheme $scheme;
-    proxy_set_header X-Forwarded-Proto  $scheme;
+    proxy_set_header X-Forwarded-Scheme $resolved_proto;
+    proxy_set_header X-Forwarded-Proto  $resolved_proto;
     proxy_set_header X-Forwarded-For    $remote_addr;
     proxy_set_header X-Real-IP		$remote_addr;
 

backend/templates/proxy_host.conf

@@ -4,6 +4,8 @@
 
 {% include "_hsts_map.conf" %}
 
+include conf.d/include/resolved_proto_map.conf;
+
 server {
   set $forward_scheme {{ forward_scheme }};
   set $server         "{{ forward_host }}";

docker/rootfs/etc/nginx/conf.d/include/proxy.conf

@@ -1,8 +1,7 @@
 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-Scheme $resolved_proto;
+proxy_set_header X-Forwarded-Proto  $resolved_proto;
 proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
 proxy_set_header X-Real-IP          $remote_addr;
 proxy_pass       $forward_scheme://$server:$port$request_uri;
-

docker/rootfs/etc/nginx/conf.d/include/resolved_proto_map.conf

@@ -0,0 +1,7 @@
+# Resolve the effective protocol: use X-Forwarded-Proto if set
+# (e.g., from proxies like Cloudflare or AWS)
+# otherwise fall back to the current scheme.
+map $http_x_forwarded_proto $resolved_proto {
+    default $scheme;
+    ~.+ $http_x_forwarded_proto;
+}