github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-07 05:31:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved IP address handling (includes IPv6)

Browse source
This commit is contained in:
JonnyWong16 2017-02-05 18:55:10 -08:00
parent d875f21647
commit ca472ff597
14 changed files with 178 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

14
data/interfaces/default/ip_address_modal.html
View file

@ -14,7 +14,12 @@
</div>
<div class="modal-body" id="modal-text">
<div class="col-sm-12">
<h4><strong>Location Details</strong><span id="ip_loading" style="padding-left: 5px;"><i class="fa fa-refresh fa-spin"></i></span></h4>
<h4>
<strong>Location Details</strong>
% if data:
<span id="ip_loading" style="padding-left: 5px;"><i class="fa fa-refresh fa-spin"></i></span>
% endif
</h4>
</div>
<div id="ip_error" class="col-sm-12 text-muted"></div>
<div class="col-sm-6">
@ -35,7 +40,12 @@
</ul>
</div>
<div class="col-sm-12">
<h4><strong>Connection Details</strong><span id="isp_loading" style="padding-left: 5px;"><i class="fa fa-refresh fa-spin"></i></span></h4>
<h4>
<strong>Connection Details</strong>
% if data:
<span id="isp_loading" style="padding-left: 5px;"><i class="fa fa-refresh fa-spin"></i></span>
% endif
</h4>
</div>
<div id="isp_error" class="col-sm-12 text-muted"></div>
<div class="col-sm-12">

1
data/interfaces/default/js/ipaddr.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

47
data/interfaces/default/js/script.js
View file

