Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸ› fix: Nginx Forwarded-IP 전달 μ„€μ • 및 μ±„νŒ… λ‚ μ§œ μ•Œλ¦Ό 둜직 μˆ˜μ • #312

Merged
merged 4 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ server {
proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade;
proxy_read_timeout 3600s;

proxy_set_header X-Real-IP $remote_addr; # X-Real-IP ν—€λ”λ‘œ μ‹€μ œ IP 전달
asn6878 marked this conversation as resolved.
Show resolved Hide resolved
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; # X-Forwarded-For ν—€λ”λ‘œ μ‹€μ œ IP 전달
asn6878 marked this conversation as resolved.
Show resolved Hide resolved
proxy_set_header X-Forwarded-Proto $scheme; # ν΄λΌμ΄μ–ΈνŠΈμ˜ ν”„λ‘œν† μ½œ 전달
}

# WebSocket μš”μ²­ ν”„λ‘μ‹œ
Expand All @@ -50,5 +54,9 @@ server {
proxy_cache_bypass $http_upgrade;
proxy_read_timeout 3600s;
proxy_send_timeout 3600s;

proxy_set_header X-Real-IP $remote_addr; # X-Real-IP ν—€λ”λ‘œ μ‹€μ œ IP 전달
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; # X-Forwarded-For ν—€λ”λ‘œ μ‹€μ œ IP 전달
proxy_set_header X-Forwarded-Proto $scheme; # ν΄λΌμ΄μ–ΈνŠΈμ˜ ν”„λ‘œν† μ½œ 전달
}
}
2 changes: 1 addition & 1 deletion server/src/chat/chat.gateway.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export class ChatGateway implements OnGatewayConnection, OnGatewayDisconnect {

if (this.dayInit) {
this.dayInit = false;
this.emitMidnightMessage();
await this.emitMidnightMessage();
}

this.server.emit('message', broadcastPayload);
Expand Down
18 changes: 13 additions & 5 deletions server/src/common/logger/logger.interceptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
} from '@nestjs/common';
import { finalize } from 'rxjs';
import { WinstonLoggerService } from './logger.service';
import { Request } from 'express';

@Injectable()
export class LoggingInterceptor implements NestInterceptor {
Expand All @@ -18,11 +19,7 @@ export class LoggingInterceptor implements NestInterceptor {
if (!url.includes('register') && !url.includes('login')) {
this.logger.log(
JSON.stringify({
host:
request.headers['x-forwarded-for'] ||
request.headers['CF-Connecting-IP'] ||
request.socket?.remoteAddress ||
'unknown',
host: this.getIp(request),
method: request.method,
url: request.url,
body: request.body,
Expand All @@ -39,4 +36,15 @@ export class LoggingInterceptor implements NestInterceptor {
}),
);
}

private getIp(request: Request) {
const forwardedFor = request.headers['x-forwarded-for'];

if (typeof forwardedFor === 'string') {
const forwardedIps = forwardedFor.split(',');
return forwardedIps[0].trim();
}

return request.socket.remoteAddress;
}
}
17 changes: 12 additions & 5 deletions server/src/feed/feed.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,7 @@ export class FeedService {
response: Response,
) {
const cookie = request.headers.cookie;
const ip =
request.headers['CF-Connecting-IP'] ||
request.headers['x-forwarded-for'] ||
request.socket?.remoteAddress ||
'unknown';
const ip = this.getIp(request);
if (ip && this.isString(ip)) {
const redis = this.redisService.redisClient;
const [feed, hasCookie, hasIpFlag] = await Promise.all([
Expand Down Expand Up @@ -219,4 +215,15 @@ export class FeedService {
return dateNext.getTime() - dateCurrent.getTime();
});
}

private getIp(request: Request) {
const forwardedFor = request.headers['x-forwarded-for'];

if (typeof forwardedFor === 'string') {
const forwardedIps = forwardedFor.split(',');
return forwardedIps[0].trim();
}

return request.socket.remoteAddress;
}
}
Loading