Add simple server tests for SSH1 and SSH2.

test/test_ssh1.py

@@ -1,8 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+import struct
 import pytest
 
 
+# pylint: disable=line-too-long,attribute-defined-outside-init
 class TestSSH1(object):
 	@pytest.fixture(autouse=True)
 	def init(self, ssh_audit):
@@ -10,15 +12,32 @@ class TestSSH1(object):
 		self.ssh1 = ssh_audit.SSH1
 		self.rbuf = ssh_audit.ReadBuf
 		self.wbuf = ssh_audit.WriteBuf
+		self.audit = ssh_audit.audit
+		self.AuditConf = ssh_audit.AuditConf
 	
-	def test_crc32(self):
+	def _conf(self):
-		assert self.ssh1.crc32(b'') == 0x00
+		conf = self.AuditConf('localhost', 22)
-		assert self.ssh1.crc32(b'The quick brown fox jumps over the lazy dog') == 0xb9c60808
+		conf.colors = False
+		conf.batch = True
+		conf.verbose = True
+		conf.ssh1 = True
+		conf.ssh2 = False
+		return conf
 	
-	def _server_key(self):
+	def _create_ssh1_packet(self, payload):
+		padding = -(len(payload) + 4) % 8
+		plen = len(payload) + 4
+		pad_bytes = b'\x00' * padding
+		cksum = self.ssh1.crc32(pad_bytes + payload)
+		data = struct.pack('>I', plen) + pad_bytes + payload + struct.pack('>I', cksum)
+		return data
+	
+	@classmethod
+	def _server_key(cls):
 		return (1024, 0x10001, 0xee6552da432e0ac2c422df1a51287507748bfe3b5e3e4fa989a8f49fdc163a17754939ef18ef8a667ea3b71036a151fcd7f5e01ceef1e4439864baf3ac569047582c69d6c128212e0980dcb3168f00d371004039983f6033cd785b8b8f85096c7d9405cbfdc664e27c966356a6b4eb6ee20ad43414b50de18b22829c1880b551)
 	
-	def _host_key(self):
+	@classmethod
+	def _host_key(cls):
 		return (2048, 0x10001, 0xdfa20cd2a530ccc8c870aa60d9feb3b35deeab81c3215a96557abbd683d21f4600f38e475d87100da9a4404220eeb3bb5584e5a2b5b48ffda58530ea19104a32577d7459d91e76aa711b241050f4cc6d5327ccce254f371acad3be56d46eb5919b73f20dbdb1177b700f00891c5bf4ed128bb90ed541b778288285bcfa28432ab5cbcb8321b6e24760e998e0daa519f093a631e44276d7dd252ce0c08c75e2ab28a7349ead779f97d0f20a6d413bf3623cd216dc35375f6366690bcc41e3b2d5465840ec7ee0dc7e3f1c101d674a0c7dbccbc3942788b111396add2f8153b46a0e4b50d66e57ee92958f1c860dd97cc0e40e32febff915343ed53573142bdf4b)
 	
 	def _pkm_payload(self):
@@ -33,11 +52,17 @@ class TestSSH1(object):
 		w.write_int(36)
 		return w.write_flush()
 	
+	def test_crc32(self):
+		assert self.ssh1.crc32(b'') == 0x00
+		assert self.ssh1.crc32(b'The quick brown fox jumps over the lazy dog') == 0xb9c60808
+	
 	def test_fingerprint(self):
+		# pylint: disable=protected-access
 		b, e, m = self._host_key()
 		fpd = self.wbuf._create_mpint(m, False)
 		fpd += self.wbuf._create_mpint(e, False)
 		fp = self.ssh.Fingerprint(fpd)
+		assert b == 2048
 		assert fp.md5 == 'MD5:9d:26:f8:39:fc:20:9d:9b:ca:cc:4a:0f:e1:93:f5:96'
 		assert fp.sha256 == 'SHA256:vZdx3mhzbvVJmn08t/ruv8WDhJ9jfKYsCTuSzot+QIs'
 	
@@ -63,7 +88,7 @@ class TestSSH1(object):
 		assert fp.sha256 == 'SHA256:vZdx3mhzbvVJmn08t/ruv8WDhJ9jfKYsCTuSzot+QIs'
 	
 	def test_pkm_payload(self):
-		cookie = b'\x88\x99\xaa\xbb\xcc\xdd\xee\xff' 
+		cookie = b'\x88\x99\xaa\xbb\xcc\xdd\xee\xff'
 		skey = self._server_key()
 		hkey = self._host_key()
 		pflags = 2
