From 5eb2884c7eaef633a6b2dc4e01a0640929ca2ebf Mon Sep 17 00:00:00 2001 From: h00die Date: Mon, 21 Sep 2020 19:35:46 -0400 Subject: [PATCH] fix tests --- lib/msf/core/auxiliary/vyos.rb | 4 +++- spec/lib/msf/core/auxiliary/vyos_spec.rb | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/msf/core/auxiliary/vyos.rb b/lib/msf/core/auxiliary/vyos.rb index 48bba561a3..9b583de8ae 100644 --- a/lib/msf/core/auxiliary/vyos.rb +++ b/lib/msf/core/auxiliary/vyos.rb @@ -33,7 +33,7 @@ module Msf if store && !config.include?('such file or directory') l = store_loot('vyos.config', 'text/plain', thost, config.strip, 'config.txt', 'VyOS Configuration') - vprint_good("Config saved to: #{l}") + vprint_good("#{thost}:#{tport} Config saved to: #{l}") end host_info = { @@ -297,6 +297,8 @@ module Msf # https://docs.vyos.io/en/crux/interfaces/pppoe.html#pppoe + # /config/auth/ldap-auth.config + end end end diff --git a/spec/lib/msf/core/auxiliary/vyos_spec.rb b/spec/lib/msf/core/auxiliary/vyos_spec.rb index 5d7d5eae7e..e058bd6f13 100644 --- a/spec/lib/msf/core/auxiliary/vyos_spec.rb +++ b/spec/lib/msf/core/auxiliary/vyos_spec.rb @@ -19,6 +19,10 @@ RSpec.describe Msf::Auxiliary::VYOS do true end + def vprint_good(_str = nil) + raise StandardError, 'This method needs to be stubbed.' + end + def print_good(_str = nil) raise StandardError, 'This method needs to be stubbed.' end @@ -101,6 +105,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " }\n" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 Username 'jsmith' with level 'operator' with hash $6$ELBrDuW7c/8$nN7MwUST8s8O0R6HMNu/iPoTQ1s..y8HTnXraJ7Hh4bHefRmjt/2U08ZckEw4FU034wbWaeCaB5hq7mC6fNXl/") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:store_loot).with( 'vyos.config', 'text/plain', '127.0.0.1', data, 'config.txt', 'VyOS Configuration' ) @@ -135,6 +140,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " }\n" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 Username 'vyos' with level 'admin' with hash $1$5HsQse2v$VQLh5eeEp4ZzGmCG/PRBA1") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:store_loot).with( 'vyos.config', 'text/plain', '127.0.0.1', data, 'config.txt', 'VyOS Configuration' ) @@ -169,6 +175,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " }\n" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 Username 'vyos' with level 'admin'") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:store_loot).with( 'vyos.config', 'text/plain', '127.0.0.1', data, 'config.txt', 'VyOS Configuration' ) @@ -199,6 +206,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " }\n" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 SNMP Community 'ro' with ro access") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:store_loot).with( 'vyos.config', 'text/plain', '127.0.0.1', data, 'config.txt', 'VyOS Configuration' ) @@ -230,6 +238,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " }\n" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 SNMP Community 'write' with rw access") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:store_loot).with( 'vyos.config', 'text/plain', '127.0.0.1', data, 'config.txt', 'VyOS Configuration' ) @@ -255,6 +264,7 @@ RSpec.describe Msf::Auxiliary::VYOS do it 'deals with OS Versions old style' do data = "/* Release version: VyOS 1.1.8 */" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 OS Version: VyOS 1.1.8") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:store_loot).with( 'vyos.config', 'text/plain', '127.0.0.1', data, 'config.txt', 'VyOS Configuration' ) @@ -264,6 +274,7 @@ RSpec.describe Msf::Auxiliary::VYOS do it 'deals with OS Versions new style' do data = "// Release version: VyOS 1.3-rolling-202008270118" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 OS Version: VyOS 1.3-rolling-202008270118") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:store_loot).with( 'vyos.config', 'text/plain', '127.0.0.1', data, 'config.txt', 'VyOS Configuration' ) @@ -275,6 +286,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " host-name vyos\n" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 Hostname: vyos") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:store_loot).with( 'vyos.config', 'text/plain', '127.0.0.1', data, 'config.txt', 'VyOS Configuration' ) @@ -289,6 +301,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " }" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 Interface eth0 (00:00:aa:ff:99:99) - 1.1.1.1") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:store_loot).with( 'vyos.config', 'text/plain', '127.0.0.1', data, 'config.txt', 'VyOS Configuration' ) @@ -304,6 +317,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " }" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 Interface eth0 (00:00:aa:ff:99:99) - 1.1.1.1 with description: outside") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:store_loot).with( 'vyos.config', 'text/plain', '127.0.0.1', data, 'config.txt', 'VyOS Configuration' ) @@ -328,6 +342,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " }\n" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 Wireless access-point 'TEST' with password: 12345678") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:create_credential_and_login).with( { address: '127.0.0.1', @@ -373,6 +388,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " }\n" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 Wireless access-point 'Enterprise-TEST' with radius password: VyOSPassword to 192.168.3.101812") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:create_credential_and_login).with( { address: '127.0.0.1', @@ -409,6 +425,7 @@ RSpec.describe Msf::Auxiliary::VYOS do data << " }\n" data << "}" expect(aux_vyos).to receive(:print_good).with("127.0.0.1:161 Wireless station 'TEST' with password: 12345678") + expect(aux_vyos).to receive(:vprint_good).with("127.0.0.1:161 Config saved to: ") expect(aux_vyos).to receive(:create_credential_and_login).with( { address: '127.0.0.1',