mirror of
https://github.com/openmax-server/server.git
synced 2026-05-23 03:51:43 +03:00
MAX & TT: теперь в качестве страны локации используется настоящая страна пользователя, а также зафиксировал версии библиотек в зависимостях
This commit is contained in:
@@ -197,7 +197,7 @@ class AuthProcessors(BaseProcessor):
|
||||
await self._send(writer, packet)
|
||||
self.logger.debug(f"Код для {phone}: {code} (существующий={user_exists})")
|
||||
|
||||
async def auth(self, payload, seq, writer, deviceType, deviceName, appVersion):
|
||||
async def auth(self, payload, seq, writer, deviceType, deviceName, appVersion, ip):
|
||||
"""Обработчик проверки кода"""
|
||||
try:
|
||||
VerifyCodePayloadModel.model_validate(payload)
|
||||
@@ -285,8 +285,10 @@ class AuthProcessors(BaseProcessor):
|
||||
hashed_login,
|
||||
deviceType,
|
||||
deviceName,
|
||||
"Little Saint James Island",
|
||||
int(time.time()),
|
||||
self.tools.get_geo(
|
||||
ip=ip, db_path=self.config.geo_db_path
|
||||
),
|
||||
int(time.time() * 1000),
|
||||
), # весь покрытый зеленью, абсолютно весь, остров невезения в океане есть
|
||||
)
|
||||
|
||||
@@ -333,7 +335,7 @@ class AuthProcessors(BaseProcessor):
|
||||
# Отправляем
|
||||
await self._send(writer, packet)
|
||||
|
||||
async def auth_confirm(self, payload, seq, writer, deviceType, deviceName, appVersion):
|
||||
async def auth_confirm(self, payload, seq, writer, deviceType, deviceName, appVersion, ip):
|
||||
"""Обработчик подтверждения регистрации нового пользователя"""
|
||||
# Валидируем данные пакета
|
||||
try:
|
||||
@@ -456,8 +458,10 @@ class AuthProcessors(BaseProcessor):
|
||||
hashed_login,
|
||||
deviceType or "ANDROID",
|
||||
deviceName or "Unknown",
|
||||
"Little Saint James Island",
|
||||
now_s,
|
||||
self.tools.get_geo(
|
||||
ip=ip, db_path=self.config.geo_db_path
|
||||
),
|
||||
now_ms,
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ class OnemeMobile:
|
||||
)
|
||||
else:
|
||||
await self.processors.auth(
|
||||
payload, seq, writer, deviceType, deviceName, appVersion
|
||||
payload, seq, writer, deviceType, deviceName, appVersion, address[0]
|
||||
)
|
||||
case self.opcodes.AUTH_CONFIRM:
|
||||
if not self.auth_rate_limiter.is_allowed(address[0]):
|
||||
@@ -126,7 +126,7 @@ class OnemeMobile:
|
||||
)
|
||||
elif payload and payload.get("tokenType") == "REGISTER":
|
||||
await self.processors.auth_confirm(
|
||||
payload, seq, writer, deviceType, deviceName, appVersion
|
||||
payload, seq, writer, deviceType, deviceName, appVersion, address[0]
|
||||
)
|
||||
else:
|
||||
self.logger.warning(
|
||||
|
||||
@@ -88,7 +88,7 @@ class OnemeWS:
|
||||
)
|
||||
else:
|
||||
await self.processors.auth(
|
||||
payload, seq, websocket, deviceType, deviceName, appVersion
|
||||
payload, seq, websocket, deviceType, deviceName, appVersion, address[0]
|
||||
)
|
||||
case self.opcodes.AUTH_CONFIRM:
|
||||
if not self.auth_rate_limiter.is_allowed(address[0]):
|
||||
@@ -100,7 +100,7 @@ class OnemeWS:
|
||||
)
|
||||
elif payload and payload.get("tokenType") == "REGISTER":
|
||||
await self.processors.auth_confirm(
|
||||
payload, seq, websocket, deviceType, deviceName, appVersion
|
||||
payload, seq, websocket, deviceType, deviceName, appVersion, address[0]
|
||||
)
|
||||
else:
|
||||
self.logger.warning(
|
||||
|
||||
Reference in New Issue
Block a user