librex 0.0.65 → 0.0.66
Sign up to get free protection for your applications and to get access to all the features.
- data/README.markdown +1 -1
- data/lib/rex/arch.rb +1 -0
- data/lib/rex/arch/sparc.rb +16 -15
- data/lib/rex/arch/sparc.rb.ut.rb +2 -1
- data/lib/rex/arch/x86.rb +1 -0
- data/lib/rex/arch/x86.rb.ut.rb +2 -1
- data/lib/rex/assembly/nasm.rb +1 -0
- data/lib/rex/assembly/nasm.rb.ut.rb +2 -1
- data/lib/rex/compat.rb +13 -0
- data/lib/rex/constants.rb +5 -4
- data/lib/rex/elfparsey.rb +3 -2
- data/lib/rex/elfparsey/elf.rb +2 -1
- data/lib/rex/elfparsey/elfbase.rb +8 -7
- data/lib/rex/elfparsey/exceptions.rb +3 -2
- data/lib/rex/elfscan.rb +3 -2
- data/lib/rex/elfscan/scanner.rb +2 -1
- data/lib/rex/elfscan/search.rb +2 -1
- data/lib/rex/encoder/alpha2.rb +2 -1
- data/lib/rex/encoder/alpha2/alpha_mixed.rb +3 -2
- data/lib/rex/encoder/alpha2/alpha_upper.rb +5 -4
- data/lib/rex/encoder/alpha2/generic.rb +37 -60
- data/lib/rex/encoder/alpha2/unicode_mixed.rb +4 -9
- data/lib/rex/encoder/alpha2/unicode_upper.rb +4 -9
- data/lib/rex/encoder/ndr.rb +1 -0
- data/lib/rex/encoder/ndr.rb.ut.rb +2 -1
- data/lib/rex/encoder/nonalpha.rb +1 -0
- data/lib/rex/encoder/nonupper.rb +1 -0
- data/lib/rex/encoder/xdr.rb +9 -8
- data/lib/rex/encoder/xdr.rb.ut.rb +2 -1
- data/lib/rex/encoder/xor.rb +1 -0
- data/lib/rex/encoder/xor/dword.rb +2 -1
- data/lib/rex/encoder/xor/dword_additive.rb +2 -1
- data/lib/rex/encoders/xor_dword.rb +1 -0
- data/lib/rex/encoders/xor_dword_additive.rb +2 -1
- data/lib/rex/encoders/xor_dword_additive.rb.ut.rb +2 -1
- data/lib/rex/encoding/xor.rb +2 -1
- data/lib/rex/encoding/xor.rb.ts.rb +2 -1
- data/lib/rex/encoding/xor/byte.rb +2 -1
- data/lib/rex/encoding/xor/byte.rb.ut.rb +2 -1
- data/lib/rex/encoding/xor/dword.rb +2 -1
- data/lib/rex/encoding/xor/dword.rb.ut.rb +2 -1
- data/lib/rex/encoding/xor/dword_additive.rb +1 -0
- data/lib/rex/encoding/xor/dword_additive.rb.ut.rb +2 -1
- data/lib/rex/encoding/xor/exceptions.rb +1 -0
- data/lib/rex/encoding/xor/generic.rb +1 -0
- data/lib/rex/encoding/xor/generic.rb.ut.rb +2 -1
- data/lib/rex/encoding/xor/qword.rb +2 -1
- data/lib/rex/encoding/xor/word.rb +2 -1
- data/lib/rex/encoding/xor/word.rb.ut.rb +2 -1
- data/lib/rex/exceptions.rb +1 -0
- data/lib/rex/exceptions.rb.ut.rb +2 -1
- data/lib/rex/exploitation/cmdstager.rb +2 -1
- data/lib/rex/exploitation/cmdstager/base.rb +1 -0
- data/lib/rex/exploitation/cmdstager/debug_asm.rb +2 -1
- data/lib/rex/exploitation/cmdstager/debug_write.rb +2 -1
- data/lib/rex/exploitation/cmdstager/tftp.rb +2 -1
- data/lib/rex/exploitation/cmdstager/vbs.rb +2 -1
- data/lib/rex/exploitation/egghunter.rb +12 -11
- data/lib/rex/exploitation/egghunter.rb.ut.rb +2 -1
- data/lib/rex/exploitation/encryptjs.rb +1 -0
- data/lib/rex/exploitation/heaplib.rb +1 -0
- data/lib/rex/exploitation/javascriptosdetect.js +1014 -0
- data/lib/rex/exploitation/javascriptosdetect.rb +4 -857
- data/lib/rex/exploitation/jsobfu.rb +2 -1
- data/lib/rex/exploitation/obfuscatejs.rb +1 -0
- data/lib/rex/exploitation/omelet.rb +1 -0
- data/lib/rex/exploitation/omelet.rb.ut.rb +1 -0
- data/lib/rex/exploitation/opcodedb.rb +12 -11
- data/lib/rex/exploitation/opcodedb.rb.ut.rb +2 -1
- data/lib/rex/exploitation/seh.rb +3 -2
- data/lib/rex/exploitation/seh.rb.ut.rb +2 -1
- data/lib/rex/file.rb +4 -3
- data/lib/rex/file.rb.ut.rb +2 -1
- data/lib/rex/image_source.rb +3 -2
- data/lib/rex/image_source/disk.rb +3 -2
- data/lib/rex/image_source/image_source.rb +3 -2
- data/lib/rex/image_source/memory.rb +3 -2
- data/lib/rex/io/bidirectional_pipe.rb +1 -0
- data/lib/rex/io/datagram_abstraction.rb +2 -1
- data/lib/rex/io/ring_buffer.rb +49 -44
- data/lib/rex/io/ring_buffer.rb.ut.rb +4 -3
- data/lib/rex/io/stream.rb +1 -0
- data/lib/rex/io/stream_abstraction.rb +1 -0
- data/lib/rex/io/stream_server.rb +1 -0
- data/lib/rex/job_container.rb +1 -0
- data/lib/rex/logging.rb +2 -1
- data/lib/rex/logging/log_dispatcher.rb +5 -4
- data/lib/rex/logging/log_sink.rb +2 -1
- data/lib/rex/logging/sinks/flatfile.rb +4 -3
- data/lib/rex/logging/sinks/stderr.rb +2 -1
- data/lib/rex/machparsey.rb +2 -1
- data/lib/rex/machparsey/exceptions.rb +2 -1
- data/lib/rex/machparsey/mach.rb +20 -19
- data/lib/rex/machparsey/machbase.rb +27 -26
- data/lib/rex/machscan.rb +2 -1
- data/lib/rex/machscan/scanner.rb +1 -0
- data/lib/rex/mime.rb +2 -1
- data/lib/rex/mime/header.rb +1 -0
- data/lib/rex/mime/message.rb +4 -1
- data/lib/rex/mime/part.rb +2 -1
- data/lib/rex/nop/opty2.rb +2 -1
- data/lib/rex/nop/opty2.rb.ut.rb +2 -1
- data/lib/rex/nop/opty2_tables.rb +1 -0
- data/lib/rex/ole.rb +3 -2
- data/lib/rex/ole/clsid.rb +3 -2
- data/lib/rex/ole/difat.rb +3 -2
- data/lib/rex/ole/directory.rb +3 -2
- data/lib/rex/ole/direntry.rb +3 -2
- data/lib/rex/ole/fat.rb +3 -2
- data/lib/rex/ole/header.rb +3 -2
- data/lib/rex/ole/minifat.rb +3 -2
- data/lib/rex/ole/propset.rb +4 -3
- data/lib/rex/ole/samples/create_ole.rb +1 -0
- data/lib/rex/ole/samples/dir.rb +1 -0
- data/lib/rex/ole/samples/dump_stream.rb +1 -0
- data/lib/rex/ole/samples/ole_info.rb +1 -0
- data/lib/rex/ole/storage.rb +3 -2
- data/lib/rex/ole/stream.rb +3 -2
- data/lib/rex/ole/substorage.rb +3 -2
- data/lib/rex/ole/util.rb +3 -2
- data/lib/rex/parser/acunetix_nokogiri.rb +13 -12
- data/lib/rex/parser/apple_backup_manifestdb.rb +20 -19
- data/lib/rex/parser/appscan_nokogiri.rb +17 -16
- data/lib/rex/parser/arguments.rb +2 -1
- data/lib/rex/parser/arguments.rb.ut.rb +2 -1
- data/lib/rex/parser/burp_session_nokogiri.rb +8 -7
- data/lib/rex/parser/ci_nokogiri.rb +4 -3
- data/lib/rex/parser/foundstone_nokogiri.rb +18 -17
- data/lib/rex/parser/fusionvm_nokogiri.rb +109 -0
- data/lib/rex/parser/ini.rb +1 -0
- data/lib/rex/parser/ini.rb.ut.rb +2 -1
- data/lib/rex/parser/ip360_aspl_xml.rb +1 -0
- data/lib/rex/parser/ip360_xml.rb +4 -3
- data/lib/rex/parser/mbsa_nokogiri.rb +8 -7
- data/lib/rex/parser/nessus_xml.rb +3 -2
- data/lib/rex/parser/netsparker_xml.rb +10 -9
- data/lib/rex/parser/nexpose_raw_nokogiri.rb +372 -52
- data/lib/rex/parser/nexpose_simple_nokogiri.rb +8 -7
- data/lib/rex/parser/nexpose_xml.rb +1 -0
- data/lib/rex/parser/nmap_nokogiri.rb +63 -33
- data/lib/rex/parser/nmap_xml.rb +1 -0
- data/lib/rex/parser/nokogiri_doc_mixin.rb +35 -15
- data/lib/rex/parser/openvas_nokogiri.rb +172 -0
- data/lib/rex/parser/retina_xml.rb +1 -0
- data/lib/rex/parser/wapiti_nokogiri.rb +105 -0
- data/lib/rex/payloads.rb +2 -1
- data/lib/rex/payloads/win32.rb +2 -1
- data/lib/rex/payloads/win32/common.rb +2 -1
- data/lib/rex/payloads/win32/kernel.rb +2 -1
- data/lib/rex/payloads/win32/kernel/common.rb +4 -3
- data/lib/rex/payloads/win32/kernel/migration.rb +2 -1
- data/lib/rex/payloads/win32/kernel/recovery.rb +2 -1
- data/lib/rex/payloads/win32/kernel/stager.rb +21 -20
- data/lib/rex/peparsey.rb +3 -2
- data/lib/rex/peparsey/exceptions.rb +2 -1
- data/lib/rex/peparsey/pe.rb +3 -2
- data/lib/rex/peparsey/pe_memdump.rb +2 -1
- data/lib/rex/peparsey/pebase.rb +2 -1
- data/lib/rex/peparsey/section.rb +2 -1
- data/lib/rex/pescan.rb +3 -2
- data/lib/rex/pescan/analyze.rb +1 -0
- data/lib/rex/pescan/scanner.rb +1 -0
- data/lib/rex/pescan/search.rb +1 -0
- data/lib/rex/platforms.rb +2 -1
- data/lib/rex/platforms/windows.rb +2 -1
- data/lib/rex/poly.rb +2 -1
- data/lib/rex/poly/block.rb +16 -15
- data/lib/rex/poly/register.rb +2 -1
- data/lib/rex/poly/register/x86.rb +2 -1
- data/lib/rex/post.rb +2 -2
- data/lib/rex/post/dir.rb +2 -1
- data/lib/rex/post/file.rb +1 -0
- data/lib/rex/post/file_stat.rb +1 -0
- data/lib/rex/post/io.rb +2 -1
- data/lib/rex/post/meterpreter.rb +2 -1
- data/lib/rex/post/meterpreter/channel.rb +1 -0
- data/lib/rex/post/meterpreter/channel_container.rb +2 -1
- data/lib/rex/post/meterpreter/channels/pool.rb +1 -0
- data/lib/rex/post/meterpreter/channels/pools/file.rb +1 -0
- data/lib/rex/post/meterpreter/channels/pools/stream_pool.rb +3 -2
- data/lib/rex/post/meterpreter/channels/stream.rb +1 -0
- data/lib/rex/post/meterpreter/client.rb +23 -1
- data/lib/rex/post/meterpreter/client_core.rb +10 -5
- data/lib/rex/post/meterpreter/dependencies.rb +2 -1
- data/lib/rex/post/meterpreter/extension.rb +2 -1
- data/lib/rex/post/meterpreter/extensions/espia/espia.rb +7 -6
- data/lib/rex/post/meterpreter/extensions/espia/tlv.rb +2 -1
- data/lib/rex/post/meterpreter/extensions/incognito/incognito.rb +5 -4
- data/lib/rex/post/meterpreter/extensions/incognito/tlv.rb +2 -1
- data/lib/rex/post/meterpreter/extensions/lanattacks/lanattacks.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/lanattacks/tlv.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/networkpug/networkpug.rb +7 -6
- data/lib/rex/post/meterpreter/extensions/networkpug/tlv.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/priv/fs.rb +2 -1
- data/lib/rex/post/meterpreter/extensions/priv/passwd.rb +2 -1
- data/lib/rex/post/meterpreter/extensions/priv/priv.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/priv/tlv.rb +2 -1
- data/lib/rex/post/meterpreter/extensions/sniffer/sniffer.rb +28 -11
- data/lib/rex/post/meterpreter/extensions/sniffer/tlv.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/constants.rb +6 -5
- data/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb +3 -2
- data/lib/rex/post/meterpreter/extensions/stdapi/fs/file_stat.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/fs/io.rb +2 -1
- data/lib/rex/post/meterpreter/extensions/stdapi/net/config.rb +39 -5
- data/lib/rex/post/meterpreter/extensions/stdapi/net/interface.rb +75 -18
- data/lib/rex/post/meterpreter/extensions/stdapi/net/route.rb +18 -6
- data/lib/rex/post/meterpreter/extensions/stdapi/net/socket.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/net/socket_subsystem/tcp_client_channel.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/net/socket_subsystem/tcp_server_channel.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/net/socket_subsystem/udp_channel.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun.rb.ts.rb +4 -1
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/api_constants.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/api_constants.rb.ut.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/buffer_item.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/buffer_item.rb.ut.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_advapi32.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_crypt32.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_iphlpapi.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_kernel32.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_netapi32.rb +12 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_ntdll.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_shell32.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_user32.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_wlanapi.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/def_ws2_32.rb +7 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll.rb.ut.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_function.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_function.rb.ut.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_helper.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_helper.rb.ut.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_wrapper.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_wrapper.rb.ut.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/mock_magic.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/multicall.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/platform_util.rb +23 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/platform_util.rb.ut.rb +29 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/railgun.rb +10 -5
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/railgun.rb.ut.rb +9 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/tlv.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb +106 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/type/pointer_util.rb.ut.rb +128 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/win_const_manager.rb +27 -6
- data/lib/rex/post/meterpreter/extensions/stdapi/railgun/win_const_manager.rb.ut.rb +21 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/stdapi.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/config.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/event_log.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/event_log_subsystem/event_record.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/power.rb +2 -1
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb +43 -4
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/process_subsystem/image.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/process_subsystem/io.rb +2 -1
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/process_subsystem/memory.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/process_subsystem/thread.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/registry.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/registry_subsystem/registry_key.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/registry_subsystem/registry_value.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/registry_subsystem/remote_registry_key.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/sys/thread.rb +1 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/tlv.rb +7 -0
- data/lib/rex/post/meterpreter/extensions/stdapi/ui.rb +14 -13
- data/lib/rex/post/meterpreter/extensions/stdapi/webcam/webcam.rb +1 -0
- data/lib/rex/post/meterpreter/inbound_packet_handler.rb +2 -1
- data/lib/rex/post/meterpreter/object_aliases.rb +6 -5
- data/lib/rex/post/meterpreter/packet.rb +26 -6
- data/lib/rex/post/meterpreter/packet_dispatcher.rb +1 -0
- data/lib/rex/post/meterpreter/packet_parser.rb +1 -0
- data/lib/rex/post/meterpreter/packet_response_waiter.rb +1 -0
- data/lib/rex/post/meterpreter/ui/console.rb +1 -0
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher.rb +1 -0
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb +103 -28
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/espia.rb +1 -0
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/incognito.rb +1 -0
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/networkpug.rb +1 -0
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/priv.rb +3 -2
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/priv/elevate.rb +12 -11
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/priv/passwd.rb +2 -1
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/priv/timestomp.rb +2 -1
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/sniffer.rb +53 -36
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi.rb +3 -2
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb +87 -44
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb +80 -18
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb +77 -48
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb +72 -41
- data/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/webcam.rb +24 -5
- data/lib/rex/post/meterpreter/ui/console/interactive_channel.rb +2 -1
- data/lib/rex/post/permission.rb +2 -1
- data/lib/rex/post/process.rb +2 -1
- data/lib/rex/post/thread.rb +2 -1
- data/lib/rex/post/ui.rb +2 -1
- data/lib/rex/proto.rb +1 -0
- data/lib/rex/proto.rb.ts.rb +2 -1
- data/lib/rex/proto/dcerpc.rb +2 -1
- data/lib/rex/proto/dcerpc.rb.ts.rb +2 -1
- data/lib/rex/proto/dcerpc/client.rb +1 -0
- data/lib/rex/proto/dcerpc/client.rb.ut.rb +1 -0
- data/lib/rex/proto/dcerpc/exceptions.rb +2 -1
- data/lib/rex/proto/dcerpc/handle.rb +1 -0
- data/lib/rex/proto/dcerpc/handle.rb.ut.rb +2 -1
- data/lib/rex/proto/dcerpc/ndr.rb +2 -1
- data/lib/rex/proto/dcerpc/ndr.rb.ut.rb +2 -1
- data/lib/rex/proto/dcerpc/packet.rb +52 -45
- data/lib/rex/proto/dcerpc/packet.rb.ut.rb +12 -11
- data/lib/rex/proto/dcerpc/response.rb +1 -0
- data/lib/rex/proto/dcerpc/response.rb.ut.rb +2 -1
- data/lib/rex/proto/dcerpc/uuid.rb +13 -12
- data/lib/rex/proto/dcerpc/uuid.rb.ut.rb +2 -1
- data/lib/rex/proto/dhcp.rb +2 -1
- data/lib/rex/proto/dhcp/constants.rb +2 -1
- data/lib/rex/proto/dhcp/server.rb +4 -3
- data/lib/rex/proto/drda.rb +1 -0
- data/lib/rex/proto/drda.rb.ts.rb +1 -0
- data/lib/rex/proto/drda/constants.rb +1 -0
- data/lib/rex/proto/drda/constants.rb.ut.rb +1 -0
- data/lib/rex/proto/drda/packet.rb +11 -10
- data/lib/rex/proto/drda/packet.rb.ut.rb +5 -4
- data/lib/rex/proto/drda/utils.rb +4 -3
- data/lib/rex/proto/drda/utils.rb.ut.rb +3 -2
- data/lib/rex/proto/http.rb +2 -1
- data/lib/rex/proto/http.rb.ts.rb +2 -1
- data/lib/rex/proto/http/client.rb +29 -5
- data/lib/rex/proto/http/client.rb.ut.rb +1 -0
- data/lib/rex/proto/http/handler.rb +2 -1
- data/lib/rex/proto/http/handler/erb.rb +5 -4
- data/lib/rex/proto/http/handler/erb.rb.ut.rb +2 -1
- data/lib/rex/proto/http/handler/proc.rb +1 -0
- data/lib/rex/proto/http/handler/proc.rb.ut.rb +2 -1
- data/lib/rex/proto/http/header.rb +3 -3
- data/lib/rex/proto/http/header.rb.ut.rb +2 -1
- data/lib/rex/proto/http/packet.rb +1 -0
- data/lib/rex/proto/http/packet.rb.ut.rb +15 -14
- data/lib/rex/proto/http/request.rb +23 -22
- data/lib/rex/proto/http/request.rb.ut.rb +2 -1
- data/lib/rex/proto/http/response.rb +6 -5
- data/lib/rex/proto/http/response.rb.ut.rb +7 -6
- data/lib/rex/proto/http/server.rb +1 -0
- data/lib/rex/proto/http/server.rb.ut.rb +6 -5
- data/lib/rex/proto/iax2.rb +1 -0
- data/lib/rex/proto/iax2/call.rb +48 -47
- data/lib/rex/proto/iax2/client.rb +23 -22
- data/lib/rex/proto/iax2/codecs.rb +1 -0
- data/lib/rex/proto/iax2/codecs/alaw.rb +1 -0
- data/lib/rex/proto/iax2/codecs/g711.rb +4 -3
- data/lib/rex/proto/iax2/codecs/mulaw.rb +1 -0
- data/lib/rex/proto/iax2/constants.rb +1 -0
- data/lib/rex/proto/natpmp.rb +11 -0
- data/lib/rex/proto/natpmp/constants.rb +19 -0
- data/lib/rex/proto/natpmp/packet.rb +45 -0
- data/lib/rex/proto/ntlm.rb +1 -0
- data/lib/rex/proto/ntlm.rb.ut.rb +1 -0
- data/lib/rex/proto/ntlm/base.rb +38 -37
- data/lib/rex/proto/ntlm/constants.rb +1 -0
- data/lib/rex/proto/ntlm/crypt.rb +45 -44
- data/lib/rex/proto/ntlm/exceptions.rb +1 -0
- data/lib/rex/proto/ntlm/message.rb +30 -29
- data/lib/rex/proto/ntlm/utils.rb +116 -115
- data/lib/rex/proto/proxy/socks4a.rb +1 -0
- data/lib/rex/proto/rfb.rb +1 -0
- data/lib/rex/proto/rfb.rb.ut.rb +1 -0
- data/lib/rex/proto/rfb/cipher.rb +1 -0
- data/lib/rex/proto/rfb/client.rb +1 -0
- data/lib/rex/proto/rfb/constants.rb +1 -0
- data/lib/rex/proto/smb.rb +2 -1
- data/lib/rex/proto/smb.rb.ts.rb +2 -1
- data/lib/rex/proto/smb/client.rb +23 -22
- data/lib/rex/proto/smb/client.rb.ut.rb +1 -0
- data/lib/rex/proto/smb/constants.rb +1 -0
- data/lib/rex/proto/smb/constants.rb.ut.rb +2 -1
- data/lib/rex/proto/smb/crypt.rb +3 -2
- data/lib/rex/proto/smb/evasions.rb +1 -0
- data/lib/rex/proto/smb/exceptions.rb +6 -5
- data/lib/rex/proto/smb/simpleclient.rb +1 -0
- data/lib/rex/proto/smb/simpleclient.rb.ut.rb +1 -0
- data/lib/rex/proto/smb/utils.rb +1 -0
- data/lib/rex/proto/smb/utils.rb.ut.rb +2 -1
- data/lib/rex/proto/sunrpc.rb +1 -0
- data/lib/rex/proto/sunrpc/client.rb +1 -0
- data/lib/rex/proto/tftp.rb +3 -1
- data/lib/rex/proto/tftp/client.rb +344 -0
- data/lib/rex/proto/tftp/constants.rb +2 -1
- data/lib/rex/proto/tftp/server.rb +2 -1
- data/lib/rex/proto/tftp/server.rb.ut.rb +3 -2
- data/lib/rex/registry.rb +14 -0
- data/lib/rex/registry/hive.rb +132 -0
- data/lib/rex/registry/lfkey.rb +51 -0
- data/lib/rex/registry/nodekey.rb +54 -0
- data/lib/rex/registry/regf.rb +25 -0
- data/lib/rex/registry/valuekey.rb +67 -0
- data/lib/rex/registry/valuelist.rb +29 -0
- data/lib/rex/ropbuilder.rb +2 -1
- data/lib/rex/ropbuilder/rop.rb +3 -2
- data/lib/rex/script.rb +1 -0
- data/lib/rex/script/base.rb +1 -0
- data/lib/rex/script/meterpreter.rb +1 -0
- data/lib/rex/script/shell.rb +1 -0
- data/lib/rex/service.rb +2 -1
- data/lib/rex/service_manager.rb +6 -5
- data/lib/rex/service_manager.rb.ut.rb +2 -1
- data/lib/rex/services/local_relay.rb +1 -0
- data/lib/rex/socket.rb +72 -36
- data/lib/rex/socket.rb.ut.rb +1 -0
- data/lib/rex/socket/comm.rb +1 -0
- data/lib/rex/socket/comm/local.rb +60 -13
- data/lib/rex/socket/comm/local.rb.ut.rb +2 -1
- data/lib/rex/socket/ip.rb +1 -0
- data/lib/rex/socket/parameters.rb +15 -14
- data/lib/rex/socket/parameters.rb.ut.rb +2 -1
- data/lib/rex/socket/range_walker.rb +71 -26
- data/lib/rex/socket/range_walker.rb.ut.rb +2 -1
- data/lib/rex/socket/ssl_tcp.rb +1 -0
- data/lib/rex/socket/ssl_tcp.rb.ut.rb +2 -1
- data/lib/rex/socket/ssl_tcp_server.rb +1 -0
- data/lib/rex/socket/ssl_tcp_server.rb.ut.rb +1 -0
- data/lib/rex/socket/subnet_walker.rb +1 -0
- data/lib/rex/socket/subnet_walker.rb.ut.rb +2 -1
- data/lib/rex/socket/switch_board.rb +1 -0
- data/lib/rex/socket/switch_board.rb.ut.rb +2 -1
- data/lib/rex/socket/tcp.rb +4 -3
- data/lib/rex/socket/tcp.rb.ut.rb +2 -1
- data/lib/rex/socket/tcp_server.rb +1 -0
- data/lib/rex/socket/tcp_server.rb.ut.rb +2 -1
- data/lib/rex/socket/udp.rb +2 -1
- data/lib/rex/socket/udp.rb.ut.rb +2 -1
- data/lib/rex/struct2.rb +2 -1
- data/lib/rex/struct2/c_struct.rb +2 -1
- data/lib/rex/struct2/c_struct_template.rb +2 -1
- data/lib/rex/struct2/constant.rb +2 -1
- data/lib/rex/struct2/element.rb +2 -1
- data/lib/rex/struct2/generic.rb +1 -0
- data/lib/rex/struct2/restraint.rb +2 -1
- data/lib/rex/struct2/s_string.rb +1 -0
- data/lib/rex/struct2/s_struct.rb +1 -0
- data/lib/rex/sync.rb +2 -1
- data/lib/rex/sync/event.rb +1 -0
- data/lib/rex/sync/read_write_lock.rb +1 -0
- data/lib/rex/sync/ref.rb +2 -1
- data/lib/rex/sync/thread_safe.rb +2 -1
- data/lib/rex/test.rb +2 -1
- data/lib/rex/text.rb +136 -19
- data/lib/rex/text.rb.ut.rb +1 -0
- data/lib/rex/thread_factory.rb +5 -4
- data/lib/rex/time.rb +2 -1
- data/lib/rex/transformer.rb +1 -0
- data/lib/rex/transformer.rb.ut.rb +2 -1
- data/lib/rex/ui.rb +2 -1
- data/lib/rex/ui/interactive.rb +10 -9
- data/lib/rex/ui/output.rb +1 -0
- data/lib/rex/ui/output/none.rb +2 -1
- data/lib/rex/ui/progress_tracker.rb +2 -1
- data/lib/rex/ui/subscriber.rb +9 -8
- data/lib/rex/ui/text/color.rb +1 -0
- data/lib/rex/ui/text/color.rb.ut.rb +1 -0
- data/lib/rex/ui/text/dispatcher_shell.rb +63 -23
- data/lib/rex/ui/text/input.rb +1 -0
- data/lib/rex/ui/text/input/buffer.rb +7 -6
- data/lib/rex/ui/text/input/readline.rb +14 -13
- data/lib/rex/ui/text/input/socket.rb +1 -0
- data/lib/rex/ui/text/input/stdio.rb +2 -1
- data/lib/rex/ui/text/irb_shell.rb +1 -0
- data/lib/rex/ui/text/output.rb +1 -0
- data/lib/rex/ui/text/output/buffer.rb +1 -0
- data/lib/rex/ui/text/output/file.rb +1 -0
- data/lib/rex/ui/text/output/socket.rb +1 -0
- data/lib/rex/ui/text/output/stdio.rb +1 -0
- data/lib/rex/ui/text/output/tee.rb +1 -0
- data/lib/rex/ui/text/progress_tracker.rb +2 -1
- data/lib/rex/ui/text/progress_tracker.rb.ut.rb +2 -1
- data/lib/rex/ui/text/shell.rb +1 -0
- data/lib/rex/ui/text/table.rb +20 -14
- data/lib/rex/ui/text/table.rb.ut.rb +3 -2
- data/lib/rex/zip.rb +1 -0
- data/lib/rex/zip/archive.rb +2 -1
- data/lib/rex/zip/blocks.rb +3 -2
- data/lib/rex/zip/entry.rb +6 -7
- data/lib/rex/zip/jar.rb +4 -3
- data/lib/rex/zip/samples/comment.rb +1 -0
- data/lib/rex/zip/samples/mkwar.rb +1 -0
- data/lib/rex/zip/samples/mkzip.rb +1 -0
- data/lib/rex/zip/samples/recursive.rb +1 -0
- metadata +433 -435
@@ -1,4 +1,5 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
|
+
# -*- coding: binary -*-
|
2
3
|
|
3
4
|
require 'rex/post/meterpreter/extensions/networkpug/tlv'
|
4
5
|
|
@@ -18,7 +19,7 @@ class NetworkPug < Extension
|
|
18
19
|
|
19
20
|
client.register_extension_aliases(
|
20
21
|
[
|
21
|
-
{
|
22
|
+
{
|
22
23
|
'name' => 'networkpug',
|
23
24
|
'ext' => self
|
24
25
|
},
|
@@ -33,7 +34,7 @@ class NetworkPug < Extension
|
|
33
34
|
|
34
35
|
channel = nil
|
35
36
|
channel_id = response.get_tlv_value(TLV_TYPE_CHANNEL_ID)
|
36
|
-
|
37
|
+
|
37
38
|
if(channel_id)
|
38
39
|
channel = Rex::Post::Meterpreter::Channels::Pools::StreamPool.new(
|
39
40
|
client,
|
@@ -42,16 +43,16 @@ class NetworkPug < Extension
|
|
42
43
|
CHANNEL_FLAG_SYNCHRONOUS
|
43
44
|
)
|
44
45
|
end
|
45
|
-
|
46
|
+
|
46
47
|
return response, channel
|
47
48
|
end
|
48
|
-
|
49
|
+
|
49
50
|
def networkpug_stop(interface)
|
50
51
|
request = Packet.create_request('networkpug_stop')
|
51
52
|
request.add_tlv(TLV_TYPE_NETWORKPUG_INTERFACE, interface)
|
52
|
-
response = client.send_request(request)
|
53
|
+
response = client.send_request(request)
|
53
54
|
end
|
54
|
-
|
55
|
+
|
55
56
|
end
|
56
57
|
|
57
58
|
end; end; end; end; end
|
@@ -1,4 +1,5 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
|
+
# -*- coding: binary -*-
|
2
3
|
|
3
4
|
require 'rex/post/meterpreter/extensions/sniffer/tlv'
|
4
5
|
require 'rex/proto/smb/utils'
|
@@ -22,7 +23,7 @@ class Sniffer < Extension
|
|
22
23
|
|
23
24
|
client.register_extension_aliases(
|
24
25
|
[
|
25
|
-
{
|
26
|
+
{
|
26
27
|
'name' => 'sniffer',
|
27
28
|
'ext' => self
|
28
29
|
},
|
@@ -42,26 +43,30 @@ class Sniffer < Extension
|
|
42
43
|
ikeys = %W{idx name description type mtu wireless usable dhcp}
|
43
44
|
ikeys.each_index { |i| iface[ikeys[i]] = vals[i] }
|
44
45
|
ifaces << iface
|
45
|
-
}
|
46
|
+
}
|
46
47
|
return ifaces
|
47
48
|
end
|
48
|
-
|
49
|
+
|
49
50
|
# Start a packet capture on an opened interface
|
50
51
|
def capture_start(intf,maxp=200000,filter="")
|
51
52
|
request = Packet.create_request('sniffer_capture_start')
|
52
53
|
request.add_tlv(TLV_TYPE_SNIFFER_INTERFACE_ID, intf.to_i)
|
53
54
|
request.add_tlv(TLV_TYPE_SNIFFER_PACKET_COUNT, maxp.to_i)
|
54
55
|
request.add_tlv(TLV_TYPE_SNIFFER_ADDITIONAL_FILTER, filter) if filter.length > 0
|
55
|
-
response = client.send_request(request)
|
56
|
+
response = client.send_request(request)
|
56
57
|
end
|
57
|
-
|
58
|
+
|
58
59
|
# Stop an active packet capture
|
59
60
|
def capture_stop(intf)
|
60
61
|
request = Packet.create_request('sniffer_capture_stop')
|
61
62
|
request.add_tlv(TLV_TYPE_SNIFFER_INTERFACE_ID, intf.to_i)
|
62
|
-
response = client.send_request(request)
|
63
|
+
response = client.send_request(request)
|
64
|
+
{
|
65
|
+
:packets => response.get_tlv_value(TLV_TYPE_SNIFFER_PACKET_COUNT),
|
66
|
+
:bytes => response.get_tlv_value(TLV_TYPE_SNIFFER_BYTE_COUNT),
|
67
|
+
}
|
63
68
|
end
|
64
|
-
|
69
|
+
|
65
70
|
# Retrieve stats about a current capture
|
66
71
|
def capture_stats(intf)
|
67
72
|
request = Packet.create_request('sniffer_capture_stats')
|
@@ -72,7 +77,18 @@ class Sniffer < Extension
|
|
72
77
|
:bytes => response.get_tlv_value(TLV_TYPE_SNIFFER_BYTE_COUNT),
|
73
78
|
}
|
74
79
|
end
|
75
|
-
|
80
|
+
|
81
|
+
# Release packets from a current capture
|
82
|
+
def capture_release(intf)
|
83
|
+
request = Packet.create_request('sniffer_capture_release')
|
84
|
+
request.add_tlv(TLV_TYPE_SNIFFER_INTERFACE_ID, intf.to_i)
|
85
|
+
response = client.send_request(request)
|
86
|
+
{
|
87
|
+
:packets => response.get_tlv_value(TLV_TYPE_SNIFFER_PACKET_COUNT),
|
88
|
+
:bytes => response.get_tlv_value(TLV_TYPE_SNIFFER_BYTE_COUNT),
|
89
|
+
}
|
90
|
+
end
|
91
|
+
|
76
92
|
# Buffer the current capture to a readable buffer
|
77
93
|
def capture_dump(intf)
|
78
94
|
request = Packet.create_request('sniffer_capture_dump')
|
@@ -81,21 +97,22 @@ class Sniffer < Extension
|
|
81
97
|
{
|
82
98
|
:packets => response.get_tlv_value(TLV_TYPE_SNIFFER_PACKET_COUNT),
|
83
99
|
:bytes => response.get_tlv_value(TLV_TYPE_SNIFFER_BYTE_COUNT),
|
100
|
+
:linktype => response.get_tlv_value(TLV_TYPE_SNIFFER_INTERFACE_ID) || 1,
|
84
101
|
}
|
85
102
|
end
|
86
|
-
|
103
|
+
|
87
104
|
# Retrieve the packet data for the specified capture
|
88
105
|
def capture_dump_read(intf, len=16384)
|
89
106
|
request = Packet.create_request('sniffer_capture_dump_read')
|
90
107
|
request.add_tlv(TLV_TYPE_SNIFFER_INTERFACE_ID, intf.to_i)
|
91
|
-
request.add_tlv(TLV_TYPE_SNIFFER_BYTE_COUNT, len.to_i)
|
108
|
+
request.add_tlv(TLV_TYPE_SNIFFER_BYTE_COUNT, len.to_i)
|
92
109
|
response = client.send_request(request, 3600)
|
93
110
|
{
|
94
111
|
:bytes => response.get_tlv_value(TLV_TYPE_SNIFFER_BYTE_COUNT),
|
95
112
|
:data => response.get_tlv_value(TLV_TYPE_SNIFFER_PACKET)
|
96
113
|
}
|
97
114
|
end
|
98
|
-
|
115
|
+
|
99
116
|
end
|
100
117
|
|
101
118
|
end; end; end; end; end
|
@@ -1,4 +1,5 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
|
+
# -*- coding: binary -*-
|
2
3
|
|
3
4
|
###
|
4
5
|
#
|
@@ -6,7 +7,7 @@
|
|
6
7
|
# --------------------------
|
7
8
|
#
|
8
9
|
# These are put into the global namespace for now
|
9
|
-
# so that they can be referenced globally.
|
10
|
+
# so that they can be referenced globally.
|
10
11
|
#
|
11
12
|
###
|
12
13
|
|
@@ -81,13 +82,13 @@ KEY_NOTIFY = 0x00000010
|
|
81
82
|
KEY_CREATE_LINK = 0x00000020
|
82
83
|
KEY_WOW64_64KEY = 0x00000100
|
83
84
|
KEY_WOW64_32KEY = 0x00000200
|
84
|
-
KEY_READ = (STANDARD_RIGHTS_READ | KEY_QUERY_VALUE |
|
85
|
+
KEY_READ = (STANDARD_RIGHTS_READ | KEY_QUERY_VALUE |
|
85
86
|
KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY) & ~SYNCHRONIZE
|
86
|
-
KEY_WRITE = (STANDARD_RIGHTS_WRITE | KEY_SET_VALUE |
|
87
|
+
KEY_WRITE = (STANDARD_RIGHTS_WRITE | KEY_SET_VALUE |
|
87
88
|
KEY_CREATE_SUB_KEY) & ~SYNCHRONIZE
|
88
89
|
KEY_EXECUTE = KEY_READ
|
89
90
|
KEY_ALL_ACCESS = (STANDARD_RIGHTS_ALL | KEY_QUERY_VALUE |
|
90
|
-
KEY_SET_VALUE | KEY_CREATE_SUB_KEY |
|
91
|
+
KEY_SET_VALUE | KEY_CREATE_SUB_KEY |
|
91
92
|
KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY |
|
92
93
|
KEY_CREATE_LINK) & ~SYNCHRONIZE
|
93
94
|
|
@@ -143,7 +144,7 @@ THREAD_SUSPEND_RESUME = 0x00000002
|
|
143
144
|
THREAD_GET_CONTEXT = 0x00000008
|
144
145
|
THREAD_SET_CONTEXT = 0x00000010
|
145
146
|
THREAD_SET_INFORMATION = 0x00000020
|
146
|
-
THREAD_QUERY_INFORMATION = 0x00000040
|
147
|
+
THREAD_QUERY_INFORMATION = 0x00000040
|
147
148
|
THREAD_SET_THREAD_TOKEN = 0x00000080
|
148
149
|
THREAD_IMPERSONATE = 0x00000100
|
149
150
|
THREAD_DIRECT_IMPERSONATION = 0x00000200
|
@@ -1,4 +1,5 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
|
+
# -*- coding: binary -*-
|
2
3
|
|
3
4
|
require 'rex/post/file'
|
4
5
|
require 'rex/post/meterpreter/channel'
|
@@ -298,14 +299,14 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
|
|
298
299
|
#
|
299
300
|
# Synonym for sysseek.
|
300
301
|
#
|
301
|
-
def seek(offset, whence = SEEK_SET)
|
302
|
+
def seek(offset, whence = ::IO::SEEK_SET)
|
302
303
|
return self.sysseek(offset, whence)
|
303
304
|
end
|
304
305
|
|
305
306
|
#
|
306
307
|
# Seeks to the supplied offset based on the supplied relativity.
|
307
308
|
#
|
308
|
-
def sysseek(offset, whence = SEEK_SET)
|
309
|
+
def sysseek(offset, whence = ::IO::SEEK_SET)
|
309
310
|
return self.filed.seek(offset, whence)
|
310
311
|
end
|
311
312
|
|
@@ -1,4 +1,5 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
|
+
# -*- coding: binary -*-
|
2
3
|
|
3
4
|
require 'rex/post/meterpreter/extensions/stdapi/tlv'
|
4
5
|
require 'rex/post/meterpreter/extensions/stdapi/net/route'
|
@@ -58,11 +59,41 @@ class Config
|
|
58
59
|
response = client.send_request(request)
|
59
60
|
|
60
61
|
response.each(TLV_TYPE_NETWORK_INTERFACE) { |iface|
|
62
|
+
addrs = []
|
63
|
+
netmasks = []
|
64
|
+
scopes = []
|
65
|
+
while (a = iface.get_tlv_value(TLV_TYPE_IP, addrs.length))
|
66
|
+
# Netmasks aren't tightly associated with addresses, they're
|
67
|
+
# just thrown all together in the interface TLV ordered to
|
68
|
+
# match up. This could be done better by creating another
|
69
|
+
# GroupTlv type for addresses containing an address, a netmask,
|
70
|
+
# and possibly a scope.
|
71
|
+
n = iface.get_tlv_value(TLV_TYPE_NETMASK, addrs.length)
|
72
|
+
if (n.nil?)
|
73
|
+
# Some systems can't report a netmask, only a network
|
74
|
+
# prefix, so figure out the netmask from that.
|
75
|
+
n = iface.get_tlv_value(TLV_TYPE_IP_PREFIX, addrs.length)
|
76
|
+
if n
|
77
|
+
n = Rex::Socket.bit2netmask(n, !!(a.length == 16))
|
78
|
+
end
|
79
|
+
else
|
80
|
+
n = Rex::Socket.addr_ntoa(n)
|
81
|
+
end
|
82
|
+
s = iface.get_tlv_value(TLV_TYPE_IP6_SCOPE, addrs.length)
|
83
|
+
scopes[addrs.length] = s if s
|
84
|
+
netmasks[addrs.length] = n if n
|
85
|
+
addrs << Rex::Socket.addr_ntoa(a)
|
86
|
+
end
|
61
87
|
ifaces << Interface.new(
|
62
|
-
iface.get_tlv_value(
|
63
|
-
iface.get_tlv_value(
|
64
|
-
iface.get_tlv_value(
|
65
|
-
iface.get_tlv_value(
|
88
|
+
:index => iface.get_tlv_value(TLV_TYPE_INTERFACE_INDEX),
|
89
|
+
:mac_addr => iface.get_tlv_value(TLV_TYPE_MAC_ADDRESS),
|
90
|
+
:mac_name => iface.get_tlv_value(TLV_TYPE_MAC_NAME),
|
91
|
+
:mtu => iface.get_tlv_value(TLV_TYPE_INTERFACE_MTU),
|
92
|
+
:flags => iface.get_tlv_value(TLV_TYPE_INTERFACE_FLAGS),
|
93
|
+
:addrs => addrs,
|
94
|
+
:netmasks => netmasks,
|
95
|
+
:scopes => scopes
|
96
|
+
)
|
66
97
|
}
|
67
98
|
|
68
99
|
return ifaces
|
@@ -93,11 +124,14 @@ class Config
|
|
93
124
|
response = client.send_request(request)
|
94
125
|
|
95
126
|
# Build out the array of routes
|
127
|
+
# Note: This will include both IPv4 and IPv6 routes
|
96
128
|
response.each(TLV_TYPE_NETWORK_ROUTE) { |route|
|
97
129
|
routes << Route.new(
|
98
130
|
route.get_tlv_value(TLV_TYPE_SUBNET),
|
99
131
|
route.get_tlv_value(TLV_TYPE_NETMASK),
|
100
|
-
route.get_tlv_value(TLV_TYPE_GATEWAY)
|
132
|
+
route.get_tlv_value(TLV_TYPE_GATEWAY),
|
133
|
+
route.get_tlv_value(TLV_TYPE_STRING),
|
134
|
+
route.get_tlv_value(TLV_TYPE_ROUTE_METRIC))
|
101
135
|
}
|
102
136
|
|
103
137
|
return routes
|
@@ -1,4 +1,5 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
|
+
# -*- coding: binary -*-
|
2
3
|
|
3
4
|
require 'ipaddr'
|
4
5
|
|
@@ -27,11 +28,15 @@ class Interface
|
|
27
28
|
# Returns a logical interface and initializes it to the supplied
|
28
29
|
# parameters.
|
29
30
|
#
|
30
|
-
def initialize(
|
31
|
-
self.
|
32
|
-
self.
|
33
|
-
self.
|
34
|
-
self.
|
31
|
+
def initialize(opts={})
|
32
|
+
self.index = opts[:index] || -1
|
33
|
+
self.mac_addr = opts[:mac_addr]
|
34
|
+
self.mac_name = opts[:mac_name]
|
35
|
+
self.mtu = opts[:mtu]
|
36
|
+
self.flags = opts[:flags]
|
37
|
+
self.addrs = opts[:addrs]
|
38
|
+
self.netmasks = opts[:netmasks]
|
39
|
+
self.scopes = opts[:scopes]
|
35
40
|
end
|
36
41
|
|
37
42
|
#
|
@@ -41,24 +46,61 @@ class Interface
|
|
41
46
|
macocts = []
|
42
47
|
mac_addr.each_byte { |o| macocts << o }
|
43
48
|
macocts += [0] * (6 - macocts.size) if macocts.size < 6
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
49
|
+
|
50
|
+
info = [
|
51
|
+
["Name" , mac_name ],
|
52
|
+
["Hardware MAC" , sprintf("%02x:%02x:%02x:%02x:%02x:%02x",
|
53
|
+
macocts[0], macocts[1], macocts[2],
|
54
|
+
macocts[3], macocts[4], macocts[5])],
|
55
|
+
["MTU" , mtu ],
|
56
|
+
["Flags" , flags ],
|
57
|
+
]
|
58
|
+
|
59
|
+
# If all went as planned, addrs and netmasks will have the same number
|
60
|
+
# of elements and be properly ordered such that they match up
|
61
|
+
# correctly.
|
62
|
+
addr_masks = addrs.zip(netmasks)
|
63
|
+
|
64
|
+
addr_masks.select { |a| Rex::Socket.is_ipv4?(a[0]) }.each { |a|
|
65
|
+
info << [ "IPv4 Address", a[0] ]
|
66
|
+
info << [ "IPv4 Netmask", a[1] ]
|
67
|
+
}
|
68
|
+
addr_masks.select { |a| Rex::Socket.is_ipv6?(a[0]) }.each { |a|
|
69
|
+
info << [ "IPv6 Address", a[0] ]
|
70
|
+
info << [ "IPv6 Netmask", a[1] ]
|
71
|
+
}
|
72
|
+
|
73
|
+
pad = info.map{|i| i[0] }.max_by{|k|k.length}.length
|
74
|
+
|
75
|
+
ret = sprintf(
|
76
|
+
"Interface %2d\n" +
|
77
|
+
"============\n",
|
78
|
+
index
|
79
|
+
)
|
80
|
+
|
81
|
+
info.map {|k,v|
|
82
|
+
next if v.nil?
|
83
|
+
ret << k.ljust(pad) + " : #{v}\n"
|
84
|
+
}
|
85
|
+
|
86
|
+
ret
|
87
|
+
end
|
88
|
+
|
89
|
+
#
|
90
|
+
# The first address associated with this Interface
|
91
|
+
#
|
92
|
+
def ip
|
93
|
+
addrs.first
|
52
94
|
end
|
53
95
|
|
54
96
|
#
|
55
|
-
# The
|
97
|
+
# The index of the interface.
|
56
98
|
#
|
57
|
-
attr_accessor :
|
99
|
+
attr_accessor :index
|
58
100
|
#
|
59
|
-
#
|
101
|
+
# An Array of IP addresses bound to the Interface.
|
60
102
|
#
|
61
|
-
attr_accessor :
|
103
|
+
attr_accessor :addrs
|
62
104
|
#
|
63
105
|
# The physical (MAC) address of the NIC.
|
64
106
|
#
|
@@ -67,7 +109,22 @@ class Interface
|
|
67
109
|
# The name of the interface.
|
68
110
|
#
|
69
111
|
attr_accessor :mac_name
|
70
|
-
|
112
|
+
#
|
113
|
+
# The MTU associated with the interface.
|
114
|
+
#
|
115
|
+
attr_accessor :mtu
|
116
|
+
#
|
117
|
+
# The flags associated with the interface.
|
118
|
+
#
|
119
|
+
attr_accessor :flags
|
120
|
+
#
|
121
|
+
# An Array of netmasks. This will have the same number of elements as #addrs
|
122
|
+
#
|
123
|
+
attr_accessor :netmasks
|
124
|
+
#
|
125
|
+
# An Array of IPv6 address scopes. This will have the same number of elements as #addrs
|
126
|
+
#
|
127
|
+
attr_accessor :scopes
|
71
128
|
end
|
72
129
|
|
73
130
|
end; end; end; end; end; end
|