Open GEO connection after checking config values

(Related #2289)
This commit is contained in:
games647 2021-03-28 22:41:03 +02:00
parent d50ad908d7
commit fc8c9d8748
No known key found for this signature in database
GPG Key ID: BFC68C8708713A88

View File

@ -186,8 +186,6 @@ public class GeoIpService {
* @throws IOException if failed during downloading and writing to destination file * @throws IOException if failed during downloading and writing to destination file
*/ */
private String downloadDatabaseArchive(Instant lastModified, Path destination) throws IOException { private String downloadDatabaseArchive(Instant lastModified, Path destination) throws IOException {
HttpURLConnection connection = (HttpURLConnection) new URL(ARCHIVE_URL).openConnection();
String clientId = settings.getProperty(ProtectionSettings.MAXMIND_API_CLIENT_ID); String clientId = settings.getProperty(ProtectionSettings.MAXMIND_API_CLIENT_ID);
String licenseKey = settings.getProperty(ProtectionSettings.MAXMIND_API_LICENSE_KEY); String licenseKey = settings.getProperty(ProtectionSettings.MAXMIND_API_LICENSE_KEY);
if (clientId.isEmpty() || licenseKey.isEmpty()) { if (clientId.isEmpty() || licenseKey.isEmpty()) {
@ -195,6 +193,8 @@ public class GeoIpService {
+ " GeoIp protections will be disabled."); + " GeoIp protections will be disabled.");
return null; return null;
} }
HttpURLConnection connection = (HttpURLConnection) new URL(ARCHIVE_URL).openConnection();
String basicAuth = "Basic " + new String(Base64.getEncoder().encode((clientId + ":" + licenseKey).getBytes())); String basicAuth = "Basic " + new String(Base64.getEncoder().encode((clientId + ":" + licenseKey).getBytes()));
connection.setRequestProperty("Authorization", basicAuth); connection.setRequestProperty("Authorization", basicAuth);