mirror of
https://github.com/fluxerapp/fluxer
synced 2026-10-12 13:38:31 +09:00
refactor(ban): drop ipinfo cgnat blast-radius guard (#3062)
This commit is contained in:
1 parent
ca719e7b5e
commit
af49cd6cc4
45 files changed
+10
-2153
No files matched your search
@@ -6,7 +6,6 @@ import {AdminService} from '@app/api/admin/AdminService';
|
||||
import {AuthRequestService} from '@app/api/auth/AuthRequestService';
|
||||
import {DesktopHandoffService} from '@app/api/auth/services/DesktopHandoffService';
|
||||
import {SsoService} from '@app/api/auth/services/SsoService';
|
||||
import {buildIpInfoCache, buildIpInfoRequestAuditLogger} from '@app/api/ban/IpInfoCacheFactory';
|
||||
import type {IBlueskyOAuthService} from '@app/api/bluesky/IBlueskyOAuthService';
|
||||
import {Config} from '@app/api/Config';
|
||||
import {createApiContext} from '@app/api/CreateApiContext';
|
||||
@@ -138,7 +137,6 @@ import {getRequestClientIp} from '@app/api/utils/RequestClientIp';
|
||||
import {VoiceService} from '@app/api/voice/VoiceService';
|
||||
import {WebhookRequestService} from '@app/api/webhook/WebhookRequestService';
|
||||
import {WebhookService} from '@app/api/webhook/WebhookService';
|
||||
import {createIpInfoService, createUnavailableIpInfoService, type IpInfoService} from '@pkgs/geoip/src/IpInfoService';
|
||||
import {createMiddleware} from 'hono/factory';
|
||||
|
||||
export {initializeServiceSingletons} from '@app/api/middleware/ServiceSingletons';
|
||||
@@ -172,33 +170,6 @@ export function shutdownReportService(): void {
|
||||
}
|
||||
}
|
||||
|
||||
let _ipInfoService: IpInfoService | null = null;
|
||||
let _injectedIpInfoService: IpInfoService | undefined;
|
||||
|
||||
export function setInjectedIpInfoService(service: IpInfoService | undefined): void {
|
||||
_injectedIpInfoService = service;
|
||||
}
|
||||
|
||||
export function getIpInfoService(): IpInfoService {
|
||||
if (_injectedIpInfoService) {
|
||||
return _injectedIpInfoService;
|
||||
}
|
||||
if (_ipInfoService) return _ipInfoService;
|
||||
if (!Config.ipinfo.apiKey) {
|
||||
_ipInfoService = createUnavailableIpInfoService('IPInfo API key not configured');
|
||||
return _ipInfoService;
|
||||
}
|
||||
const cache = buildIpInfoCache({
|
||||
hot: getCacheService(),
|
||||
});
|
||||
_ipInfoService = createIpInfoService({
|
||||
apiKey: Config.ipinfo.apiKey,
|
||||
cache,
|
||||
auditLogger: buildIpInfoRequestAuditLogger(),
|
||||
});
|
||||
return _ipInfoService;
|
||||
}
|
||||
|
||||
let _liveKitWebhookService: LiveKitWebhookService | null = null;
|
||||
|
||||
function getLiveKitWebhookService(): LiveKitWebhookService | null {
|
||||
@@ -349,7 +320,6 @@ class RequestServices implements RequestScopedServices {
|
||||
voiceRoomStore: this.voiceRooms,
|
||||
liveKitService: this.liveKit,
|
||||
voiceAvailabilityService: getVoiceAvailabilityService(),
|
||||
ipInfoService: getIpInfoService(),
|
||||
});
|
||||
return this.cachedGuildStack;
|
||||
}
|
||||
@@ -544,7 +514,6 @@ class RequestServices implements RequestScopedServices {
|
||||
getApplicationRepository(),
|
||||
this.stripeService.getStripe(),
|
||||
new JobLedgerRepository(),
|
||||
getIpInfoService(),
|
||||
this.storeEntitlementService,
|
||||
);
|
||||
return this.cachedAdminService;
|
||||
@@ -931,6 +900,5 @@ export const ServiceMiddleware = createMiddleware<HonoEnv>(async (ctx, next) =>
|
||||
|
||||
export function resetServiceMiddlewareForTesting(): void {
|
||||
shutdownReportService();
|
||||
_ipInfoService = null;
|
||||
_liveKitWebhookService = null;
|
||||
}
|
||||
Reference in new issue
Block a user