Greenbids fix geolookup: fetch from official MaxMind URL + mock dbReader UT #3626
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,52 +1,120 @@ | ||
| package org.prebid.server.hooks.modules.greenbids.real.time.data.config; | ||
|
|
||
| import io.netty.handler.codec.http.HttpResponseStatus; | ||
| import io.vertx.core.file.FileSystem; | ||
| import io.vertx.core.http.HttpClientRequest; | ||
| import io.vertx.core.http.HttpClientResponse; | ||
| import com.maxmind.db.Reader; | ||
| import io.vertx.core.Future; | ||
| import io.vertx.core.Promise; | ||
| import io.vertx.core.Vertx; | ||
| import com.maxmind.geoip2.DatabaseReader; | ||
| import io.vertx.core.file.OpenOptions; | ||
| import io.vertx.core.http.HttpMethod; | ||
| import io.vertx.core.http.RequestOptions; | ||
| import org.apache.commons.compress.archivers.tar.TarArchiveEntry; | ||
| import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; | ||
| import org.prebid.server.exception.PreBidException; | ||
| import org.prebid.server.log.Logger; | ||
| import org.prebid.server.log.LoggerFactory; | ||
| import org.prebid.server.vertx.Initializable; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.concurrent.atomic.AtomicReference; | ||
| import java.util.zip.GZIPInputStream; | ||
|
|
||
| public class DatabaseReaderFactory implements Initializable { | ||
|
|
||
| private static final Logger logger = LoggerFactory.getLogger(DatabaseReaderFactory.class); | ||
|
|
||
| private final GreenbidsRealTimeDataProperties properties; | ||
|
|
||
| private final Vertx vertx; | ||
|
|
||
| private final AtomicReference<DatabaseReader> databaseReaderRef = new AtomicReference<>(); | ||
|
|
||
| private final FileSystem fileSystem; | ||
|
|
||
| public DatabaseReaderFactory( | ||
EvgeniiMunin marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| GreenbidsRealTimeDataProperties properties, Vertx vertx) { | ||
| this.properties = properties; | ||
| this.vertx = vertx; | ||
| this.fileSystem = vertx.fileSystem(); | ||
| } | ||
|
|
||
| @Override | ||
| public void initialize(Promise<Void> initializePromise) { | ||
| vertx.executeBlocking(() -> downloadAndExtract().onSuccess(databaseReaderRef::set)) | ||
EvgeniiMunin marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| .<Void>mapEmpty() | ||
| .onComplete(initializePromise); | ||
| } | ||
|
|
||
| private Future<DatabaseReader> downloadAndExtract() { | ||
| final String downloadUrl = properties.getGeoLiteCountryPath(); | ||
| final String tmpPath = properties.getTmpPath(); | ||
| return downloadFile(downloadUrl, tmpPath) | ||
| .map(unused -> extractMMDB(tmpPath)) | ||
EvgeniiMunin marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| .onComplete(ar -> removeFile(tmpPath)); | ||
| } | ||
|
|
||
| private Future<Void> downloadFile(String downloadUrl, String tmpPath) { | ||
| return fileSystem.open(tmpPath, new OpenOptions()) | ||
| .compose(tmpFile -> sendHttpRequest(downloadUrl) | ||
| .compose(response -> response.pipeTo(tmpFile)) | ||
|
||
| .onFailure(error -> logger.error( | ||
| "Failed to download file from {} to {}.", downloadUrl, tmpPath, error))); | ||
| } | ||
|
|
||
| private Future<HttpClientResponse> sendHttpRequest(String url) { | ||
| final RequestOptions options = new RequestOptions() | ||
| .setFollowRedirects(true) | ||
| .setMethod(HttpMethod.GET) | ||
| .setTimeout(properties.getTimeoutMs()) | ||
| .setAbsoluteURI(url); | ||
|
|
||
| return vertx.createHttpClient().request(options) | ||
EvgeniiMunin marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| .compose(HttpClientRequest::send) | ||
| .map(this::validateResponse); | ||
| } | ||
|
|
||
| private HttpClientResponse validateResponse(HttpClientResponse response) { | ||
| final int statusCode = response.statusCode(); | ||
| if (statusCode != HttpResponseStatus.OK.code()) { | ||
| throw new PreBidException("Got unexpected response from server with status code %s and message %s" | ||
| .formatted(statusCode, response.statusMessage())); | ||
| } | ||
| return response; | ||
| } | ||
|
|
||
| private DatabaseReader extractMMDB(String tarGzPath) { | ||
| try (GZIPInputStream gis = new GZIPInputStream(Files.newInputStream(Path.of(tarGzPath))); | ||
| TarArchiveInputStream tarInput = new TarArchiveInputStream(gis)) { | ||
|
|
||
| TarArchiveEntry currentEntry; | ||
| boolean hasDatabaseFile = false; | ||
| while ((currentEntry = tarInput.getNextTarEntry()) != null) { | ||
| if (currentEntry.getName().contains("GeoLite2-Country.mmdb")) { | ||
| hasDatabaseFile = true; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (!hasDatabaseFile) { | ||
| throw new PreBidException("GeoLite2-Country.mmdb not found in the archive"); | ||
| } | ||
|
|
||
| return new DatabaseReader.Builder(tarInput) | ||
| .fileMode(Reader.FileMode.MEMORY).build(); | ||
| } catch (IOException e) { | ||
| throw new PreBidException("Failed to extract MMDB file", e); | ||
| } | ||
| } | ||
|
|
||
| private void removeFile(String filePath) { | ||
| fileSystem.delete(filePath) | ||
EvgeniiMunin marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| .onFailure(err -> logger.error("Failed to remove file {}", filePath, err)); | ||
| } | ||
|
|
||
| public DatabaseReader getDatabaseReader() { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about to use
RemoteFileSyncerV2instead of this class? Just configureupdate-interval-ms: 0. You can see example of using it withMaxMindGeoLocationService.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I remember from our discussion with @AntoxaAntoxic , we have discussed whether to reuse or not RemoteFileSyncerV2 and the public get() method of
RemoteFileSuppliercalled in syncer and decided to not do that and to proceed with defining methodsvalidateResponse,sendHttpRequest,downloadFileon the side of RTD module