Julien Castiaux
04e972660b
Every request comes with a session, a dictionary that is persisted on the filesystem and that saves various information such as the user cart on the ecommerce. When a user simply visits the website, a default session is created and saved on disk, this bloats the filestore with many sessions. Creating the session on-the-fly is cheaper than loading it from the filesystem. With this work the default session is not saved on disk anymore unless explicitly asked via `session.touch()`. An exception to the statement "creating the session on-the-fly is cheaper" is geoip, the ip geolocalization is not cheap. In this work, geoip have been moved from http_routing/request.session.geoip to a lazy property core/request.geoip. When requested the info is persisted on the session. Like other keys from the default session, geoip will not be persisted unless there is non-default stuff in the session. Because the CSRF-TOKEN is based on the session-id, it is important the session-id stays the same across multiples requests even when the session is not persisted on disk. Even when a session is not persisted on disk, the session-id cookie is still set so that the next session created on-the-fly uses the same session-id. Technical note regarding the session, it has been decided to drop the session-snapshot protocol and to reintroduce a "modified" flag. It has been decided not to use werkzeug's session (which natively comes with a "modified" flag) and to keep our own session object. We decided to extend MutableMapping instead of dict; using MutableMapping we only have to override __setitem__ and __detitem__; using dict we would had to override update()/pop()/... too. Task: 2789035 Part-of: odoo/odoo#86015
67 lines
2.1 KiB
Python
67 lines
2.1 KiB
Python
#!/usr/bin/env python
|
|
# -*- coding: utf-8 -*-
|
|
import os.path
|
|
|
|
try:
|
|
import GeoIP # Legacy
|
|
except ImportError:
|
|
GeoIP = None
|
|
|
|
try:
|
|
import geoip2
|
|
import geoip2.database
|
|
except ImportError:
|
|
geoip2 = None
|
|
|
|
class GeoIPResolver(object):
|
|
def __init__(self, fname):
|
|
self.fname = fname
|
|
try:
|
|
self._db = geoip2.database.Reader(fname)
|
|
self.version = 2
|
|
except Exception:
|
|
try:
|
|
self._db = GeoIP.open(fname, GeoIP.GEOIP_STANDARD)
|
|
self.version = 1
|
|
assert self._db.database_info is not None
|
|
except Exception:
|
|
raise ValueError('Invalid GeoIP database: %r' % fname)
|
|
|
|
def __del__(self):
|
|
if self.version == 2:
|
|
self._db.close()
|
|
|
|
@classmethod
|
|
def open(cls, fname):
|
|
if not GeoIP and not geoip2:
|
|
return None
|
|
if not os.path.exists(fname):
|
|
return None
|
|
return GeoIPResolver(fname)
|
|
|
|
def resolve(self, ip):
|
|
if self.version == 1:
|
|
return self._db.record_by_addr(ip) or {}
|
|
elif self.version == 2:
|
|
try:
|
|
r = self._db.city(ip)
|
|
except (ValueError, geoip2.errors.AddressNotFoundError):
|
|
return {}
|
|
# Compatibility with Legacy database.
|
|
# Some ips cannot be located to a specific country. Legacy DB used to locate them in
|
|
# continent instead of country. Do the same to not change behavior of existing code.
|
|
country, attr = (r.country, 'iso_code') if r.country.geoname_id else (r.continent, 'code')
|
|
return {
|
|
'city': r.city.name,
|
|
'country_code': getattr(country, attr),
|
|
'country_name': country.name,
|
|
'latitude': r.location.latitude,
|
|
'longitude': r.location.longitude,
|
|
'region': r.subdivisions[0].iso_code if r.subdivisions else None,
|
|
'time_zone': r.location.time_zone,
|
|
}
|
|
|
|
# compat
|
|
def record_by_addr(self, addr):
|
|
return self.resolve(addr)
|