Installer updates #656

day1player · 2023-09-04T23:01:33Z

Created `debloater.vm` package

Added the following functions to common.vm from recent Commando release:

VM-Remove-Appx-Package
VM-Set-Service-Manual-Start
VM-Disable-Scheduled-Task
VM-Update-Registry-Value
VM-Remove-Path
VM-Execute-Custom-Command
VM-Apply-Configurations

Added VM-Get-WindowsVersion function to common.vm to identify Win10, Win11, or Win11ARM installations
Created win10, win11, and win11ARM config files
- Config files for win11 and win11arm are mostly placeholders for now

Created `installer.vm` package

Moved failed_packages.txt to $Env:VM_COMMON_DIR
- Mostly for aesthetic reasons. Failed packages log is printed to console output if people need it. Plus we know where it will be if we need to troubleshoot
Changed background image setting from 6 (fit) to 0 (center)
- This allows for more customization of the desktop background especially for Commando. Also allows reuse of images from readme.md and the background setting
- Should still work with flarevm's current background
Important: Changed variable/file name config.xml (previously holding package and variables) to packages.xml to avoid confusion with the new custom configs that can be supported
- Installer script for Mandiant VMs should now place a packages.xml file AND a config.xml file into $Env:VM_COMMON_DIR
- installer.vm now expects packages to be listed in the packages.xml file
- installer.vm now expects OS configurations to be listed in the config.xml file
Created new prompt dialog box that will force itself to be the top window
- Added functionality to include a custom .ico file (expected in $Env:VM_COMMON_DIR\vm.ico)
- Expects a variable $Env:MandiantVM to exist (explained below)
Added function to change icon of Desktop Tools folder (using the custom .ico file above)
- More changes to this folder listed below
No longer popping log.txt for cleaner exit of installation
- log locations are still listed at the close of installation if needed
Fixed bug where installed apps were not being logged to log.txt
Moved Get-InstalledPackages function to common.vm

Changes/additions to `common.vm`

Added VM-Configure-Prompts function to add "Mandiant VM" and timestamps to PowerShell and cmd
- Important: Above "Mandiant VM" is a placeholder. Added an environment variable in Commando installer script to set this variable (set to Commando VM). When the script runs on Commando the PS Prompt will now be "Commando VM" but when Flare VM is updated it will read "Flare VM"
- Expects a variable $Env:MandiantVM to exist
Added VM-Configure-PS-Logging function
Changed location of Desktop Tools folder to actually be on the desktop
- This does not affect RAW_TOOLS_DIR as that is different.. This folder is just the folder with all the shortcuts
- This was originally located in the Start Menu which I believe was a legacy Win7 thing
- By moving the folder to the desktop itself we can now configure a custom .ico file for the folder for ultimate flexing
Removed TOOL_LIST_SHORTCUT because this variable is not referenced by any of our packages or install scripts. This function is also what used to create the shortcut on the desktop, and now that the Tools folder lives on the desktop (Not the RAW_TOOLS_DIR, just the folder that hosts all the other shortcuts) we dont need the shortcut
Added all of the functions mentioned above

packages/common.vm/tools/vm.common/vm.common.psm1

packages/installer.vm/tools/chocolateyinstall.ps1

mr-tz

I didn't review in detail, but looks good. Please consider adding documentation updates to the README and Wiki, where appropriate.

packages/debloat.vm/tools/win10.xml

Ana06

Thanks for submitting this PR @day1player! 😄

In case you haven't noticed it, the linter is not happy 😬

packages/common.vm/tools/chocolateyinstall.ps1

packages/common.vm/tools/vm.common/vm.common.psm1

Ana06 · 2023-09-06T11:10:37Z

packages/common.vm/tools/vm.common/vm.common.psm1

