recognise ssh session and daemon correctly

FrostyX · May 5, 2017 · 027d055 · 027d055
1 parent e39b4e4
commit 027d055
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/tracer/resources/applications.py b/tracer/resources/applications.py
@@ -189,7 +189,9 @@ def is_interpreted(self):
 
 	@property
 	def is_session(self):
-                return self.instances and self.instances[0].is_session
+		if re.search('ssh-.*-session', self.name):
+			return True
+		return self.instances and self.instances[0].is_session
 
 	@property
 	def type(self):

diff --git a/tracer/resources/processes.py b/tracer/resources/processes.py
@@ -65,6 +65,11 @@ def __nonzero__(self):
 		return bool(self._process)
 
 	def name(self):
+		# Special case for sshd, if its cmd contains the execuatable is must be the daemon 
+		# else must be the session.
+		if self._attr("name") == 'sshd':
+			if not self._attr("cmdline")[0] == self._attr("exe"):
+				return 'ssh-{0}-session'.format(re.split(' |@|',self._attr("cmdline")[0])[1])
 		return self._attr("name")
 
 	def exe(self):
@@ -186,8 +191,6 @@ def is_interpreted(self):
 	def is_session(self):
                 if self.terminal() is not None:
                         return True
-                if re.search("sshd\:\ .*\ \[priv\]", str(self.cmdline())):
-                        return True
 
 	@property
 	def real_name(self):