Commit: f0438c2

Commit Details

SHA	`f0438c2cbc2d838bb66a4d8129dd25b5d48d28ee`
Tree	`b8e53d050248c8b632fa3de86003489acae4670b`
Author	<f69e50@finnacloud.com> 1766443042 +0300
Committer	<f69e50@finnacloud.com> 1766443042 +0300
Message	increment once more
GPG Signature	-----BEGIN PGP SIGNATURE----- iQJSBAABCAA8FiEEWJb139mJI+vZ81KkoAIVSUsXI0oFAmlJyCIeHHNvcGhpYS5l cmFzbGFuQGZpbm5hY2xvdWQuY29tAAoJEKACFUlLFyNKtrgP/04FZPSa4Hmx9WpR gOamzjIXc+1+pBvGQDairLZU6rtDSgNkoryrsqOOLIXZWkkxZ70q8/aXQBFThr+t YyDIz85u9GiwPOV8o1X4sxzF7bupOd6YmOOPqS2vco1aibpB8w9N9EwlMzW95Otw vnQ/h0kz8MTp0wfXeRJqvLg8DVPnLgW70ly1TZQe19jEA4NwBZOyK2ksTis8iycX HUM4WW8Velo8O+OtygAbwISr2dILKvkclTLn9kgfpN5esvBvJu4K+xA5T5alDchc PY3FFeZteQf3GX4v0EH8K3c/q8OcQFMxuRGO31uYGqNbjbOB7zdZVs3N0B1m1efv vhCgZ6gyxlz0kiozgO6Sx5WFOzHuTlguCK+x0JOtzCokRL/VLiPzmW5Umt280eJz AlD7u7Dah3khoqDkzXfCL1lxch9tRMVMUYWRMayxC3iculCFM6OCLgzY9hay5y1j WP1ZOdy/x9jKPoLv5USnw0KlH4rZIHH+aDMDEzWmWUWYDpShylG7sKafXg75bnho 5LbAfCucnDrkjN+rx1dxaKrZswQlIJ8iZ5Q6DzHnDzl4TaFcN1E3exS+xp46H7va SbR94UfpCyjpTQ2hHdOS7XHINFUDIzWF3mUZ8gqyEANiqpgJ+RcOGX66s69oILpr vD20SIdMHWDqJH3G6GMNsg1g5/QU =YrcG -----END PGP SIGNATURE----- ✓ Verified

File: src/main/java/com/paymentlink/service/GeoIpService.java

