mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-08-19 12:59:42 -07:00
Fix geopip lookup for IPv6 addresses
This commit is contained in:
parent
fc2faa247a
commit
7ce9283421
3 changed files with 2 additions and 4 deletions
|
@ -79,7 +79,7 @@
|
||||||
$('#ip_error').html('<i class="fa fa-exclamation-circle"></i> Internal request failed.').show();
|
$('#ip_error').html('<i class="fa fa-exclamation-circle"></i> Internal request failed.').show();
|
||||||
},
|
},
|
||||||
success: function (result) {
|
success: function (result) {
|
||||||
if (result.results === 'error') {
|
if (result.result === 'error') {
|
||||||
$('#ip_error').html('<i class="fa fa-exclamation-circle"></i> ' + result.message).show();
|
$('#ip_error').html('<i class="fa fa-exclamation-circle"></i> ' + result.message).show();
|
||||||
} else {
|
} else {
|
||||||
var data = result.data;
|
var data = result.data;
|
||||||
|
|
|
@ -933,7 +933,7 @@ class PlexTV(object):
|
||||||
return account_details
|
return account_details
|
||||||
|
|
||||||
def get_geoip_lookup(self, ip_address=''):
|
def get_geoip_lookup(self, ip_address=''):
|
||||||
if not ip_address or not helpers.is_public_ip(ip_address):
|
if not ip_address or not helpers.is_valid_ip(ip_address):
|
||||||
return
|
return
|
||||||
|
|
||||||
geoip_data = self.get_plextv_geoip(ip_address=ip_address, output_format='xml')
|
geoip_data = self.get_plextv_geoip(ip_address=ip_address, output_format='xml')
|
||||||
|
|
|
@ -5719,8 +5719,6 @@ class WebInterface(object):
|
||||||
message = 'No IP address provided.'
|
message = 'No IP address provided.'
|
||||||
elif not helpers.is_valid_ip(ip_address):
|
elif not helpers.is_valid_ip(ip_address):
|
||||||
message = 'Invalid IP address provided: %s' % ip_address
|
message = 'Invalid IP address provided: %s' % ip_address
|
||||||
elif not helpers.is_public_ip(ip_address):
|
|
||||||
message = 'Non-public IP address provided: %s' % ip_address
|
|
||||||
|
|
||||||
if message:
|
if message:
|
||||||
return {'result': 'error', 'message': message}
|
return {'result': 'error', 'message': message}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue