|
|
|
|
@ -8,6 +8,10 @@ import GRDB
|
|
|
|
|
import SessionSnodeKit
|
|
|
|
|
import SessionUtilitiesKit
|
|
|
|
|
|
|
|
|
|
private extension Log.Category {
|
|
|
|
|
static var ip2Country: Log.Category = "IP2Country"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public enum IP2Country {
|
|
|
|
|
public static var isInitialized: Atomic<Bool> = Atomic(false)
|
|
|
|
|
private static var countryNamesCache: Atomic<[String: String]> = Atomic([:])
|
|
|
|
|
@ -46,7 +50,7 @@ public enum IP2Country {
|
|
|
|
|
/// (or `en` as default), then find the `geonameId` index from `countryLocationsGeonameId` using the same range, and that index
|
|
|
|
|
/// should be retrieved from `countryLocationsCountryName` in order to get the country name
|
|
|
|
|
struct IP2CountryCache {
|
|
|
|
|
var countryBlocksIPInt: [Int] = []
|
|
|
|
|
var countryBlocksIPInt: [Int64] = []
|
|
|
|
|
var countryBlocksGeonameId: [String] = []
|
|
|
|
|
|
|
|
|
|
var countryLocationsLocaleCode: [String] = []
|
|
|
|
|
@ -70,7 +74,14 @@ public enum IP2Country {
|
|
|
|
|
var remainingData: Data = data.advanced(by: MemoryLayout<Int32>.size)
|
|
|
|
|
|
|
|
|
|
/// Extract the IPs
|
|
|
|
|
var countryBlockIpInts: [Int] = [Int](repeating: 0, count: Int(countryBlockIPCount))
|
|
|
|
|
var countryBlockIpInts: [Int64] = [Int64](repeating: 0, count: Int(countryBlockIPCount))
|
|
|
|
|
remainingData.withUnsafeBytes { buffer in
|
|
|
|
|
_ = countryBlockIpInts.withUnsafeMutableBytes { ipBuffer in
|
|
|
|
|
memcpy(ipBuffer.baseAddress, buffer.baseAddress, Int(countryBlockIPCount) * MemoryLayout<Int64>.size)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var countryBlockIpInts2: [Int] = [Int](repeating: 0, count: Int(countryBlockIPCount))
|
|
|
|
|
remainingData.withUnsafeBytes { buffer in
|
|
|
|
|
_ = countryBlockIpInts.withUnsafeMutableBytes { ipBuffer in
|
|
|
|
|
memcpy(ipBuffer.baseAddress, buffer.baseAddress, Int(countryBlockIPCount) * MemoryLayout<Int>.size)
|
|
|
|
|
@ -78,31 +89,55 @@ public enum IP2Country {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Extract arrays from the parts
|
|
|
|
|
func consumeStringArray(from targetData: inout Data) -> [String] {
|
|
|
|
|
var targetCount: Int32 = 0
|
|
|
|
|
_ = withUnsafeMutableBytes(of: &targetCount) { countBuffer in
|
|
|
|
|
targetData.copyBytes(to: countBuffer, from: ..<MemoryLayout<Int32>.size)
|
|
|
|
|
func consumeStringArray(_ name: String, from targetData: inout Data) -> [String] {
|
|
|
|
|
/// The data should have a count, followed by actual data (so should have more data than an Int32 would take
|
|
|
|
|
guard targetData.count > MemoryLayout<Int32>.size else {
|
|
|
|
|
Log.error(.ip2Country, "\(name) doesn't have enough data after the count.")
|
|
|
|
|
return []
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Move past the count
|
|
|
|
|
targetData = targetData.advanced(by: MemoryLayout<Int32>.size)
|
|
|
|
|
var targetCount: Int32 = targetData
|
|
|
|
|
.prefix(MemoryLayout<Int32>.size)
|
|
|
|
|
.withUnsafeBytes { bytes -> Int32 in
|
|
|
|
|
guard
|
|
|
|
|
bytes.count >= MemoryLayout<Int32>.size,
|
|
|
|
|
let baseAddress: UnsafePointer<Int32> = bytes
|
|
|
|
|
.bindMemory(to: Int32.self)
|
|
|
|
|
.baseAddress
|
|
|
|
|
else { return 0 }
|
|
|
|
|
|
|
|
|
|
return baseAddress.pointee
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Move past the count and extract the content data
|
|
|
|
|
targetData = targetData.dropFirst(MemoryLayout<Int32>.size)
|
|
|
|
|
let contentData: Data = targetData.prefix(Int(targetCount))
|
|
|
|
|
|
|
|
|
|
guard
|
|
|
|
|
targetData.count >= targetCount,
|
|
|
|
|
let contentString: String = String(data: Data(targetData[..<targetCount]), encoding: .utf8)
|
|
|
|
|
else { return [] }
|
|
|
|
|
!contentData.isEmpty,
|
|
|
|
|
let contentString: String = String(data: contentData, encoding: .utf8)
|
|
|
|
|
else {
|
|
|
|
|
Log.error(.ip2Country, "\(name) failed to convert the content to a string.")
|
|
|
|
|
return []
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// There was a crash related to advancing the data in an invalid way in `2.7.0`, if this does occur then
|
|
|
|
|
/// we want to know about it so add a log
|
|
|
|
|
if targetCount > targetData.count {
|
|
|
|
|
Log.error(.ip2Country, "\(name) suggested it had mare data then was actually available (\(targetCount) vs. \(targetData.count)).")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Move past the data and return the result
|
|
|
|
|
targetData = targetData.advanced(by: Int(targetCount))
|
|
|
|
|
targetData = targetData.dropFirst(Int(targetCount))
|
|
|
|
|
return contentString.components(separatedBy: "\0\0")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Move past the IP data
|
|
|
|
|
remainingData = remainingData.advanced(by: (Int(countryBlockIPCount) * MemoryLayout<Int>.size))
|
|
|
|
|
let countryBlocksGeonameIds: [String] = consumeStringArray(from: &remainingData)
|
|
|
|
|
let countryLocaleCodes: [String] = consumeStringArray(from: &remainingData)
|
|
|
|
|
let countryGeonameIds: [String] = consumeStringArray(from: &remainingData)
|
|
|
|
|
let countryNames: [String] = consumeStringArray(from: &remainingData)
|
|
|
|
|
remainingData = remainingData.advanced(by: (Int(countryBlockIPCount) * MemoryLayout<Int64>.size))
|
|
|
|
|
let countryBlocksGeonameIds: [String] = consumeStringArray("CountryBlocks", from: &remainingData)
|
|
|
|
|
let countryLocaleCodes: [String] = consumeStringArray("LocaleCodes", from: &remainingData)
|
|
|
|
|
let countryGeonameIds: [String] = consumeStringArray("Geonames", from: &remainingData)
|
|
|
|
|
let countryNames: [String] = consumeStringArray("CountryNames", from: &remainingData)
|
|
|
|
|
|
|
|
|
|
return IP2CountryCache(
|
|
|
|
|
countryBlocksIPInt: countryBlockIpInts,
|
|
|
|
|
@ -151,7 +186,7 @@ public enum IP2Country {
|
|
|
|
|
guard nameCache["\(ip)-\(currentLocale)"] == nil else { return }
|
|
|
|
|
|
|
|
|
|
guard
|
|
|
|
|
let ipAsInt: Int = IPv4.toInt(ip),
|
|
|
|
|
let ipAsInt: Int64 = IPv4.toInt(ip),
|
|
|
|
|
let countryBlockGeonameIdIndex: Int = cache.countryBlocksIPInt.firstIndex(where: { $0 > ipAsInt }).map({ $0 - 1 }),
|
|
|
|
|
let localeStartIndex: Int = cache.countryLocationsLocaleCode.firstIndex(where: { $0 == currentLocale }),
|
|
|
|
|
let countryNameIndex: Int = Array(cache.countryLocationsGeonameId[localeStartIndex...]).firstIndex(where: { geonameId in
|
|
|
|
|
|
Morgan Pretty
8 months ago