Enable the payload handler by default

zeroSteiner · zeroSteiner · commit 70033e2b9464 · 2017-11-02T12:31:54.000-04:00
diff --git a/modules/exploits/windows/fileformat/cve_2017_8464_lnk_rce.rb b/modules/exploits/windows/fileformat/cve_2017_8464_lnk_rce.rb
@@ -47,7 +47,8 @@ def initialize(info = {})
           ],
         'DefaultOptions'  =>
           {
-            'EXITFUNC'    => 'process'
+            'EXITFUNC'              => 'process',
+            'DisablePayloadHandler' => true
           },
         'Arch'            => [ARCH_X86, ARCH_X64],
         'Payload'         =>
@@ -76,7 +77,6 @@ def initialize(info = {})
 
     register_advanced_options(
       [
-        OptBool.new('DisablePayloadHandler', [false, 'Disable the handler code for the selected payload', true]),
         OptString.new('LnkComment', [true, 'The comment to use in the generated LNK file', 'Manage Flash Player Settings']),
         OptString.new('LnkDisplayName', [true, 'The display name to use in the generated LNK file', 'Flash Player'])
       ]
diff --git a/modules/exploits/windows/local/cve_2017_8464_lnk_lpe.rb b/modules/exploits/windows/local/cve_2017_8464_lnk_lpe.rb
@@ -79,7 +79,6 @@ def initialize(info = {})
 
     register_advanced_options(
       [
-        OptBool.new('DisablePayloadHandler', [false, 'Disable the handler code for the selected payload', true]),
         OptString.new('LnkComment', [true, 'The comment to use in the generated LNK file', 'Manage Flash Player Settings']),
         OptString.new('LnkDisplayName', [true, 'The display name to use in the generated LNK file', 'Flash Player'])
       ]

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ def initialize(info = {})`
`47`	`47`	`],`
`48`	`48`	`'DefaultOptions' =>`
`49`	`49`	`{`
`50`		`- 'EXITFUNC' => 'process'`
	`50`	`+ 'EXITFUNC' => 'process',`
	`51`	`+ 'DisablePayloadHandler' => true`
`51`	`52`	`},`
`52`	`53`	`'Arch' => [ARCH_X86, ARCH_X64],`
`53`	`54`	`'Payload' =>`
`@@ -76,7 +77,6 @@ def initialize(info = {})`
`76`	`77`
`77`	`78`	`register_advanced_options(`
`78`	`79`	`[`
`79`		`- OptBool.new('DisablePayloadHandler', [false, 'Disable the handler code for the selected payload', true]),`
`80`	`80`	`OptString.new('LnkComment', [true, 'The comment to use in the generated LNK file', 'Manage Flash Player Settings']),`
`81`	`81`	`OptString.new('LnkDisplayName', [true, 'The display name to use in the generated LNK file', 'Flash Player'])`
`82`	`82`	`]`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ def initialize(info = {})`
`79`	`79`
`80`	`80`	`register_advanced_options(`
`81`	`81`	`[`
`82`		`- OptBool.new('DisablePayloadHandler', [false, 'Disable the handler code for the selected payload', true]),`
`83`	`82`	`OptString.new('LnkComment', [true, 'The comment to use in the generated LNK file', 'Manage Flash Player Settings']),`
`84`	`83`	`OptString.new('LnkDisplayName', [true, 'The display name to use in the generated LNK file', 'Flash Player'])`
`85`	`84`	`]`