infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Land #7388, relocate Rex::Platform:Windows content 

This PR consolidates the few lines of consts/code in lib/rex/platforms/windows.rb into MSF core.

Completes #MS-1714
bug/bundler_fix
Kyle Gray 2016-09-20 16:39:07 -05:00
parent 8b1d29feef 3f5ed75198
commit 9d01f24cff
No known key found for this signature in database
GPG Key ID: 5F604D93CA5FEE1A
6 changed files with 47 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/msf/core/post/windows/registry.rb
View File

@ -29,6 +29,51 @@ module Registry
#
REGISTRY_VIEW_64_BIT = 2
#
# Windows Registry Constants.
#
REG_NONE = 1
REG_SZ = 1
REG_EXPAND_SZ = 2
REG_BINARY = 3
REG_DWORD = 4
REG_LITTLE_ENDIAN = 4
REG_BIG_ENDIAN = 5
REG_LINK = 6
REG_MULTI_SZ = 7
HKEY_CLASSES_ROOT = 0x80000000
HKEY_CURRENT_USER = 0x80000001
HKEY_LOCAL_MACHINE = 0x80000002
HKEY_USERS = 0x80000003
HKEY_PERFORMANCE_DATA = 0x80000004
HKEY_CURRENT_CONFIG = 0x80000005
HKEY_DYN_DATA = 0x80000006
#
# Lookup registry hives by key.
#
def registry_hive_lookup(hive)
case hive
when 'HKCR'
HKEY_LOCAL_MACHINE
when 'HKCU'
HKEY_CURRENT_USER
when 'HKLM'
HKEY_LOCAL_MACHINE
when 'HKU'
HKEY_USERS
when 'HKPD'
HKEY_PERFORMANCE_DATA
when 'HKCC'
HKEY_CURRENT_CONFIG
when 'HKDD'
HKEY_DYN_DATA
else
HKEY_LOCAL_MACHINE
end
end
#
# Load a hive file
#

3
lib/rex.rb
View File

@ -106,9 +106,6 @@ require 'rex/parser/ini'
# Compatibility
require 'rex/compat'
# Platforms
require 'rex/platforms'
# SSLScan
require 'rex/sslscan/scanner'
require 'rex/sslscan/result'

2
lib/rex/platforms.rb
View File

@ -1,2 +0,0 @@
# -*- coding: binary -*-
require 'rex/platforms/windows'

52
lib/rex/platforms/windows.rb
View File

@ -1,52 +0,0 @@
# -*- coding: binary -*-
module Rex
module Platforms
module Windows
#
# Windows Registry Constants
#
REG_NONE = 1
REG_SZ = 1
REG_EXPAND_SZ = 2
REG_BINARY = 3
REG_DWORD = 4
REG_LITTLE_ENDIAN = 4
REG_BIG_ENDIAN = 5
REG_LINK = 6
REG_MULTI_SZ = 7
HKEY_CLASSES_ROOT = 0x80000000
HKEY_CURRENT_USER = 0x80000001
HKEY_LOCAL_MACHINE = 0x80000002
HKEY_USERS = 0x80000003
HKEY_PERFORMANCE_DATA = 0x80000004
HKEY_CURRENT_CONFIG = 0x80000005
HKEY_DYN_DATA = 0x80000006
def registry_hive_lookup(hive)
case hive
when 'HKCR'
HKEY_LOCAL_MACHINE
when 'HKCU'
HKEY_CURRENT_USER
when 'HKLM'
HKEY_LOCAL_MACHINE
when 'HKU'
HKEY_USERS
when 'HKPD'
HKEY_PERFORMANCE_DATA
when 'HKCC'
HKEY_CURRENT_CONFIG
when 'HKDD'
HKEY_DYN_DATA
else
HKEY_LOCAL_MACHINE
end
end
end
end
end

2
modules/auxiliary/admin/backupexec/registry.rb
View File

@ -10,7 +10,7 @@ require 'msf/core'
class MetasploitModule < Msf::Auxiliary
include Msf::Exploit::Remote::DCERPC
include ::Rex::Platforms::Windows
include Msf::Post::Windows::Registry
def initialize(info = {})
super(update_info(info,

2
modules/auxiliary/admin/serverprotect/file.rb
View File

@ -10,7 +10,7 @@ require 'msf/core'
class MetasploitModule < Msf::Auxiliary
include Msf::Exploit::Remote::DCERPC
include Rex::Platforms::Windows
include Msf::Post::Windows::Registry
def initialize(info = {})
super(update_info(info,