@@ -72,3 +97,29 @@ class TestSSH1(object):
 		pkm1 = self.ssh1.PublicKeyMessage(cookie, skey, hkey, pflags, cmask, amask)
 		pkm2 = self.ssh1.PublicKeyMessage.parse(self._pkm_payload())
 		assert pkm1.payload == pkm2.payload
+	
+	def test_ssh1_server_simple(self, output_spy, virtual_socket):
+		vsocket = virtual_socket
+		w = self.wbuf()
+		w.write_byte(self.ssh.Protocol.SMSG_PUBLIC_KEY)
+		w.write(self._pkm_payload())
+		vsocket.rdata.append(b'SSH-1.5-OpenSSH_7.2 ssh-audit-test\r\n')
+		vsocket.rdata.append(self._create_ssh1_packet(w.write_flush()))
+		output_spy.begin()
+		self.audit(self._conf())
+		lines = output_spy.flush()
+		assert len(lines) == 10
+	
+	def test_ssh1_server_invalid_first_packet(self, output_spy, virtual_socket):
+		vsocket = virtual_socket
+		w = self.wbuf()
+		w.write_byte(self.ssh.Protocol.SMSG_PUBLIC_KEY + 1)
+		w.write(self._pkm_payload())
+		vsocket.rdata.append(b'SSH-1.5-OpenSSH_7.2 ssh-audit-test\r\n')
+		vsocket.rdata.append(self._create_ssh1_packet(w.write_flush()))
+		output_spy.begin()
+		with pytest.raises(SystemExit):
+			self.audit(self._conf())
+		lines = output_spy.flush()
+		assert len(lines) == 4
+		assert 'unknown message' in lines[-1]

test/test_ssh2.py

@@ -1,8 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import pytest, os
+import struct, os
+import pytest
 
 
+# pylint: disable=line-too-long,attribute-defined-outside-init
 class TestSSH2(object):
 	@pytest.fixture(autouse=True)
 	def init(self, ssh_audit):
@@ -10,6 +12,27 @@ class TestSSH2(object):
 		self.ssh2 = ssh_audit.SSH2
 		self.rbuf = ssh_audit.ReadBuf
 		self.wbuf = ssh_audit.WriteBuf
+		self.audit = ssh_audit.audit
+		self.AuditConf = ssh_audit.AuditConf
+	
+	def _conf(self):
+		conf = self.AuditConf('localhost', 22)
+		conf.colors = False
+		conf.batch = True
+		conf.verbose = True
+		conf.ssh1 = False
+		conf.ssh2 = True
+		return conf
+	
+	@classmethod
+	def _create_ssh2_packet(cls, payload):
+		padding = -(len(payload) + 5) % 8
+		if padding < 4:
+			padding += 8
+		plen = len(payload) + padding + 1
+		pad_bytes = b'\x00' * padding
+		data = struct.pack('>Ib', plen, padding) + payload + pad_bytes
+		return data
 	
 	def _kex_payload(self):
 		w = self.wbuf()
@@ -105,3 +128,28 @@ class TestSSH2(object):
 		kex1 = self._get_kex_variat1()
 		kex2 = self.ssh2.Kex.parse(self._kex_payload())
 		assert kex1.payload == kex2.payload
+	
+	def test_ssh2_server_simple(self, output_spy, virtual_socket):
+		vsocket = virtual_socket
+		w = self.wbuf()
+		w.write_byte(self.ssh.Protocol.MSG_KEXINIT)
+		w.write(self._kex_payload())
+		vsocket.rdata.append(b'SSH-2.0-OpenSSH_7.3 ssh-audit-test\r\n')
+		vsocket.rdata.append(self._create_ssh2_packet(w.write_flush()))
+		output_spy.begin()
+		self.audit(self._conf())
+		lines = output_spy.flush()
+		assert len(lines) == 72
+
+	def test_ssh2_server_invalid_first_packet(self, output_spy, virtual_socket):
+		vsocket = virtual_socket
+		w = self.wbuf()
+		w.write_byte(self.ssh.Protocol.MSG_KEXINIT + 1)
+		vsocket.rdata.append(b'SSH-2.0-OpenSSH_7.3 ssh-audit-test\r\n')
+		vsocket.rdata.append(self._create_ssh2_packet(w.write_flush()))
+		output_spy.begin()
+		with pytest.raises(SystemExit):
+			self.audit(self._conf())
+		lines = output_spy.flush()
+		assert len(lines) == 3
+		assert 'unknown message' in lines[-1]