mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
Merge pull request #41857 from dmurphy18/netstat_fix
Modified support for deprecated netstat being removed by utilizing ss
This commit is contained in:
Mike Place
GitHub
commit
cf2252bcea
@ -139,6 +139,63 @@ def _netstat_linux():
|
||||
return ret
|
||||
|
||||
|
||||
def _ss_linux():
|
||||
'''
|
||||
Return ss information for Linux distros
|
||||
(netstat is deprecated and may not be available)
|
||||
'''
|
||||
ret = []
|
||||
cmd = 'ss -tulpnea'
|
||||
out = __salt__['cmd.run'](cmd)
|
||||
for line in out.splitlines():
|
||||
comps = line.split()
|
||||
ss_user = 0
|
||||
ss_inode = 0
|
||||
ss_program = ''
|
||||
length = len(comps)
|
||||
if line.startswith('tcp') or line.startswith('udp'):
|
||||
i = 6
|
||||
while i < (length - 1):
|
||||
fields = comps[i].split(":")
|
||||
if fields[0] == "users":
|
||||
users = fields[1].split(",")
|
||||
ss_program = users[0].split("\"")[1]
|
||||
|
||||
if fields[0] == "uid":
|
||||
ss_user = fields[1]
|
||||
|
||||
if fields[0] == "ino":
|
||||
ss_inode = fields[1]
|
||||
|
||||
i += 1
|
||||
|
||||
if line.startswith('tcp'):
|
||||
ss_state = comps[1]
|
||||
if ss_state == "ESTAB":
|
||||
ss_state = "ESTABLISHED"
|
||||
ret.append({
|
||||
'proto': comps[0],
|
||||
'recv-q': comps[2],
|
||||
'send-q': comps[3],
|
||||
'local-address': comps[4],
|
||||
'remote-address': comps[5],
|
||||
'state': ss_state,
|
||||
'user': ss_user,
|
||||
'inode': ss_inode,
|
||||
'program': ss_program})
|
||||
if line.startswith('udp'):
|
||||
ret.append({
|
||||
'proto': comps[0],
|
||||
'recv-q': comps[2],
|
||||
'send-q': comps[3],
|
||||
'local-address': comps[4],
|
||||
'remote-address': comps[5],
|
||||
'user': ss_user,
|
||||
'inode': ss_inode,
|
||||
'program': ss_program})
|
||||
return ret
|
||||
|
||||
|
||||
def _netinfo_openbsd():
|
||||
'''
|
||||
Get process information for network connections using fstat
|
||||
@ -409,7 +466,7 @@ def _netstat_route_linux():
|
||||
'destination': comps[0],
|
||||
'gateway': comps[1],
|
||||
'netmask': '',
|
||||
'flags': comps[3],
|
||||
'flags': comps[2],
|
||||
'interface': comps[5]})
|
||||
elif len(comps) == 7:
|
||||
ret.append({
|
||||
@ -417,13 +474,109 @@ def _netstat_route_linux():
|
||||
'destination': comps[0],
|
||||
'gateway': comps[1],
|
||||
'netmask': '',
|
||||
'flags': comps[3],
|
||||
'flags': comps[2],
|
||||
'interface': comps[6]})
|
||||
else:
|
||||
continue
|
||||
return ret
|
||||
|
||||
|
||||
def _ip_route_linux():
|
||||
'''
|
||||
Return ip routing information for Linux distros
|
||||
(netstat is deprecated and may not be available)
|
||||
'''
|
||||
# table main closest to old netstat inet output
|
||||
ret = []
|
||||
cmd = 'ip -4 route show table main'
|
||||
out = __salt__['cmd.run'](cmd, python_shell=True)
|
||||
for line in out.splitlines():
|
||||
comps = line.split()
|
||||
|
||||
# need to fake similar output to that provided by netstat
|
||||
# to maintain output format
|
||||
if comps[0] == "unreachable":
|
||||
continue
|
||||
|
||||
if comps[0] == "default":
|
||||
ip_interface = ''
|
||||
if comps[3] == "dev":
|
||||
ip_interface = comps[4]
|
||||
|
||||
ret.append({
|
||||
'addr_family': 'inet',
|
||||
'destination': '0.0.0.0',
|
||||
'gateway': comps[2],
|
||||
'netmask': '0.0.0.0',
|
||||
'flags': 'UG',
|
||||
'interface': ip_interface})
|
||||
else:
|
||||
address_mask = convert_cidr(comps[0])
|
||||
ip_interface = ''
|
||||
if comps[1] == "dev":
|
||||
ip_interface = comps[2]
|
||||
|
||||
ret.append({
|
||||
'addr_family': 'inet',
|
||||
'destination': address_mask['network'],
|
||||
'gateway': '0.0.0.0',
|
||||
'netmask': address_mask['netmask'],
|
||||
'flags': 'U',
|
||||
'interface': ip_interface})
|
||||
|
||||
# table all closest to old netstat inet6 output
|
||||
cmd = 'ip -6 route show table all'
|
||||
out = __salt__['cmd.run'](cmd, python_shell=True)
|
||||
for line in out.splitlines():
|
||||
comps = line.split()
|
||||
|
||||
# need to fake similar output to that provided by netstat
|
||||
# to maintain output format
|
||||
if comps[0] == "unreachable":
|
||||
continue
|
||||
|
||||
if comps[0] == "default":
|
||||
ip_interface = ''
|
||||
if comps[3] == "dev":
|
||||
ip_interface = comps[4]
|
||||
|
||||
ret.append({
|
||||
'addr_family': 'inet6',
|
||||
'destination': '::',
|
||||
'gateway': comps[2],
|
||||
'netmask': '',
|
||||
'flags': 'UG',
|
||||
'interface': ip_interface})
|
||||
|
||||
elif comps[0] == "local":
|
||||
ip_interface = ''
|
||||
if comps[2] == "dev":
|
||||
ip_interface = comps[3]
|
||||
|
||||
local_address = comps[1] + "/128"
|
||||
ret.append({
|
||||
'addr_family': 'inet6',
|
||||
'destination': local_address,
|
||||
'gateway': '::',
|
||||
'netmask': '',
|
||||
'flags': 'U',
|
||||
'interface': ip_interface})
|
||||
else:
|
||||
address_mask = convert_cidr(comps[0])
|
||||
ip_interface = ''
|
||||
if comps[1] == "dev":
|
||||
ip_interface = comps[2]
|
||||
|
||||
ret.append({
|
||||
'addr_family': 'inet6',
|
||||
'destination': comps[0],
|
||||
'gateway': '::',
|
||||
'netmask': '',
|
||||
'flags': 'U',
|
||||
'interface': ip_interface})
|
||||
return ret
|
||||
|
||||
|
||||
def _netstat_route_freebsd():
|
||||
'''
|
||||
Return netstat routing information for FreeBSD and macOS
|
||||
@ -607,7 +760,10 @@ def netstat():
|
||||
salt '*' network.netstat
|
||||
'''
|
||||
if __grains__['kernel'] == 'Linux':
|
||||
return _netstat_linux()
|
||||
if not salt.utils.which('netstat'):
|
||||
return _ss_linux()
|
||||
else:
|
||||
return _netstat_linux()
|
||||
elif __grains__['kernel'] in ('OpenBSD', 'FreeBSD', 'NetBSD'):
|
||||
return _netstat_bsd()
|
||||
elif __grains__['kernel'] == 'SunOS':
|
||||
@ -1432,7 +1588,10 @@ def routes(family=None):
|
||||
raise CommandExecutionError('Invalid address family {0}'.format(family))
|
||||
|
||||
if __grains__['kernel'] == 'Linux':
|
||||
routes_ = _netstat_route_linux()
|
||||
if not salt.utils.which('netstat'):
|
||||
routes_ = _ip_route_linux()
|
||||
else:
|
||||
routes_ = _netstat_route_linux()
|
||||
elif __grains__['kernel'] == 'SunOS':
|
||||
routes_ = _netstat_route_sunos()
|
||||
elif __grains__['os'] in ['FreeBSD', 'MacOS', 'Darwin']:
|
||||
|
||||
@ -17,6 +17,7 @@ import re
|
||||
from salt.exceptions import SaltInvocationError, CommandExecutionError
|
||||
|
||||
# Import third party libs
|
||||
import salt.utils.decorators as decorators
|
||||
import salt.ext.six as six
|
||||
# pylint: disable=import-error
|
||||
try:
|
||||
@ -655,6 +656,7 @@ def lsof(name):
|
||||
return ret
|
||||
|
||||
|
||||
@decorators.which('netstat')
|
||||
def netstat(name):
|
||||
'''
|
||||
Retrieve the netstat information of the given process name.
|
||||
@ -676,6 +678,31 @@ def netstat(name):
|
||||
return ret
|
||||
|
||||
|
||||
@decorators.which('ss')
|
||||
def ss(name):
|
||||
'''
|
||||
Retrieve the ss information of the given process name.
|
||||
|
||||
CLI Example:
|
||||
|
||||
.. code-block:: bash
|
||||
|
||||
salt '*' ps.ss apache2
|
||||
|
||||
.. versionadded:: 2016.11.6
|
||||
|
||||
'''
|
||||
sanitize_name = str(name)
|
||||
ss_infos = __salt__['cmd.run']("ss -neap")
|
||||
found_infos = []
|
||||
ret = []
|
||||
for info in ss_infos.splitlines():
|
||||
if info.find(sanitize_name) != -1:
|
||||
found_infos.append(info)
|
||||
ret.extend([sanitize_name, found_infos])
|
||||
return ret
|
||||
|
||||
|
||||
def psaux(name):
|
||||
'''
|
||||
Retrieve information corresponding to a "ps aux" filtered
|
||||
|
||||
Loading…
Reference in New Issue
Block a user