Merge pull request #3502 from navikt/redirect-old-ingress

Redirect old ingress

Author: hestad

.nais/dev.yaml

@@ -25,6 +25,7 @@ spec:
       replyURLs:
         - "http://localhost/oauth2/callback"
         - "https://supplerendestonad.dev.adeo.no/oauth2/callback"
+        - "https://supplerendestonad.intern.dev.nav.no/oauth2/callback"
   webproxy: true
   replicas:
     min: 2
@@ -38,6 +39,7 @@ spec:
     initialDelay: 5
   ingresses:
     - https://supplerendestonad.dev.adeo.no
+    - https://supplerendestonad.intern.dev.adeo.no
   vault:
     enabled: true
   env:
@@ -60,9 +62,9 @@ spec:
       - name: SU_SE_BAKOVER_AAD_APP_NAME
         value: "dev-fss.supstonad.su-se-bakover"
       - name: AUTH_LOGIN_REDIRECT_URI
-        value: "https://supplerendestonad.dev.adeo.no/oauth2/callback"
+        value: "https://supplerendestonad.intern.dev.adeo.no/oauth2/callback"
       - name: AUTH_LOGOUT_REDIRECT_URI
-        value: "https://supplerendestonad.dev.adeo.no/"
+        value: "https://supplerendestonad.intern.dev.adeo.no/"
       - name: LOG_LEVEL
         value: "debug"
   envFrom:

.nais/prod.yaml

@@ -25,6 +25,7 @@ spec:
       replyURLs:
         - "http://localhost/oauth2/callback"
         - "https://supplerendestonad.nais.adeo.no/oauth2/callback"
+        - "https://supplerendestonad.intern.nav.no/oauth2/callback"
   webproxy: true
   replicas:
     min: 2
@@ -38,6 +39,7 @@ spec:
     initialDelay: 5
   ingresses:
     - https://supplerendestonad.nais.adeo.no
+    - https://supplerendestonad.intern.nav.no
   vault:
     enabled: true
   env:
@@ -60,9 +62,9 @@ spec:
       - name: SU_SE_BAKOVER_AAD_APP_NAME
         value: "prod-fss.supstonad.su-se-bakover"
       - name: AUTH_LOGIN_REDIRECT_URI
-        value: "https://supplerendestonad.nais.adeo.no/oauth2/callback"
+        value: "https://supplerendestonad.intern.nav.no/oauth2/callback"
       - name: AUTH_LOGOUT_REDIRECT_URI
-        value: "https://supplerendestonad.nais.adeo.no/"
+        value: "https://supplerendestonad.intern.nav.no/"
   envFrom:
     - secret: redis-password
     - secret: su-se-framover-session-key

server/redirect.ts

@@ -0,0 +1,14 @@
+import { Request, Response, NextFunction } from 'express';
+
+const redirectMiddleware = (request: Request, res: Response, next: NextFunction) => {
+    const forwardedHostHeader: string | undefined = request.header('x-forwarded-host');
+    if (forwardedHostHeader && forwardedHostHeader?.includes('dev.adeo.no')) {
+        res.redirect('https://supplerendestonad.intern.dev.adeo.no');
+    } else if (forwardedHostHeader && forwardedHostHeader?.includes('nais.adeo.no')) {
+        res.redirect('https://supplerendestonad.intern.nav.no');
+    } else {
+        next();
+    }
+};
+
+export default redirectMiddleware;

server/start.ts

@@ -9,6 +9,7 @@ import * as Config from './config.js';
 import { httpLogger, logger } from './logger.js';
 import setupProxy from './proxy.js';
 import routes from './routes.js';
+import redirectMiddleware from './redirect.js';
 
 const hotjarCsp = {
     imgSrc: ['http://*.hotjar.com', 'https://*.hotjar.com', 'http://*.hotjar.io', 'https://*.hotjar.io'],
@@ -42,6 +43,8 @@ export default async function startServer() {
     app.set('views', Config.server.frontendDir);
     app.set('view engine', '.html');
 
+    app.use(redirectMiddleware);
+
     app.use(
         helmet({
             contentSecurityPolicy: Config.isDev