Don't change the main modules datastore options

[zeroSteiner]

This fixes an issue that @adfoster-r7 noticed while testing another PR of mine. When datastore options are passed on the command line in msfconsole using the command KEY=VALUE syntax, the datastore options should not be reflected in the output of show options because they should have only effected the module for that specific command invocation. This was not the case for the generate command that is available to payloads.

Testing Steps

• Start msfconsole
• Use a payload module (payload/cmd/windows/adduser is a good test case because the datastore options are visible in the output)
• Run the generate command, and set one or more options on the command line
• See that the options were incorporated into the payload that was generated
• See that the options are not reflected in the output of show options

New And Fixed

msf6 payload(cmd/windows/adduser) > show options 

Module options (payload/cmd/windows/adduser):

   Name    Current Setting  Required  Description
   ----    ---------------  --------  -----------
   CUSTOM                   no        Custom group name to be used instead of default
   PASS    Metasploit$1     yes       The password for this user
   USER    metasploit       yes       The username to create
   WMIC    false            yes       Use WMIC on the target to resolve administrators group


View the full module info with the info, or info -d command.

msf6 payload(cmd/windows/adduser) > generate -f raw USER=smcintyre
cmd.exe /c net user smcintyre Metasploit$1 /ADD && net localgroup Administrators smcintyre /ADD
msf6 payload(cmd/windows/adduser) > show options 

Module options (payload/cmd/windows/adduser):

   Name    Current Setting  Required  Description
   ----    ---------------  --------  -----------
   CUSTOM                   no        Custom group name to be used instead of default
   PASS    Metasploit$1     yes       The password for this user
   USER    metasploit       yes       The username to create
   WMIC    false            yes       Use WMIC on the target to resolve administrators group


View the full module info with the info, or info -d command.

msf6 payload(cmd/windows/adduser) >

Old And Broken

msf6 payload(cmd/windows/adduser) > show options 

Module options (payload/cmd/windows/adduser):

   Name    Current Setting  Required  Description
   ----    ---------------  --------  -----------
   CUSTOM                   no        Custom group name to be used instead of default
   PASS    Metasploit$1     yes       The password for this user
   USER    metasploit       yes       The username to create
   WMIC    false            yes       Use WMIC on the target to resolve administrators group


View the full module info with the info, or info -d command.

msf6 payload(cmd/windows/adduser) > generate -f raw USER=smcintyre
cmd.exe /c net user smcintyre Metasploit$1 /ADD && net localgroup Administrators smcintyre /ADD
msf6 payload(cmd/windows/adduser) > show options 

Module options (payload/cmd/windows/adduser):

   Name    Current Setting  Required  Description
   ----    ---------------  --------  -----------
   CUSTOM                   no        Custom group name to be used instead of default
   PASS    Metasploit$1     yes       The password for this user
   USER    smcintyre        yes       The username to create
   WMIC    false            yes       Use WMIC on the target to resolve administrators group


View the full module info with the info, or info -d command.

msf6 payload(cmd/windows/adduser) >

[adfoster-r7]

Release Notes

Fixes a module bug when using the generate OPTION=VALUE syntax. Previously the module's datastore would be unintentionally updated with the new option value