github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-13 16:52:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Verify MaxMind license key and GeoLite2 database path before allowing install

Browse source
This commit is contained in:
JonnyWong16 2020-01-02 21:28:11 -08:00
parent 0e1764755a
commit 7d71086a41
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
data/interfaces/default/settings.html
View file

@ -1242,7 +1242,7 @@
</div> </div>
</div> </div>
<p class="help-block"> <p class="help-block">
Enter and save your MaxMind License Key to install the GeoLite2 database. Enter your MaxMind License Key to install the GeoLite2 database.
</p> </p>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -1250,13 +1250,14 @@
<div class="row"> <div class="row">
<div class="col-md-9"> <div class="col-md-9">
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" id="geoip_db" name="geoip_db" value="${config['geoip_db']}" ${docker_setting}> <input type="text" class="form-control" id="geoip_db" name="geoip_db" value="${config['geoip_db']}" ${docker_setting} data-parsley-trigger="change" data-parsley-pattern=".+\.mmdb$" data-parsley-errors-container="#geoip_db_error" data-parsley-error-message="Must end with '.mmdb'">
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-form" type="button" id="install_geoip_db" disabled>${'Update' if config["geoip_db_installed"] else 'Install'}</button> <button class="btn btn-form" type="button" id="install_geoip_db">${'Update' if config["geoip_db_installed"] else 'Install'}</button>
<button class="btn btn-form" type="button" id="uninstall_geoip_db">Uninstall</button> <button class="btn btn-form" type="button" id="uninstall_geoip_db">Uninstall</button>
</span> </span>
</div> </div>
</div> </div>
<div id="geoip_db_error" class="alert alert-danger settings-alert" role="alert"></div>
</div> </div>
<p class="help-block"> <p class="help-block">
GeoLite2 Database last updated <strong><span id="geoip_db_updated">never</span></strong>. GeoLite2 Database last updated <strong><span id="geoip_db_updated">never</span></strong>.
@ -1999,7 +2000,6 @@ $(document).ready(function() {
getNewslettersTable(); getNewslettersTable();
getMobileDevicesTable(); getMobileDevicesTable();
loadUpdateDistros(); loadUpdateDistros();
enableGeoLiteInstallButton();
settingsChanged = false; settingsChanged = false;
} }
@ -2863,20 +2863,22 @@ $(document).ready(function() {
gotoSetting('3rd_party_apis', 'geoip_db') gotoSetting('3rd_party_apis', 'geoip_db')
} }
function enableGeoLiteInstallButton() {
$('#install_geoip_db').prop('disabled', !(Boolean($("#maxmind_license_key").val())));
}
enableGeoLiteInstallButton();
if ("${config['geoip_db_installed']}" > "0") { if ("${config['geoip_db_installed']}" > "0") {
$("#geoip_db_updated").text(moment("${config['geoip_db_installed']}", "X").fromNow()); $("#geoip_db_updated").text(moment("${config['geoip_db_installed']}", "X").fromNow());
} }
$("#install_geoip_db").click(function () { $("#install_geoip_db").click(function () {
if ($.trim($("#maxmind_license_key").val()) === "") {
$("#maxmind_license_key").focus();
showMsg('<i class="fa fa-exclamation-circle"></i> Maxmind License Key cannot be blank.', false, true, 5000, true);
return false;
} else if (!(saveSettings())){
return false;
}
var msg = 'Are you sure you want to install the GeoLite2 database?<br /><br />' + var msg = 'Are you sure you want to install the GeoLite2 database?<br /><br />' +
'The database is used to lookup IP address geolocation info.<br />' + 'The database is used to lookup IP address geolocation info.<br />' +
'The database will be downloaded from <a href="${anon_url("https://dev.maxmind.com/geoip/geoip2/geolite2/")}" target="_blank">MaxMind</a>, <br />' + 'The database will be downloaded from <a href="${anon_url("https://dev.maxmind.com/geoip/geoip2/geolite2/")}" target="_blank">MaxMind</a>, <br />' +
'and requires <strong>100MB</strong> of free space to install in your Tautulli directory.<br />'; 'and requires <strong>100MB</strong> of free space to install.<br />';
var url = 'install_geoip_db'; var url = 'install_geoip_db';
if ($(this).text() === 'Update') { if ($(this).text() === 'Update') {
url += '?update=true'; url += '?update=true';

4
plexpy/helpers.py
View file

@ -609,6 +609,10 @@ def install_geoip_db(update=False):
geolite2_db = maxmind_db + '.mmdb' geolite2_db = maxmind_db + '.mmdb'
geolite2_db_path = plexpy.CONFIG.GEOIP_DB or os.path.join(plexpy.DATA_DIR, geolite2_db) geolite2_db_path = plexpy.CONFIG.GEOIP_DB or os.path.join(plexpy.DATA_DIR, geolite2_db)
# Check path ends with .mmdb
if os.path.splitext(geolite2_db_path)[1] != os.path.splitext(geolite2_db)[1]:
geolite2_db_path = os.path.join(geolite2_db_path, geolite2_db)
temp_gz = os.path.join(plexpy.CONFIG.CACHE_DIR, geolite2_gz) temp_gz = os.path.join(plexpy.CONFIG.CACHE_DIR, geolite2_gz)
temp_md5 = os.path.join(plexpy.CONFIG.CACHE_DIR, geolite2_md5) temp_md5 = os.path.join(plexpy.CONFIG.CACHE_DIR, geolite2_md5)