diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2025-12-20 19:07:05 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-20 19:07:05 +0900 |
| commit | ee8dccea2ffb151636e520f71b7dfe2b91e06c71 (patch) | |
| tree | 920d627b4d1f246684c799cc5312fbd99cc689b6 /packages/backend/src/server/api/ApiCallService.ts | |
| parent | fix(frontend): iPadOSのPWAでアプリを切り替えた際にウィジェ... (diff) | |
| download | misskey-ee8dccea2ffb151636e520f71b7dfe2b91e06c71.tar.gz misskey-ee8dccea2ffb151636e520f71b7dfe2b91e06c71.tar.bz2 misskey-ee8dccea2ffb151636e520f71b7dfe2b91e06c71.zip | |
fix(backend): fix #16994 by approach 6 (#17005)
* fix(backend): narrow down trustproxy default value and enhance documentation on how to configure it
* Update Changelog
* indent [ci skip]
* Update CHANGELOG.md [ci skip]
* add cloudflare specific example
* Update .config/example.yml
Co-authored-by: anatawa12 <anatawa12@icloud.com>
* fix: productionでIPレートリミットされる際にlocalhostからリクエストが来たらログを残すように
* fix: wrong condition
* fix: use own logger for signin api
* flip configuration
* fix
* fix [ci skip]
* fix: wrong message [ci skip]
* fix: どこがおかしいか明記 [ci skip]
---------
Co-authored-by: anatawa12 <anatawa12@icloud.com>
Diffstat (limited to 'packages/backend/src/server/api/ApiCallService.ts')
| -rw-r--r-- | packages/backend/src/server/api/ApiCallService.ts | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/packages/backend/src/server/api/ApiCallService.ts b/packages/backend/src/server/api/ApiCallService.ts index 261e147040..8bae46d9fb 100644 --- a/packages/backend/src/server/api/ApiCallService.ts +++ b/packages/backend/src/server/api/ApiCallService.ts @@ -313,16 +313,15 @@ export class ApiCallService implements OnApplicationShutdown { } if (ep.meta.limit) { - let limitActor: string | null; + let limitActor: string | null = null; if (user) { limitActor = user.id; - } else { - if (request.ip === '::1' || request.ip === '127.0.0.1') { - console.warn('request ip is localhost, maybe caused by misconfiguration of trustProxy or reverse proxy'); - limitActor = null; - } else { - limitActor = getIpHash(request.ip); + } else if (this.config.enableIpRateLimit) { + if (process.env.NODE_ENV === 'production' && (request.ip === '::1' || request.ip === '127.0.0.1')) { + this.logger.warn('Recieved API request from localhost IP address for rate limiting in production environment. This is likely due to an improper trustProxy setting in the config file.'); } + + limitActor = getIpHash(request.ip); } const limit = Object.assign({}, ep.meta.limit); |