← Back to commit | View | Raw | History | Compare

      
      package com.paymentlink.service;
    
      import com.github.benmanes.caffeine.cache.Cache;
    
      import com.github.benmanes.caffeine.cache.Caffeine;
    
      import com.maxmind.geoip2.DatabaseReader;
    
      import com.maxmind.geoip2.exception.GeoIp2Exception;
    
      import com.maxmind.geoip2.model.CountryResponse;
    
      import com.paymentlink.model.dto.CountryInfo;
    
      import com.paymentlink.model.entity.Region;
    
      import com.paymentlink.repository.RegionRepository;
    
      import jakarta.annotation.PostConstruct;
    
      import jakarta.servlet.http.HttpServletRequest;
    
      import org.slf4j.Logger;
    
      import org.slf4j.LoggerFactory;
    
      import org.springframework.beans.factory.annotation.Value;
    
      import org.springframework.core.io.ClassPathResource;
    
      import org.springframework.stereotype.Service;
    
      import java.io.IOException;
    
      import java.io.InputStream;
    
      import java.net.InetAddress;
    
      import java.util.Optional;
    
      import java.util.concurrent.TimeUnit;
    
      @Service
    
      public class GeoIpService {
    
          private static final Logger logger = LoggerFactory.getLogger(GeoIpService.class);
    
          private DatabaseReader databaseReader;
    
          private Cache<String, CountryInfo> ipCache;
    
          private final RegionRepository regionRepository;
    
          @Value("${geoip.database.path:classpath:ip-to-country.mmdb}")
    
          private String databasePath;
    
          @Value("${geoip.cache.size:10000}")
    
          private int cacheSize;
    
          @Value("${geoip.cache.ttl:3600000}")
    
          private long cacheTtl;
    
          public GeoIpService(RegionRepository regionRepository) {
    
              this.regionRepository = regionRepository;
    
          }
    
          @PostConstruct
    
          public void init() {
    
              logger.info("Initializing GeoIP Service with database: {}", databasePath);
    
              try {
    
                  // Try to load MMDB file from classpath
    
                  ClassPathResource resource = new ClassPathResource("GeoLite2-Country.mmdb");
    
                  if (resource.exists()) {
    
                      InputStream inputStream = resource.getInputStream();
    
                      databaseReader = new DatabaseReader.Builder(inputStream).build();
    
                      logger.info("GeoIP database loaded successfully");
    
                  } else {
    
                      logger.warn("GeoIP database file not found at: {}", databasePath);
    
                      logger.warn("GeoIP Service will operate in fallback mode (all requests default to US)");
    
                  }
    
              } catch (Exception e) {
    
                  logger.error("Failed to load GeoIP database: {} - {}", e.getClass().getSimpleName(), e.getMessage());
    
                  logger.warn("GeoIP Service will operate in fallback mode (all requests default to US)");
    
                  logger.info("To fix: Download a MaxMind GeoLite2-Country database from https://dev.maxmind.com/geoip/geolite2-free-geolocation-data");
    
                  databaseReader = null;
    
              }
    
              // Initialize local cache
    
              ipCache = Caffeine.newBuilder()
    
                      .maximumSize(cacheSize)
    
                      .expireAfterWrite(cacheTtl, TimeUnit.MILLISECONDS)
    
                      .build();
    
              logger.info("GeoIP Service initialized with cache size: {} and TTL: {}ms", cacheSize, cacheTtl);
    
          }
    
          /**
    
           * Get country information from IP address
    
           */
    
          public CountryInfo getCountryFromIp(String ipAddress) {
    
              if (ipAddress == null || ipAddress.isEmpty()) {
    
                  return getDefaultCountryInfo();
    
              }
    
              // If database reader is not available, use fallback
    
              if (databaseReader == null) {
    
                  logger.debug("GeoIP database not available, using fallback for IP: {}", ipAddress);
    
                  return getDefaultCountryInfo();
    
              }
    
              // Check cache first
    
              CountryInfo cached = ipCache.getIfPresent(ipAddress);
    
              if (cached != null) {
    
                  logger.debug("Cache hit for IP: {}", ipAddress);
    
                  return cached;
    
              }
    
              try {
    
                  InetAddress inetAddress = InetAddress.getByName(ipAddress);
    
                  CountryResponse response = databaseReader.country(inetAddress);
    
                  String countryCode = response.getCountry().getIsoCode();
    
                  CountryInfo countryInfo = buildCountryInfo(countryCode);
    
                  // Cache the result
    
                  ipCache.put(ipAddress, countryInfo);
    
                  logger.debug("GeoIP lookup for IP: {} -> Country: {}", ipAddress, countryCode);
    
                  return countryInfo;
    
              } catch (Exception e) {
    
                  logger.warn("Failed to lookup IP: {} - {}", ipAddress, e.getMessage());
    
                  return getDefaultCountryInfo();
    
              }
    
          }
    
          /**
    
           * Extract IP address from HTTP request
    
           */
    
          public String extractIpFromRequest(HttpServletRequest request) {
    
              // Try X-Real-IP first (commonly set by reverse proxies)
    
              String ip = request.getHeader("X-Real-IP");
    
              if (ip == null || ip.isEmpty()) {
    
                  // Fallback to X-Forwarded-For
    
                  ip = request.getHeader("X-Forwarded-For");
    
                  if (ip != null && ip.contains(",")) {
    
                      // X-Forwarded-For can contain multiple IPs, take the first one
    
                      ip = ip.split(",")[0].trim();
    
                  }
    
              }
    
              if (ip == null || ip.isEmpty()) {
    
                  // Final fallback to remote address
    
                  ip = request.getRemoteAddr();
    
              }
    
              logger.debug("Extracted IP from request: {}", ip);
    
              return ip;
    
          }
    
          /**
    
           * Get country info from HTTP request
    
           */
    
          public CountryInfo getCountryFromRequest(HttpServletRequest request) {
    
              String ip = extractIpFromRequest(request);
    
              return getCountryFromIp(ip);
    
          }
    
          /**
    
           * Build CountryInfo from country code by looking up Region table
    
           */
    
          private CountryInfo buildCountryInfo(String countryCode) {
    
              Optional<Region> regionOpt = regionRepository.findByCountryCode(countryCode);
    
              if (regionOpt.isPresent()) {
    
                  Region region = regionOpt.get();
    
                  return CountryInfo.builder()
    
                          .countryCode(region.getCountryCode())
    
                          .countryName(region.getCountryName())
    
                          .languageCode(region.getLanguageCode())
    
                          .currencyCode(region.getCurrencyCode())
    
                          .enabled(region.getEnabled())
    
                          .build();
    
              } else {
    
                  // Return basic info if region not in database
    
                  logger.warn("Country code {} not found in regions table", countryCode);
    
                  return CountryInfo.builder()
    
                          .countryCode(countryCode)
    
                          .countryName(countryCode)
    
                          .languageCode("en")
    
                          .currencyCode("USD")
    
                          .enabled(false)
    
                          .build();
    
              }
    
          }
    
          /**
    
           * Get default country info (US) when IP lookup fails
    
           */
    
          private CountryInfo getDefaultCountryInfo() {
    
              return CountryInfo.builder()
    
                      .countryCode("US")
    
                      .countryName("United States")
    
                      .languageCode("en")
    
                      .currencyCode("USD")
    
                      .enabled(true)
    
                      .build();
    
          }
    
          /**
    
           * Clear cache (for testing or manual refresh)
    
           */
    
          public void clearCache() {
    
              ipCache.invalidateAll();
    
              logger.info("GeoIP cache cleared");
    
          }
    
      }