@ -266,20 +266,45 @@ function getPlatformImagePath(platformName) {
}
}
$.cachedScript = function (url) {
return $.ajax({
dataType: "script",
cache: true,
url: url
});
};
function isPrivateIP(ip_address) {
if (ip_address.indexOf(".") > -1) {
// get IPv4 mapped address (xxx.xxx.xxx.xxx) from IPv6 addresss (::ffff:xxx.xxx.xxx.xxx)
var parts = ip_address.split(":");
var parts = parts[parts.length - 1].split('.');
if ((parts[0] === '127' && parts[1] === '0' && parts[2] === '0' && parts[3] === '1') || (parts[0] === '10') ||
(parts[0] === '172' && (parseInt(parts[1], 10) >= 16 && parseInt(parts[1], 10) <= 31)) || (parts[0] ===
'192' && parts[1] === '168')) {
return true;
}
return false;
var defer = $.Deferred();
$.cachedScript('js/ipaddr.min.js').done(function () {
if (ipaddr.isValid(ip_address)) {
var addr = ipaddr.process(ip_address)
if (addr.kind() === 'ipv4') {
var rangeList = [
ipaddr.parseCIDR('127.0.0.0/8'),
ipaddr.parseCIDR('10.0.0.0/8'),
ipaddr.parseCIDR('172.16.0.0/12'),
ipaddr.parseCIDR('192.168.0.0/16')
]
} else {
return true;
var rangeList = [
ipaddr.parseCIDR('fd00::/8')
]
}
if (ipaddr.subnetMatch(addr, rangeList, -1) >= 0) {
defer.resolve();
} else {
defer.reject();
}
} else {
defer.resolve('n/a');
}
})
return defer.promise();
}
function humanTime(seconds) {

92
data/interfaces/default/js/tables/history_table.js
View file

@ -94,16 +94,12 @@ history_table_options = {
"data": "ip_address",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData) {
if (isPrivateIP(cellData)) {
if (cellData != '') {
$(td).html(cellData);
} else {
$(td).html('n/a');
}
} else {
isPrivateIP(cellData).then(function () {
$(td).html(cellData || 'n/a');
}, function () {
external_ip = '<span class="external-ip-tooltip" data-toggle="tooltip" title="External IP"><i class="fa fa-map-marker fa-fw"></i></span>';
$(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal">'+ external_ip + cellData + '</a>');
}
});
} else {
$(td).html('n/a');
}
@ -253,13 +249,12 @@ history_table_options = {
$('#ajaxMsg').fadeOut();
// Create the tooltips.
$('.current-activity-tooltip').tooltip({ container: 'body' });
$('.expand-history-tooltip').tooltip({ container: 'body' });
$('.external-ip-tooltip').tooltip({ container: 'body' });
$('.transcode-tooltip').tooltip({ container: 'body' });
$('.media-type-tooltip').tooltip({ container: 'body' });
$('.watched-tooltip').tooltip({ container: 'body' });
$('.thumb-tooltip').popover({
$('body').tooltip({
selector: '[data-toggle="tooltip"]',
container: 'body'
});
$('body').popover({
selector: '[data-toggle="popover"]',
html: true,
container: 'body',
trigger: 'hover',
@ -331,22 +326,13 @@ $('.history_table').on('click', '> tbody > tr > td.modal-control', function () {
var row = history_table.row( tr );
var rowData = row.data();
function showStreamDetails() {
$.ajax({
url: 'get_stream_data',
data: {
$.get('get_stream_data', {
row_id: rowData['id'],
session_key: rowData['session_key'],
user: rowData['friendly_name']
},
cache: false,
async: true,
complete: function(xhr, status) {
$("#info-modal").html(xhr.responseText);
}
}).then(function (jqXHR) {
$("#info-modal").html(jqXHR);
});
}
showStreamDetails();
});
// Parent table ip address modal
@ -355,21 +341,11 @@ $('.history_table').on('click', '> tbody > tr > td.modal-control-ip', function (
var row = history_table.row( tr );
var rowData = row.data();
function getUserLocation(ip_address) {
if (isPrivateIP(ip_address)) {
return "n/a"
} else {
$.ajax({
url: 'get_ip_address_details',
data: {ip_address: ip_address},
async: true,
complete: function(xhr, status) {
$("#ip-info-modal").html(xhr.responseText);
}
$.get('get_ip_address_details', {
ip_address: rowData['ip_address']
}).then(function (jqXHR) {
$("#ip-info-modal").html(jqXHR);
});
}
}
getUserLocation(rowData['ip_address']);
});
// Parent table delete mode
@ -545,18 +521,12 @@ function createChildTable(row, rowData) {
var childRow = history_child_table[rowData['reference_id']].row(tr);
var childRowData = childRow.data();
function showStreamDetails() {
$.ajax({
url: 'get_stream_data',
data: { row_id: childRowData['id'], user: childRowData['friendly_name'] },
cache: false,
async: true,
complete: function (xhr, status) {
$("#info-modal").html(xhr.responseText);
}
$.get('get_stream_data', {
row_id: childRowData['id'],
user: childRowData['friendly_name']
}).then(function (jqXHR) {
$("#info-modal").html(jqXHR);
});
}
showStreamDetails();
});
// Child table ip address modal
@ -565,21 +535,11 @@ function createChildTable(row, rowData) {
var childRow = history_child_table[rowData['reference_id']].row(tr);
var childRowData = childRow.data();
function getUserLocation(ip_address) {
if (isPrivateIP(ip_address)) {
return "n/a"
} else {
$.ajax({
url: 'get_ip_address_details',
data: { ip_address: ip_address },
async: true,
complete: function (xhr, status) {
$("#ip-info-modal").html(xhr.responseText);
}
$.get('get_ip_address_details', {
ip_address: childRowData['ip_address']
}).then(function (jqXHR) {
$("#ip-info-modal").html(jqXHR);
});
}
}
getUserLocation(childRowData['ip_address']);
});
// Child table delete mode

9
data/interfaces/default/js/tables/history_table_modal.js
View file

@ -131,9 +131,12 @@ history_table_modal_options = {
$('#ajaxMsg').fadeOut();
// Create the tooltips.
$('.transcode-tooltip').tooltip({ container: 'body' });
$('.media-type-tooltip').tooltip({ container: 'body' });
$('.thumb-tooltip').popover({
$('body').tooltip({
selector: '[data-toggle="tooltip"]',
container: 'body'
});
$('body').popover({
selector: '[data-toggle="popover"]',
html: true,
container: '#history-modal',
trigger: 'hover',

11
data/interfaces/default/js/tables/libraries.js
View file

@ -217,11 +217,12 @@ libraries_list_table_options = {
$('#ajaxMsg').fadeOut();
// Create the tooltips.
$('.purge-tooltip').tooltip({ container: 'body' });
$('.edit-tooltip').tooltip({ container: 'body' });
$('.transcode-tooltip').tooltip({ container: 'body' });
$('.media-type-tooltip').tooltip({ container: 'body' });
$('.thumb-tooltip').popover({
$('body').tooltip({
selector: '[data-toggle="tooltip"]',
container: 'body'
});
$('body').popover({
selector: '[data-toggle="popover"]',
html: true,
container: 'body',
trigger: 'hover',

35
data/interfaces/default/js/tables/login_logs.js
View file

@ -49,16 +49,12 @@ login_log_table_options = {
"data": "ip_address",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData) {
if (isPrivateIP(cellData)) {
if (cellData != '') {
$(td).html(cellData);
} else {
$(td).html('n/a');
}
} else {
isPrivateIP(cellData).then(function () {
$(td).html(cellData || 'n/a');
}, function () {
external_ip = '<span class="external-ip-tooltip" data-toggle="tooltip" title="External IP"><i class="fa fa-map-marker fa-fw"></i></span>';
$(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal">' + external_ip + cellData + '</a>');
}
});
} else {
$(td).html('n/a');
}
@ -92,7 +88,10 @@ login_log_table_options = {
$('#ajaxMsg').fadeOut();
// Create the tooltips.
$('.external-ip-tooltip').tooltip({ container: 'body' });
$('body').tooltip({
selector: '[data-toggle="tooltip"]',
container: 'body'
});
},
"preDrawCallback": function (settings) {
@ -106,19 +105,9 @@ $('.login_log_table').on('click', '> tbody > tr > td.modal-control-ip', function
var row = login_log_table.row(tr);
var rowData = row.data();
function getUserLocation(ip_address) {
if (isPrivateIP(ip_address)) {
return "n/a"
} else {
$.ajax({
url: 'get_ip_address_details',
data: { ip_address: ip_address },
async: true,
complete: function (xhr, status) {
$("#ip-info-modal").html(xhr.responseText);
}
$.get('get_ip_address_details', {
ip_address: rowData['ip_address']
}).then(function (jqXHR) {
$("#ip-info-modal").html(jqXHR);
});
}
}
getUserLocation(rowData['ip_address']);
});

9
data/interfaces/default/js/tables/media_info_table.js
View file

@ -237,9 +237,12 @@ media_info_table_options = {
$('#ajaxMsg').fadeOut();
// Create the tooltips.
$('.expand-media-info-tooltip').tooltip({ container: 'body' });
$('.media-type-tooltip').tooltip({ container: 'body' });
$('.thumb-tooltip').popover({
$('body').tooltip({
selector: '[data-toggle="tooltip"]',
container: 'body'
});
$('body').popover({
selector: '[data-toggle="popover"]',
html: true,
container: 'body',
trigger: 'hover',

48
data/interfaces/default/js/tables/user_ips.js
View file

@ -33,16 +33,12 @@ user_ip_table_options = {
"data": "ip_address",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData) {
if (isPrivateIP(cellData)) {
if (cellData != '') {
$(td).html(cellData);
} else {
$(td).html('n/a');
}
} else {
isPrivateIP(cellData).then(function () {
$(td).html(cellData || 'n/a');
}, function () {
external_ip = '<span class="external-ip-tooltip" data-toggle="tooltip" title="External IP"><i class="fa fa-map-marker fa-fw"></i></span>';
$(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal">' + external_ip + cellData + '</a>');
}
});
} else {
$(td).html('n/a');
}
@ -65,7 +61,7 @@ user_ip_table_options = {
"targets": [3],
"data": "player",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData) {
if (cellData !== '') {
var transcode_dec = '';
if (rowData['transcode_decision'] === 'transcode') {
transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Transcode"><i class="fa fa-server fa-fw"></i></span>';
@ -74,9 +70,7 @@ user_ip_table_options = {
} else if (rowData['transcode_decision'] === 'direct play') {
transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>';
}
$(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp' + cellData + '</div></a></div>');
} else {
$(td).html('n/a');
$(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp;' + cellData + '</div></a></div>');
}
},
"width": "15%",
@ -129,11 +123,12 @@ user_ip_table_options = {
$('#ajaxMsg').fadeOut();
// Create the tooltips.
$('.external-ip-tooltip').tooltip({ container: 'body' });
$('.transcode-tooltip').tooltip({ container: 'body' });
$('.media-type-tooltip').tooltip({ container: 'body' });
$('.watched-tooltip').tooltip({ container: 'body' });
$('.thumb-tooltip').popover({
$('body').tooltip({
selector: '[data-toggle="tooltip"]',
container: 'body'
});
$('body').popover({
selector: '[data-toggle="popover"]',
html: true,
container: 'body',
trigger: 'hover',
@ -179,20 +174,9 @@ $('.user_ip_table').on('click', 'td.modal-control-ip', function () {
var row = user_ip_table.row( tr );
var rowData = row.data();
function getUserLocation(ip_address) {
if (isPrivateIP(ip_address)) {
return "n/a"
} else {
$.ajax({
url: 'get_ip_address_details',
data: {ip_address: ip_address},
async: true,
complete: function(xhr, status) {
$("#ip-info-modal").html(xhr.responseText);
}
$.get('get_ip_address_details', {
ip_address: rowData['ip_address']
}).then(function (jqXHR) {
$("#ip-info-modal").html(jqXHR);
});
}
}
getUserLocation(rowData['ip_address']);
});

62
data/interfaces/default/js/tables/users.js
View file

@ -105,15 +105,12 @@ users_list_table_options = {
"data": "ip_address",
"createdCell": function (td, cellData, rowData, row, col) {
if (cellData) {
if (isPrivateIP(cellData)) {
if (cellData != '') {
$(td).html(cellData);
} else {
$(td).html('n/a');
}
} else {
$(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal"><span data-toggle="ip-tooltip" data-placement="left" title="IP Address Info" id="ip-info"><i class="fa fa-map-marker"></i></span>&nbsp' + cellData + '</a>');
}
isPrivateIP(cellData).then(function () {
$(td).html(cellData || 'n/a');
}, function () {
external_ip = '<span class="external-ip-tooltip" data-toggle="tooltip" title="External IP"><i class="fa fa-map-marker fa-fw"></i></span>';
$(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal">' + external_ip + cellData + '</a>');
});
} else {
$(td).html('n/a');
}
@ -220,12 +217,12 @@ users_list_table_options = {
$('#ajaxMsg').fadeOut();
// Create the tooltips.
$('.purge-tooltip').tooltip({ container: 'body' });
$('.edit-tooltip').tooltip({ container: 'body' });
$('.transcode-tooltip').tooltip({ container: 'body' });
$('.media-type-tooltip').tooltip({ container: 'body' });
$('.watched-tooltip').tooltip({ container: 'body' });
$('.thumb-tooltip').popover({
$('body').tooltip({
selector: '[data-toggle="tooltip"]',
container: 'body'
});
$('body').popover({
selector: '[data-toggle="popover"]',
html: true,
container: 'body',
trigger: 'hover',
@ -262,18 +259,12 @@ $('#users_list_table').on('click', 'td.modal-control', function () {
var row = users_list_table.row(tr);
var rowData = row.data();
function showStreamDetails() {
$.ajax({
url: 'get_stream_data',
data: { row_id: rowData['id'], user: rowData['friendly_name'] },
cache: false,
async: true,
complete: function (xhr, status) {
$("#info-modal").html(xhr.responseText);
}
$.get('get_stream_data', {
row_id: rowData['id'],
user: rowData['friendly_name']
}).then(function (jqXHR) {
$("#info-modal").html(jqXHR);
});
}
showStreamDetails();
});
$('#users_list_table').on('click', 'td.modal-control-ip', function () {
@ -281,22 +272,11 @@ $('#users_list_table').on('click', 'td.modal-control-ip', function () {
var row = users_list_table.row(tr);
var rowData = row.data();
function getUserLocation(ip_address) {
if (isPrivateIP(ip_address)) {
return "n/a"
} else {
$.ajax({
url: 'get_ip_address_details',
data: { ip_address: ip_address },
async: true,
complete: function (xhr, status) {
$("#ip-info-modal").html(xhr.responseText);
}
$.get('get_ip_address_details', {
ip_address: rowData['ip_address']
}).then(function (jqXHR) {
$("#ip-info-modal").html(jqXHR);
});
}
}
getUserLocation(rowData['ip_address']);
});
$('#users_list_table').on('change', 'td.edit-control > .edit-user-toggles > input, td.edit-user-control > .edit-user-name > input', function () {

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

@ -2720,7 +2720,9 @@ $(document).ready(function() {
getPlexPyURL().then(function (url) {
var parser = document.createElement('a');
parser.href = url;
$('#api_qr_private').toggle(isPrivateIP(parser.hostname));
isPrivateIP(parser.hostname).then(function (valid) {
$('#api_qr_private').toggle((valid !== 'n/a'));
});
var encoded_string = url + '|' + $('#api_key').val();
$('#api_qr_string').html(encoded_string);

26
plexpy/helpers.py
View file

@ -502,28 +502,32 @@ def sanitize(string):
else:
return ''
def is_ip_public(host):
ip_address = get_ip(host)
ip = IP(ip_address)
if ip.iptype() == 'PUBLIC':
def is_public_ip(host):
ip = is_valid_ip(get_ip(host))
if ip and ip.iptype() == 'PUBLIC':
return True
return False
def get_ip(host):
ip_address = ''
if is_valid_ip(host):
return host
else:
try:
socket.inet_aton(host)
ip_address = host
except socket.error:
try:
ip_address = socket.gethostbyname(host)
ip_address = socket.getaddrinfo(host, None)[0][4][0]
logger.debug(u"IP Checker :: Resolved %s to %s." % (host, ip_address))
except:
logger.error(u"IP Checker :: Bad IP or hostname provided.")
return ip_address
def is_valid_ip(address):
try:
return IP(address)
except TypeError:
return False
except ValueError:
return False
def install_geoip_db():
maxmind_url = 'http://geolite.maxmind.com/download/geoip/database/'
geolite2_gz = 'GeoLite2-City.mmdb.gz'

4
plexpy/logger.py
View file

@ -92,14 +92,14 @@ class PublicIPFilter(logging.Filter):
# Currently only checking for ipv4 addresses
ipv4 = re.findall(r'[0-9]+(?:\.[0-9]+){3}(?!\d*-[a-z0-9]{6})', record.msg)
for ip in ipv4:
if helpers.is_ip_public(ip):
if helpers.is_public_ip(ip):
record.msg = record.msg.replace(ip, ip.partition('.')[0] + '.***.***.***')
args = []
for arg in record.args:
ipv4 = re.findall(r'[0-9]+(?:\.[0-9]+){3}(?!\d*-[a-z0-9]{6})', arg) if isinstance(arg, basestring) else []
for ip in ipv4:
if helpers.is_ip_public(ip):
if helpers.is_public_ip(ip):
arg = arg.replace(ip, ip.partition('.')[0] + '.***.***.***')
args.append(arg)
record.args = tuple(args)

6
plexpy/webserve.py
View file

@ -1719,11 +1719,7 @@ class WebInterface(object):
@cherrypy.expose
@requireAuth()
def get_ip_address_details(self, ip_address=None, **kwargs):
import socket
try:
socket.inet_aton(ip_address)
except socket.error:
if not helpers.is_valid_ip(ip_address):
ip_address = None
return serve_template(templatename="ip_address_modal.html", title="IP Address Details", data=ip_address)