Updated JCL cmd payloads to use PR7007 format

modules/payloads/singles/cmd/mainframe/generic_jcl.rb

@@ -13,50 +13,62 @@
 require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
-
+  CachedSize = 150
   include Msf::Payload::Single
   include Msf::Payload::Mainframe
   include Msf::Sessions::CommandShellOptions
 
   def initialize(info = {})
     super(merge_info(info,
-      'Name'          => 'Generic JCL Test for Mainframe Exploits',
-      'Description'   => 'Provide JCL which can be used to submit
-          a job to JES2 on z/OS which will exit and return 0.  This
-          can be used as a template for other JCL based payloads',
-      'Author'        => 'Bigendian Smalls',
-      'License'       => MSF_LICENSE,
-      'Platform'      => 'mainframe',
-      'Arch'          => ARCH_CMD,
-      'Handler'       => Msf::Handler::None,
-      'Session'       => Msf::Sessions::MainframeShell,
-      'PayloadType'   => 'cmd',
-      'RequiredCmd'   => 'jcl',
-      'Payload'       =>
-        {
-          'Offsets' => {},
-          'Payload' => ''
-        }
-      )
+                     'Name'          => 'Generic JCL Test for Mainframe Exploits',
+                     'Description'   => 'Provide JCL which can be used to submit
+                        a job to JES2 on z/OS which will exit and return 0.  This
+                        can be used as a template for other JCL based payloads',
+                     'Author'        => 'Bigendian Smalls',
+                     'License'       => MSF_LICENSE,
+                     'Platform'      => 'mainframe',
+                     'Arch'          => ARCH_CMD,
+                     'Handler'       => Msf::Handler::None,
+                     'Session'       => Msf::Sessions::MainframeShell,
+                     'PayloadType'   => 'cmd',
+                     'RequiredCmd'   => 'jcl',
+                     'Payload'       =>
+      {
+        'Offsets' => {},
+        'Payload' => ''
+      }))
+    register_options(
+      [
+        OptString.new('ACTNUM', [true, "Accounting info for JCL JOB card", "MSFUSER-ACCTING-INFO"]),
+        OptString.new('PGMNAME', [true, "Programmer name for JCL JOB card", "programmer name"]),
+        OptString.new('JCLASS', [true, "Job Class for JCL JOB card", "A"]),
+        OptString.new('NOTIFY', [false, "Notify User for JCL JOB card", ""]),
+        OptString.new('MSGCLASS', [true, "Message Class for JCL JOB card", "Z"]),
+        OptString.new('MSGLEVEL', [true, "Message Level for JCL JOB card", "(0,0)"])
+      ],
+      self.class
+    )
+    register_advanced_options(
+      [
+        OptBool.new('NTFYUSR', [true, "Include NOTIFY Parm?", false]),
+        OptString.new('JOBNAME', [true, "Job name for JCL JOB card", "DUMMY"])
+      ],
+      self.class
     )
   end
 
   ##
-  # Construct the paload
+  # Construct Payload
   ##
   def generate
     super + command_string
   end
 
   ##
-  # Build the command string for JCL submission
+  # Setup replacement vars from options if need be
   ##
   def command_string
-    "//DUMMY  JOB (MFUSER),'dummy job',\n" \
-    "//   NOTIFY=&SYSUID,\n" \
-    "//   MSGCLASS=H,\n" \
-    "//   MSGLEVEL=(1,1),\n" \
-    "//   REGION=0M\n" \
-    "//   EXEC PGM=IEFBR14\n"
+    jcl_jobcard +
+      "//   EXEC PGM=IEFBR14\n"
   end
 end