Add NGINX API gateway

jq1836 · jq1836 · commit afbc0438c957 · 2024-10-14T15:15:54.000+08:00
diff --git a/api-gateway/templates/api_conf.d/admin_conf.d/matching_service.conf.template b/api-gateway/templates/api_conf.d/admin_conf.d/matching_service.conf.template
@@ -0,0 +1,2 @@
+location /admin/matching-service/ {
+}
diff --git a/api-gateway/templates/api_conf.d/admin_conf.d/question_service.conf.template b/api-gateway/templates/api_conf.d/admin_conf.d/question_service.conf.template
@@ -0,0 +1,5 @@
+location /admin/question-service/ {
+    location /admin/question-service/questions {
+        proxy_pass http://question-service/questions;
+    }
+}
diff --git a/api-gateway/templates/api_conf.d/api_backends.conf.template b/api-gateway/templates/api_conf.d/api_backends.conf.template
@@ -0,0 +1,15 @@
+upstream user-service {
+    server user-service:$USER_SVC_PORT;
+}
+
+upstream question-service {
+    server question-service:$QUESTION_SVC_PORT;
+}
+
+upstream matching-service {
+    server matching-service:$MATCHING_SVC_PORT;
+}
+
+upstream frontend {
+    server frontend:$FRONTEND_PORT;
+}
diff --git a/api-gateway/templates/api_conf.d/auth.conf.template b/api-gateway/templates/api_conf.d/auth.conf.template
@@ -0,0 +1,23 @@
+location /verify-token {
+    internal;
+
+    proxy_pass_request_body off; 
+    proxy_set_header Content-Length "";
+    proxy_pass http://user-service/auth/verify-token;
+}
+
+location /verify-owner {
+    internal;
+
+    proxy_pass_request_body off; 
+    proxy_set_header Content-Length "";
+    proxy_pass http://user-service/auth/verify-owner;
+}
+
+location /verify-admin {
+    internal;
+
+    proxy_pass_request_body off; 
+    proxy_set_header Content-Length "";
+    proxy_pass http://user-service/auth/verify-admin;
+}
diff --git a/api-gateway/templates/api_conf.d/frontend.conf.template b/api-gateway/templates/api_conf.d/frontend.conf.template
@@ -0,0 +1,3 @@
+location / {
+    proxy_pass http://frontend;
+}
diff --git a/api-gateway/templates/api_conf.d/owner_conf.d/matching_service.conf.template b/api-gateway/templates/api_conf.d/owner_conf.d/matching_service.conf.template
@@ -0,0 +1,2 @@
+location /owner/matching-service/ {
+}
diff --git a/api-gateway/templates/api_conf.d/owner_conf.d/question_service.conf.template b/api-gateway/templates/api_conf.d/owner_conf.d/question_service.conf.template
@@ -0,0 +1,2 @@
+location /owner/question-service/ {
+}
diff --git a/api-gateway/templates/api_conf.d/private_conf.d/matching_service.conf.template b/api-gateway/templates/api_conf.d/private_conf.d/matching_service.conf.template
@@ -0,0 +1,5 @@
+location /private/matching-service/ {
+    location /private/matching-service/match {
+        proxy_pass http://matching-service/match;
+    }
+}
diff --git a/api-gateway/templates/api_conf.d/private_conf.d/question_service.conf.template b/api-gateway/templates/api_conf.d/private_conf.d/question_service.conf.template
@@ -0,0 +1,2 @@
+location /private/question-service/ {
+}
diff --git a/api-gateway/templates/api_conf.d/private_conf.d/user_service.conf.template b/api-gateway/templates/api_conf.d/private_conf.d/user_service.conf.template
@@ -0,0 +1,2 @@
+location /private/user-service/ {
+}
diff --git a/api-gateway/templates/api_conf.d/public_conf.d/matching_service.conf.template b/api-gateway/templates/api_conf.d/public_conf.d/matching_service.conf.template
@@ -0,0 +1,2 @@
+location /public/matching-service/ {
+}
diff --git a/api-gateway/templates/api_conf.d/public_conf.d/question_service.conf.template b/api-gateway/templates/api_conf.d/public_conf.d/question_service.conf.template
@@ -0,0 +1,8 @@
+location /public/question-service/ {
+    location /public/question-service/questions {
+        limit_except GET {
+            deny all;
+        }
+        proxy_pass http://question-service/questions;
+    }
+}
diff --git a/api-gateway/templates/api_conf.d/public_conf.d/user_service.conf.template b/api-gateway/templates/api_conf.d/public_conf.d/user_service.conf.template
@@ -0,0 +1,9 @@
+location /public/user-service/ {
+    location /public/user-service/auth {
+        proxy_pass http://user-service/auth;
+    }
+
+    location /public/user-service/users {
+        proxy_pass http://user-service/users;
+    }
+}
diff --git a/api-gateway/templates/default.conf.template b/api-gateway/templates/default.conf.template
@@ -0,0 +1,31 @@
+include conf.d/api_conf.d/api_backends.conf;
+
+server {
+    listen $PORT;
+    listen [::]:$PORT;
+
+    location /public/ {
+        include conf.d/api_conf.d/public_conf.d/*.conf;
+    }
+
+    location /private/ {
+        auth_request /verify-token;
+        include conf.d/api_conf.d/private_conf.d/*.conf;
+    }
+
+    location /owner/ {
+        auth_request /verify-owner;
+        include conf.d/api_conf.d/owner_conf.d/*.conf;
+    }
+
+    location /admin/ {
+        auth_request /verify-admin;
+        include conf.d/api_conf.d/admin_conf.d/*.conf;
+    }
+
+    include conf.d/api_conf.d/auth.conf;
+    
+    include conf.d/api_conf.d/frontend.conf;
+}
+
+include conf.d/map_conf.d/*.conf;
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -37,6 +37,24 @@ services:
     environment:
       - PORT=$MATCHING_SVC_PORT
 
+  api-gateway:
+    image: nginx:1.26
+    volumes:
+      - ./api-gateway/templates:/etc/nginx/templates
+    ports:
+      - $API_GATEWAY_PORT:$API_GATEWAY_PORT
+    environment:
+      - PORT=$API_GATEWAY_PORT
+      - FRONTEND_PORT=$FRONTEND_PORT
+      - USER_SVC_PORT=$USER_SVC_PORT
+      - QUESTION_SVC_PORT=$QUESTION_SVC_PORT
+      - MATCHING_SVC_PORT=$MATCHING_SVC_PORT
+    depends_on:
+      - frontend
+      - user-service
+      - question-service
+      - matching-service
+
   redis:
     image: redis:7.4-alpine
     restart: always
diff --git a/matching-service/app/main.py b/matching-service/app/main.py
@@ -7,7 +7,7 @@
 app = FastAPI(title="Matching Service API")
 
 origins = [
-    "http://localhost:3000",
+    "*",
 ]
 
 app.add_middleware(
diff --git a/question-service/app/main.py b/question-service/app/main.py
@@ -7,7 +7,7 @@
 app = FastAPI(title="Question Service API")
 
 origins = [
-    "http://localhost:3000",
+    "*",
 ]
 
 app.add_middleware(
diff --git a/user-service/app/middleware/basic-access-control.js b/user-service/app/middleware/basic-access-control.js
@@ -3,6 +3,7 @@ import { findUserById as _findUserById } from "../model/repository.js";
 
 export function verifyAccessToken(req, res, next) {
   const authHeader = req.headers["authorization"];
+  console.log(authHeader);
   if (!authHeader) {
     return res.status(401).json({ message: "Authentication failed" });
   }
diff --git a/user-service/app/routes/auth-routes.js b/user-service/app/routes/auth-routes.js
@@ -1,12 +1,16 @@
 import express from "express";
 
 import { handleLogin, handleVerifyToken } from "../controller/auth-controller.js";
-import { verifyAccessToken } from "../middleware/basic-access-control.js";
+import { verifyAccessToken, verifyIsAdmin, verifyIsOwnerOrAdmin } from "../middleware/basic-access-control.js";
 
 const router = express.Router();
 
 router.post("/login", handleLogin);
 
 router.get("/verify-token", verifyAccessToken, handleVerifyToken);
 
+router.get("/verify-owner", verifyAccessToken, verifyIsOwnerOrAdmin, handleVerifyToken);
+
+router.get("/verify-admin", verifyAccessToken, verifyIsAdmin, handleVerifyToken);
+
 export default router;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+location /admin/matching-service/ {`
	`2`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+location / {`
	`2`	`+ proxy_pass http://frontend;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+location /owner/matching-service/ {`
	`2`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+location /owner/question-service/ {`
	`2`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+location /private/question-service/ {`
	`2`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+location /private/user-service/ {`
	`2`	`+}`