+        # Check if the app is provisioned
+        $provisionedPackage = Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -eq $appName } -ErrorAction SilentlyContinue
+        if ($provisionedPackage) {
+            $result = Remove-AppxProvisionedPackage -PackageName $provisionedPackage.PackageName -Online  


Similarly as before, you can't use the result ofRemove-AppxProvisionedPackage to text if it succeeded. An example:

packages/common.vm/tools/vm.common/vm.common.psm1

packages/installer.vm/installer.vm.nuspec

packages/debloat.vm/tools/chocolateyinstall.ps1

day1player · 2023-09-06T17:48:51Z

In case you haven't noticed it, the linter is not happy 😬

I did, and I think I fixed what I could! The remaining errors are that the installer and debloater dont have a category (they shouldnt) and that the erroractionpreference in the installer isnt set to stop (I copied from the other installer)

Ana06 · 2023-09-07T09:46:53Z

I did, and I think I fixed what I could! The remaining errors are that the installer and debloater dont have a category (they shouldnt) and that the erroractionpreference in the installer isnt set to stop (I copied from the other installer)

For things that doesn't make sense to fix, you need to exclude the package in the linter as we do for example here:
https://github.com/mandiant/VM-Packages/blob/main/scripts/test/lint.py#L310

This way we know in future PR what things need to be tested for what package 😉

Ana06

Thanks for the changes. I think we just need to fix the linter (and ensure the rest of the CI succeeds) and we are good to go! 👍

Can you please squash the commits (to several small commits with related changes removing the half-way work or just a big one) in oder to keep a clean commit history without fix/updates commits? Alternatively, you can use squash and merge when merging that will combine the PR int a single commit.

day1player · 2023-09-07T15:05:38Z

I think we just need to fix the linter

Done! I think we just need the PR approved and I can merge it.

Ana06 · 2023-09-12T06:03:43Z

The tests fail. I think we want to exclude the installer from the tests as we do with the current installer: https://github.com/mandiant/VM-Packages/blob/main/scripts/test/test_install.ps1#L42 It is failing because it doesn't find the config file. But the real issue with testing the installer is that it installs other packages.

MalwareMechanic

Some minor changes plz, then should be gtg

packages/common.vm/tools/chocolateyinstall.ps1

packages/common.vm/tools/vm.common/vm.common.psm1

+            }
+        }
+
+        # Process the services


Ana06

🎉

Please remember to use squash and merge 😄

packages/common.vm/tools/vm.common/vm.common.psm1

`TOOL_LIST_SHORTCUT` has been removed in: mandiant/VM-Packages#656 Install the tools shortcuts directly into `%UserProfile%\Desktop\Tools`.

`TOOL_LIST_SHORTCUT` has been removed in: mandiant/VM-Packages#656. We removed it from the config in: mandiant#492 But we didn't remove it from the GUI.

CommandoVM refactored the functions and configuration files to a separate repository for improved modularity and reusability, i.e. https://github.com/mandiant/VM-Packages/. See Also - mandiant/VM-Packages#656 - https://github.com/mandiant/VM-Packages/tree/main/packages/common.vm/ - https://github.com/mandiant/VM-Packages/tree/main/packages/debloat.vm/

day1player added 8 commits September 1, 2023 19:17

Added debloater and config functions to common

8f42b5f

created debloater package

13b949c

created new installer package

8bc01dc

update get windows version

86e1635

Delete chocolateyuninstall.ps1

7a37820

update common.vm for custom configs

758170e

updates

7b8e0d8

update to support some dynamic settings and custom configs

89c628a

day1player requested review from Ana06, MalwareMechanic, mr-tz, nos3curity and Menn1s September 4, 2023 23:01

fix linter issues

c68a5ff

MalwareMechanic requested changes Sep 5, 2023

View reviewed changes

MalwareMechanic reviewed Sep 5, 2023

View reviewed changes

packages/installer.vm/tools/chocolateyinstall.ps1 Outdated Show resolved Hide resolved

mr-tz reviewed Sep 6, 2023

View reviewed changes

packages/debloat.vm/tools/win10.xml Outdated Show resolved Hide resolved

Ana06 reviewed Sep 6, 2023

View reviewed changes

day1player added 3 commits September 6, 2023 11:39

Update vm.common.psm1

08ae6c8

Update configs

3736c60

Update installer

e0047af

day1player requested review from MalwareMechanic, Ana06 and mr-tz September 6, 2023 17:54

day1player added 5 commits September 6, 2023 13:51

formatting

2556d48

fix start-process command

b4a9a6c

Logging error

2f7231c

fix unpinning start menu tiles

a8ad723

Typo

63890f7

remove foreground color

2c5cbde

Ana06 reviewed Sep 7, 2023

View reviewed changes

