Merge pull request #64 from CS3219-AY2425S1/second-nginx

Add 2nd gateway and integrate with frontend changes

Author: tzyian

comms/server.js

@@ -1,11 +1,14 @@
 const express = require("express");
 const http = require("http");
 const app = express();
+
 const server = http.createServer(app);
 const io = require("socket.io")(server, {
+  path: '/comms',
   cors: {
     // temporarily use * to allow all origins
-    origin: `*`
+    origin: `*`,
+    methods: ["GET", "POST"]
   }
 });
 

compose.yaml

@@ -165,16 +165,27 @@ services:
   nginx:
     build: nginx
     image: distractedcat/nginx
-    ports:
-      - "80:80"
     volumes:
-      - ./nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx/nginx.conf:/etc/nginx/internal.conf
+    ports:
+      - "70:70"
     depends_on:
       - peerprep
       - backend
       - user-service
       - storage-blob-api
       - matching-service-api
+  
+  inbound-gateway:
+    build: inbound-gateway
+    image: wzwren/inbound-gateway
+    ports:
+      - "80:80"
+    volumes:
+      - ./inbound-gateway/nginx.conf:/etc/nginx/external.conf
+    depends_on:
+      - peerprep
+      - comms
 #  mongo:
 #    image: "mongo:latest"
 #    ports:

inbound-gateway/Dockerfile

@@ -0,0 +1,4 @@
+FROM nginx:alpine 
+COPY nginx.conf /etc/nginx/external.conf
+EXPOSE 80
+CMD ["nginx", "-c", "external.conf", "-g", "daemon off;"]

inbound-gateway/README.md

@@ -0,0 +1,7 @@
+nginx is dockerised, just have to run `docker compose up --build` as usual.
+
+if edits are made to the local nginx.conf file, following command must be run to see changes reflected in docker:
+
+`docker exec cs3219-ay2425s1-project-g14-nginx-1  nginx -s reload`
+
+(or just exec `nginx -s reload` in the container directly)

inbound-gateway/nginx.conf

@@ -0,0 +1,56 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+ 
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                     '$status $body_bytes_sent "$http_referer" '
+                     '"$http_user_agent" "$http_x_forwarded_for"';
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    upstream peerprep {
+        server peerprep:3000;
+    }
+
+    server {
+        listen 80;
+
+        location / {
+            proxy_pass http://peerprep/;
+            proxy_set_header   Host               $host;
+            proxy_set_header   X-Real-IP          $remote_addr;
+            proxy_set_header   X-Forwarded-Proto  $scheme;
+            proxy_set_header   X-Forwarded-Host   $host; # port 80 implicitly removes this port
+            proxy_set_header   X-Forwarded-For    $proxy_add_x_forwarded_for;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_read_timeout 86400;
+        }
+
+        location /comms/ {
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Host $host;
+            proxy_set_header X-NginX-Proxy false;
+
+
+            proxy_pass http://comms:4001;
+
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_read_timeout 86400;
+        }
+    }
+}

nginx/Dockerfile

@@ -1,4 +1,4 @@
 FROM nginx:alpine 
-COPY nginx.conf /etc/nginx/nginx.conf
-EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+COPY nginx.conf /etc/nginx/internal.conf
+EXPOSE 70
+CMD ["nginx", "-c", "internal.conf", "-g", "daemon off;"]

nginx/nginx.conf

@@ -53,7 +53,7 @@ http {
     # }
 
     server {
-        listen 80;
+        listen 70;
         location / {
             proxy_pass http://peerprep/;
             proxy_set_header   Host               $host;
@@ -63,6 +63,7 @@ http {
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
+            proxy_read_timeout 86400;
         }
 
         location /users/ {

peerprep/app/actions/server_actions.ts

@@ -95,7 +95,7 @@ export async function hydrateUid(): Promise<null | UserData> {
   if (isError(json)) {
     console.log("Failed to fetch user ID.");
     console.log(`Error ${json.status}: ${json.error}`);
-    redirect("/api/internal/auth/expire");
+    redirect("/auth/logout");
   }
   // TODO: handle error handling
   const response = json as UserServiceResponse;

peerprep/app/actions/session.ts

@@ -46,7 +46,3 @@ export async function createSession(userDataAccessToken: UserDataAccessToken) {
     console.error("Error setting cookie:", error);
   }
 }
-
-export async function expireSession() {
-  Object.values(CookieNames).forEach((name) => cookies().delete(name));
-}