1	package com.paymentlink.service;
2
3	import com.github.benmanes.caffeine.cache.Cache;
4	import com.github.benmanes.caffeine.cache.Caffeine;
5	import com.maxmind.geoip2.DatabaseReader;
6	import com.maxmind.geoip2.exception.GeoIp2Exception;
7	import com.maxmind.geoip2.model.CountryResponse;
8	import com.paymentlink.model.dto.CountryInfo;
9	import com.paymentlink.model.entity.Region;
10	import com.paymentlink.repository.RegionRepository;
11	import jakarta.annotation.PostConstruct;
12	import jakarta.servlet.http.HttpServletRequest;
13	import org.slf4j.Logger;
14	import org.slf4j.LoggerFactory;
15	import org.springframework.beans.factory.annotation.Value;
16	import org.springframework.core.io.ClassPathResource;
17	import org.springframework.stereotype.Service;
18
19	import java.io.IOException;
20	import java.io.InputStream;
21	import java.net.InetAddress;
22	import java.util.Optional;
23	import java.util.concurrent.TimeUnit;
24
25	@Service
26	public class GeoIpService {
27
28	private static final Logger logger = LoggerFactory.getLogger(GeoIpService.class);
29
30	private DatabaseReader databaseReader;
31	private Cache<String, CountryInfo> ipCache;
32
33	private final RegionRepository regionRepository;
34
35	@Value("${geoip.database.path:classpath:ip-to-country.mmdb}")
36	private String databasePath;
37
38	@Value("${geoip.cache.size:10000}")
39	private int cacheSize;
40
41	@Value("${geoip.cache.ttl:3600000}")
42	private long cacheTtl;
43
44	public GeoIpService(RegionRepository regionRepository) {
45	this.regionRepository = regionRepository;
46	}
47
48	@PostConstruct
49	public void init() {
50	logger.info("Initializing GeoIP Service with database: {}", databasePath);
51
52	try {
53	// Try to load MMDB file from classpath
54	ClassPathResource resource = new ClassPathResource("GeoLite2-Country.mmdb");
55	if (resource.exists()) {
56	InputStream inputStream = resource.getInputStream();
57	databaseReader = new DatabaseReader.Builder(inputStream).build();
58	logger.info("GeoIP database loaded successfully");
59	} else {
60	logger.warn("GeoIP database file not found at: {}", databasePath);
61	logger.warn("GeoIP Service will operate in fallback mode (all requests default to US)");
62	}
63	} catch (Exception e) {
64	logger.error("Failed to load GeoIP database: {} - {}", e.getClass().getSimpleName(), e.getMessage());
65	logger.warn("GeoIP Service will operate in fallback mode (all requests default to US)");
66	logger.info("To fix: Download a MaxMind GeoLite2-Country database from https://dev.maxmind.com/geoip/geolite2-free-geolocation-data");
67	databaseReader = null;
68	}
69
70	// Initialize local cache
71	ipCache = Caffeine.newBuilder()
72	.maximumSize(cacheSize)
73	.expireAfterWrite(cacheTtl, TimeUnit.MILLISECONDS)
74	.build();
75
76	logger.info("GeoIP Service initialized with cache size: {} and TTL: {}ms", cacheSize, cacheTtl);
77	}
78
79	/**
80	* Get country information from IP address
81	*/
82	public CountryInfo getCountryFromIp(String ipAddress) {
83	if (ipAddress == null \|\| ipAddress.isEmpty()) {
84	return getDefaultCountryInfo();
85	}
86
87	// If database reader is not available, use fallback
88	if (databaseReader == null) {
89	logger.debug("GeoIP database not available, using fallback for IP: {}", ipAddress);
90	return getDefaultCountryInfo();
91	}
92
93	// Check cache first
94	CountryInfo cached = ipCache.getIfPresent(ipAddress);
95	if (cached != null) {
96	logger.debug("Cache hit for IP: {}", ipAddress);
97	return cached;
98	}
99
100	try {
101	InetAddress inetAddress = InetAddress.getByName(ipAddress);
102	CountryResponse response = databaseReader.country(inetAddress);
103	String countryCode = response.getCountry().getIsoCode();
104
105	CountryInfo countryInfo = buildCountryInfo(countryCode);
106
107	// Cache the result
108	ipCache.put(ipAddress, countryInfo);
109
110	logger.debug("GeoIP lookup for IP: {} -> Country: {}", ipAddress, countryCode);
111	return countryInfo;
112
113	} catch (Exception e) {
114	logger.warn("Failed to lookup IP: {} - {}", ipAddress, e.getMessage());
115	return getDefaultCountryInfo();
116	}
117	}
118
119	/**
120	* Extract IP address from HTTP request
121	*/
122	public String extractIpFromRequest(HttpServletRequest request) {
123	// Try X-Real-IP first (commonly set by reverse proxies)
124	String ip = request.getHeader("X-Real-IP");
125
126	if (ip == null \|\| ip.isEmpty()) {
127	// Fallback to X-Forwarded-For
128	ip = request.getHeader("X-Forwarded-For");
129	if (ip != null && ip.contains(",")) {
130	// X-Forwarded-For can contain multiple IPs, take the first one
131	ip = ip.split(",")[0].trim();
132	}
133	}
134
135	if (ip == null \|\| ip.isEmpty()) {
136	// Final fallback to remote address
137	ip = request.getRemoteAddr();
138	}
139
140	logger.debug("Extracted IP from request: {}", ip);
141	return ip;
142	}
143
144	/**
145	* Get country info from HTTP request
146	*/
147	public CountryInfo getCountryFromRequest(HttpServletRequest request) {
148	String ip = extractIpFromRequest(request);
149	return getCountryFromIp(ip);
150	}
151
152	/**
153	* Build CountryInfo from country code by looking up Region table
154	*/
155	private CountryInfo buildCountryInfo(String countryCode) {
156	Optional<Region> regionOpt = regionRepository.findByCountryCode(countryCode);
157
158	if (regionOpt.isPresent()) {
159	Region region = regionOpt.get();
160	return CountryInfo.builder()
161	.countryCode(region.getCountryCode())
162	.countryName(region.getCountryName())
163	.languageCode(region.getLanguageCode())
164	.currencyCode(region.getCurrencyCode())
165	.enabled(region.getEnabled())
166	.build();
167	} else {
168	// Return basic info if region not in database
169	logger.warn("Country code {} not found in regions table", countryCode);
170	return CountryInfo.builder()
171	.countryCode(countryCode)
172	.countryName(countryCode)
173	.languageCode("en")
174	.currencyCode("USD")
175	.enabled(false)
176	.build();
177	}
178	}
179
180	/**
181	* Get default country info (US) when IP lookup fails
182	*/
183	private CountryInfo getDefaultCountryInfo() {
184	return CountryInfo.builder()
185	.countryCode("US")
186	.countryName("United States")
187	.languageCode("en")
188	.currencyCode("USD")
189	.enabled(true)
190	.build();
191	}
192
193	/**
194	* Clear cache (for testing or manual refresh)
195	*/
196	public void clearCache() {
197	ipCache.invalidateAll();
198	logger.info("GeoIP cache cleared");
199	}
200	}
201

backend

Commit: f0438c2

Commit Details

File: src/main/java/com/paymentlink/service/GeoIpService.java