add installer and debloat to linter exclusions

8fbd9d9

day1player added 2 commits September 7, 2023 09:12

exclude installer from erroractionpreference

9736c10

Remove trailing whitespaces

30968e0

MalwareMechanic requested changes Sep 18, 2023

View reviewed changes

day1player added 5 commits September 25, 2023 10:45

remove refs to TOOL_LIST_SHORTCUT

2b15585

add installer.vm to exclusions

a96057b

change MandiantVM to VMname

574e4b6

Update vm.common.psm1

ee8122b

Update README.md

28d1440

nos3curity approved these changes Sep 25, 2023

View reviewed changes

Ana06 approved these changes Sep 26, 2023

View reviewed changes

Ana06 reviewed Sep 26, 2023

View reviewed changes

packages/common.vm/tools/vm.common/vm.common.psm1 Outdated Show resolved Hide resolved

Update vm.common.psm1

b11a6c1

MalwareMechanic approved these changes Sep 26, 2023

View reviewed changes

Ana06 merged commit 25cdade into main Sep 27, 2023
6 checks passed

Ana06 added a commit to Ana06/flare-vm that referenced this pull request Sep 29, 2023

Install tools in Desktop\Tools

b581dcd

`TOOL_LIST_SHORTCUT` has been removed in: mandiant/VM-Packages#656 Install the tools shortcuts directly into `%UserProfile%\Desktop\Tools`.

Ana06 mentioned this pull request Sep 29, 2023

Fix config - remove dnfile.vm & install tools in Desktop\Tools mandiant/flare-vm#492

Merged

Ana06 added a commit to Ana06/flare-vm that referenced this pull request Sep 29, 2023

Install tools in Desktop\Tools

885831e

`TOOL_LIST_SHORTCUT` has been removed in: mandiant/VM-Packages#656 Install the tools shortcuts directly into `%UserProfile%\Desktop\Tools`.

Ana06 added a commit to Ana06/flare-vm that referenced this pull request Oct 11, 2023

Fix GUI - Remove TOOL_LIST_SHORTCUT

275a999

`TOOL_LIST_SHORTCUT` has been removed in: mandiant/VM-Packages#656. We removed it from the config in: mandiant#492 But we didn't remove it from the GUI.

Ana06 mentioned this pull request Oct 11, 2023

Remove TOOL_LIST_SHORTCUT from the GUI mandiant/flare-vm#505

Merged

Ana06 mentioned this pull request Apr 2, 2024

Update complete message allowing non-interactive installation #956

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Installer updates #656

Installer updates #656

day1player commented Sep 4, 2023 •

edited

Loading

mr-tz left a comment

Ana06 left a comment

Ana06 Sep 6, 2023

day1player commented Sep 6, 2023 •

edited

Loading

Ana06 commented Sep 7, 2023

Ana06 left a comment •

edited

Loading

day1player commented Sep 7, 2023

Ana06 commented Sep 12, 2023 •

edited

Loading

MalwareMechanic left a comment

This comment was marked as resolved.

Ana06 left a comment •

edited

Loading

Installer updates #656

Installer updates #656

Conversation

day1player commented Sep 4, 2023 • edited Loading

Created debloater.vm package

Created installer.vm package

Changes/additions to common.vm

mr-tz left a comment

Choose a reason for hiding this comment

Ana06 left a comment

Choose a reason for hiding this comment

Ana06 Sep 6, 2023

Choose a reason for hiding this comment

day1player commented Sep 6, 2023 • edited Loading

Ana06 commented Sep 7, 2023

Ana06 left a comment • edited Loading

Choose a reason for hiding this comment

day1player commented Sep 7, 2023

Ana06 commented Sep 12, 2023 • edited Loading

MalwareMechanic left a comment

Choose a reason for hiding this comment

This comment was marked as resolved.

Ana06 left a comment • edited Loading

Choose a reason for hiding this comment

day1player commented Sep 4, 2023 •

edited

Loading

Created `debloater.vm` package

Created `installer.vm` package

Changes/additions to `common.vm`

day1player commented Sep 6, 2023 •

edited

Loading

Ana06 left a comment •

edited

Loading

Ana06 commented Sep 12, 2023 •

edited

Loading

Ana06 left a comment •

edited

Loading