Lands #4906 and fixes #4905 by updating Conventions for HTTP incompatible payloads

modules/payloads/stages/windows/shell.rb

@@ -23,7 +23,7 @@ module Metasploit3
       'Session'       => Msf::Sessions::CommandShellWindows,
       'PayloadCompat' =>
         {
-          'Convention' => 'sockedi -https'
+          'Convention' => 'sockedi -http -https'
         },
       'Stage'         =>
         {

modules/payloads/stages/windows/upexec.rb

@@ -23,7 +23,7 @@ module Metasploit3
       'Session'       => Msf::Sessions::CommandShellWindows,
       'PayloadCompat' =>
         {
-          'Convention' => 'sockedi -https'
+          'Convention' => 'sockedi -http -https'
         },
       'Stage'         =>
         {

modules/payloads/stages/windows/vncinject.rb

@@ -25,7 +25,8 @@ module Metasploit3
       'Name'          => 'VNC Server (Reflective Injection)',
       'Description'   => 'Inject a VNC Dll via a reflective loader (staged)',
       'Author'        => [ 'sf' ],
-      'Session'       => Msf::Sessions::VncInject ))
+      'Session'       => Msf::Sessions::VncInject,
+      'Convention'    => 'sockedi -http -https'))
 
   end
 

modules/payloads/stages/windows/x64/shell.rb

@@ -23,7 +23,7 @@ module Metasploit3
       'Session'       => Msf::Sessions::CommandShellWindows,
       'PayloadCompat' =>
         {
-          'Convention' => 'sockrdi'
+          'Convention' => 'sockrdi -http -https'
         },
       'Stage'         =>
         {

spec/modules/payloads_spec.rb

@@ -2991,39 +2991,6 @@ describe 'modules/payloads', :content do
                           reference_name: 'windows/shell/find_tag'
   end
 
-  context 'windows/shell/reverse_hop_http' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                              'stagers/windows/reverse_hop_http',
-                              'stages/windows/shell'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/shell/reverse_hop_http'
-  end
-
-  context 'windows/shell/reverse_http' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                              'stagers/windows/reverse_http',
-                              'stages/windows/shell'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/shell/reverse_http'
-  end
-
-  context 'windows/shell/reverse_http_proxy_pstore' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                            'stagers/windows/reverse_http_proxy_pstore',
-                            'stages/windows/shell'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/shell/reverse_http_proxy_pstore'
-  end
-
   context 'windows/shell/reverse_ipv6_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -3217,39 +3184,6 @@ describe 'modules/payloads', :content do
                           reference_name: 'windows/upexec/find_tag'
   end
 
-  context 'windows/upexec/reverse_hop_http' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                              'stagers/windows/reverse_hop_http',
-                              'stages/windows/upexec'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/upexec/reverse_hop_http'
-  end
-
-  context 'windows/upexec/reverse_http' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                              'stagers/windows/reverse_http',
-                              'stages/windows/upexec'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/upexec/reverse_http'
-  end
-
-  context 'windows/upexec/reverse_http_proxy_pstore' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                            'stagers/windows/reverse_http_proxy_pstore',
-                            'stages/windows/upexec'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/upexec/reverse_http_proxy_pstore'
-  end
-
   context 'windows/upexec/reverse_ipv6_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -3393,39 +3327,6 @@ describe 'modules/payloads', :content do
                           reference_name: 'windows/vncinject/find_tag'
   end
 
-  context 'windows/vncinject/reverse_hop_http' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                              'stagers/windows/reverse_hop_http',
-                              'stages/windows/vncinject'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/vncinject/reverse_hop_http'
-  end
-
-  context 'windows/vncinject/reverse_http' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                              'stagers/windows/reverse_http',
-                              'stages/windows/vncinject'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/vncinject/reverse_http'
-  end
-
-  context 'windows/vncinject/reverse_http_proxy_pstore' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                            'stagers/windows/reverse_http_proxy_pstore',
-                            'stages/windows/vncinject'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/vncinject/reverse_http_proxy_pstore'
-  end
-
   context 'windows/vncinject/reverse_ipv6_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -3578,17 +3479,6 @@ describe 'modules/payloads', :content do
                           reference_name: 'windows/x64/shell/bind_tcp'
   end
 
-  context 'windows/x64/shell/reverse_https' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                              'stagers/windows/x64/reverse_https',
-                              'stages/windows/x64/shell'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/x64/shell/reverse_https'
-  end
-
   context 'windows/x64/shell/reverse_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -3631,17 +3521,6 @@ describe 'modules/payloads', :content do
                           reference_name: 'windows/x64/vncinject/bind_tcp'
   end
 
-  context 'windows/x64/vncinject/reverse_https' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                              'stagers/windows/x64/reverse_https',
-                              'stages/windows/x64/vncinject'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'windows/x64/vncinject/reverse_https'
-  end
-
   context 'windows/x64/vncinject/reverse_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [