vona-core 5.1.39 → 5.1.41

package/dist/index.js

@@ -2287,16 +2287,18 @@ const contextBase = {
     if (self.accepts('html', 'text', 'json') === 'json') return true;
     return false;
   },
-  redirect(url, status) {
+  redirect(url, statusOrOptions) {
     const self = cast(this);
+    const options = typeof statusOrOptions === 'number' ? {
+      status: statusOrOptions
+    } : statusOrOptions ?? {};
     // checkOrigin
-    if (!url.startsWith('/')) {
-      const origin = cast(self.app.bean).security.checkOrigin(url, self.host);
+    if (!url.startsWith('/') && !options.trustedExternal) {
+      const origin = cast(self.app.bean).security.checkOrigin(url, self.app.util.host);
       if (!origin) self.app.throw(403);
     }
     // throw
-    status = status ?? 302;
-    self.app.throw(status, url);
+    self.app.throw(options.status ?? 302, url);
   }
 };
 
@@ -2676,22 +2678,29 @@ class VonaApplication extends KoaApplication {
     if (req) {
       request = req;
     } else {
-      const host = `localhost:${this.meta.env.SERVER_LISTEN_PORT}`;
+      const port = this.config?.server.listen.port ?? this.meta.env.SERVER_LISTEN_PORT;
+      const hostFallback = port ? `localhost:${port}` : 'localhost';
+      const protocol = (this.config ? this.util.protocol : undefined) || 'http';
+      const host = (this.config ? this.util.host : undefined) || hostFallback;
+      const hostname = new URL(`${protocol}://${host}`).hostname;
       request = {
         headers: {
           'host': host,
-          'x-forwarded-for': host
+          'x-forwarded-for': '127.0.0.1',
+          'x-forwarded-host': host,
+          'x-forwarded-proto': protocol
         },
         query: {},
         querystring: '',
         host,
-        hostname: 'localhost',
-        protocol: 'http',
-        secure: 'false',
+        hostname,
+        protocol,
+        secure: protocol === 'https',
         method: 'POST',
         url: '',
         path: '',
         socket: {
+          encrypted: protocol === 'https',
           remoteAddress: '127.0.0.1',
           remotePort: 7001
         }