Merge branch 'main' into microwin-1st-anniversary-prep

Compile.ps1

@@ -73,8 +73,8 @@ Get-ChildItem "functions" -Recurse -File | ForEach-Object {
     }
 Update-Progress "Adding: Config *.json" 40
 Get-ChildItem "config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-Object {
-    $json = (Get-Content $psitem.FullName).replace("'","''")
-    $jsonAsObject = $json | convertfrom-json
+    $json = (Get-Content $psitem.FullName -Raw)
+    $jsonAsObject = $json | ConvertFrom-Json
 
     # Add 'WPFInstall' as a prefix to every entry-name in 'applications.json' file
     if ($psitem.Name -eq "applications.json") {
@@ -85,12 +85,13 @@ Get-ChildItem "config" | Where-Object {$psitem.extension -eq ".json"} | ForEach-
         }
     }
 
-    # The replace at the end is required, as without it the output of 'converto-json' will be somewhat weird for Multiline Strings
-    # Most Notably is the scripts in some json files, making it harder for users who want to review these scripts, which're found in the compiled script
-    $json = ($jsonAsObject | convertto-json -Depth 3).replace('\r\n',"`r`n")
+    # Line 90 requires no whitespace inside the here-strings, to keep formatting of the JSON in the final script.
+    $json = @"
+$($jsonAsObject | ConvertTo-Json -Depth 3)
+"@
 
-    $sync.configs.$($psitem.BaseName) = $json | convertfrom-json
-    $script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" ))
+    $sync.configs.$($psitem.BaseName) = $json | ConvertFrom-Json
+    $script_content.Add($(Write-Output "`$sync.configs.$($psitem.BaseName) = @'`n$json`n'@ `| ConvertFrom-Json" ))
 }
 
 # Read the entire XAML file as a single string, preserving line breaks

config/dns.json

@@ -46,5 +46,23 @@
         "Secondary": "94.140.15.16",
         "Primary6": "2a10:50c0::bad1:ff",
         "Secondary6": "2a10:50c0::bad2:ff"
+    },
+    "dns0.eu_Open":{
+        "Primary": "193.110.81.254",
+        "Secondary": "185.253.5.254",
+        "Primary6": "2a0f:fc80::ffff",
+        "Secondary6": "2a0f:fc81::ffff"
+    },
+    "dns0.eu_ZERO":{
+        "Primary": "193.110.81.9",
+        "Secondary": "185.253.5.9",
+        "Primary6": "2a0f:fc80::9",
+        "Secondary6": "2a0f:fc81::9"
+    },
+    "dns0.eu_KIDS":{
+        "Primary": "193.110.81.1",
+        "Secondary": "185.253.5.1",
+        "Primary6": "2a0f:fc80::1",
+        "Secondary6": "2a0f:fc81::1"
     }
 }

config/feature.json

@@ -313,5 +313,13 @@
     "Order": "a083_",
     "Type": "Button",
     "ButtonWidth": "300"
-  }
+  },
+  "WPFWinUtilSSHServer": {
+    "Content": "Enable OpenSSH Server",
+    "category": "Remote Access",
+    "panel": "2",
+    "Order": "a084_",
+    "Type": "Button",
+    "ButtonWidth": "300"
+  },
 }

docs/userguide.md

@@ -142,6 +142,10 @@ Open old-school Windows panels directly from WinUtil. Following Panels are avail
 * System Properties
 * User Accounts
 
+### Remote Access
+
+Enables OpenSSH server on your windows machine.
+
 ## Updates
 ---
 

functions/private/Invoke-WinUtilMicroWin-Helper.ps1

@@ -146,6 +146,7 @@ function Remove-Packages {
                 $_ -NotLike "*ParentalControls*" -AND
                 $_ -NotLike "*Win32WebViewHost*" -AND
                 $_ -NotLike "*InputApp*" -AND
+                $_ -NotLike "*DirectPlay*" -AND
                 $_ -NotLike "*AccountsControl*" -AND
                 $_ -NotLike "*AsyncTextService*" -AND
                 $_ -NotLike "*CapturePicker*" -AND

functions/private/Invoke-WinUtilSSHServer.ps1

@@ -0,0 +1,81 @@
+function Invoke-WinUtilSSHServer {
+    <#
+    .SYNOPSIS
+        Enables OpenSSH server to remote into your windows device
+    #>
+
+    # Get the latest version of OpenSSH Server
+    $FeatureName = Get-WindowsCapability -Online | Where-Object { $_.Name -like "OpenSSH.Server*" }
+
+    # Install the OpenSSH Server feature if not already installed
+    if ($FeatureName.State -ne "Installed") {
+        Write-Host "Enabling OpenSSH Server"
+        Add-WindowsCapability -Online -Name $FeatureName.Name
+    }
+
+    # Sets up the OpenSSH Server service
+    Write-Host "Starting the services"
+    Start-Service -Name sshd
+    Set-Service -Name sshd -StartupType Automatic
+
+    # Sets up the ssh-agent service
+    Start-Service 'ssh-agent'
+    Set-Service -Name 'ssh-agent' -StartupType 'Automatic'
+
+    # Confirm the required services are running
+    $SSHDaemonService = Get-Service -Name sshd
+    $SSHAgentService = Get-Service -Name 'ssh-agent'
+
+    if ($SSHDaemonService.Status -eq 'Running') {
+        Write-Host "OpenSSH Server is running."
+    } else {
+        try {
+            Write-Host "OpenSSH Server is not running. Attempting to restart..."
+            Restart-Service -Name sshd -Force
+            Write-Host "OpenSSH Server has been restarted successfully."
+        } catch {
+            Write-Host "Failed to restart OpenSSH Server: $_"
+        }
+    }
+    if ($SSHAgentService.Status -eq 'Running') {
+        Write-Host "ssh-agent is running."
+    } else {
+        try {
+            Write-Host "ssh-agent is not running. Attempting to restart..."
+            Restart-Service -Name sshd -Force
+            Write-Host "ssh-agent has been restarted successfully."
+        } catch {
+            Write-Host "Failed to restart ssh-agent : $_"
+        }
+    }
+
+    #Adding Firewall rule for port 22
+    Write-Host "Setting up firewall rules"
+    $firewallRule = (Get-NetFirewallRule -Name 'sshd').Enabled
+    if ($firewallRule) {
+        Write-Host "Firewall rule for OpenSSH Server (sshd) already exists."
+    } else {
+        New-NetFirewallRule -Name sshd -DisplayName 'OpenSSH Server (sshd)' -Enabled True -Direction Inbound -Protocol TCP -Action Allow -LocalPort 22
+        Write-Host "Firewall rule for OpenSSH Server created and enabled."
+    }
+
+    # Check for the authorized_keys file
+    $sshFolderPath = "$env:HOMEDRIVE\$env:HOMEPATH\.ssh"
+    $authorizedKeysPath = "$sshFolderPath\authorized_keys"
+
+    if (-not (Test-Path -Path $sshFolderPath)) {
+        Write-Host "Creating ssh directory..."
+        New-Item -Path $sshFolderPath -ItemType Directory -Force
+    }
+
+    if (-not (Test-Path -Path $authorizedKeysPath)) {
+        Write-Host "Creating authorized_keys file..."
+        New-Item -Path $authorizedKeysPath -ItemType File -Force
+        Write-Host "authorized_keys file created at $authorizedKeysPath."
+    } else {
+        Write-Host "authorized_keys file already exists at $authorizedKeysPath."
+    }
+    Write-Host "OpenSSH server was successfully enabled."
+    Write-Host "The config file can be located at C:\ProgramData\ssh\sshd_config "
+    Write-Host "Add your public keys to this file -> $authorizedKeysPath"
+}

functions/private/Set-WinUtilRegistry.ps1

@@ -36,7 +36,12 @@ function Set-WinUtilRegistry {
         }
 
         Write-Host "Set $Path\$Name to $Value"
-        Set-ItemProperty -Path $Path -Name $Name -Type $Type -Value $Value -Force -ErrorAction Stop | Out-Null
+        if ($Value -ne "<RemoveEntry>"){
+            Set-ItemProperty -Path $Path -Name $Name -Type $Type -Value $Value -Force -ErrorAction Stop | Out-Null
+        }
+        else{
+            Remove-ItemProperty -Path $Path -Name $Name -Force -ErrorAction Stop | Out-Null
+        }
     } catch [System.Security.SecurityException] {
         Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
     } catch [System.Management.Automation.ItemNotFoundException] {

functions/public/Invoke-WPFButton.ps1

@@ -58,5 +58,6 @@ function Invoke-WPFButton {
         "WPFCloseButton" {Invoke-WPFCloseButton}
         "MicrowinScratchDirBT" {Invoke-ScratchDialog}
         "WPFWinUtilPSProfile" {Invoke-WinUtilpsProfile}
+        "WPFWinUtilSSHServer" {Invoke-WinUtilSSHServer}
     }
 }

functions/public/Invoke-WPFImpex.ps1

@@ -19,44 +19,59 @@ function Invoke-WPFImpex {
         $Config = $null
     )
 
-    if ($type -eq "export") {
-        $FileBrowser = New-Object System.Windows.Forms.SaveFileDialog
-    }
-    if ($type -eq "import") {
-        $FileBrowser = New-Object System.Windows.Forms.OpenFileDialog
-    }
-
-    if (-not $Config) {
-        $FileBrowser.InitialDirectory = [Environment]::GetFolderPath('Desktop')
-        $FileBrowser.Filter = "JSON Files (*.json)|*.json"
-        $FileBrowser.ShowDialog() | Out-Null
+    function ConfigDialog {
+        if (!$Config) {
+            switch ($type) {
+                "export" { $FileBrowser = New-Object System.Windows.Forms.SaveFileDialog }
+                "import" { $FileBrowser = New-Object System.Windows.Forms.OpenFileDialog }
+            }
+            $FileBrowser.InitialDirectory = [Environment]::GetFolderPath('Desktop')
+            $FileBrowser.Filter = "JSON Files (*.json)|*.json"
+            $FileBrowser.ShowDialog() | Out-Null
 
-        if($FileBrowser.FileName -eq "") {
-            return
+            if ($FileBrowser.FileName -eq "") {
+                return $null
+            } else {
+                return $FileBrowser.FileName
+            }
         } else {
-            $Config = $FileBrowser.FileName
+            return $Config
         }
     }
 
-    if ($type -eq "export") {
-        $jsonFile = Get-WinUtilCheckBoxes -unCheck $false
-        $jsonFile | ConvertTo-Json | Out-File $FileBrowser.FileName -Force
-        $runscript = "iex ""& { `$(irm christitus.com/win) } -Config '$($FileBrowser.FileName)'"""
-        $runscript | Set-Clipboard
-    }
-    if ($type -eq "import") {
-        $jsonFile = Get-Content $Config | ConvertFrom-Json
-
-        $flattenedJson = @()
-        $jsonFile.PSObject.Properties | ForEach-Object {
-            $category = $_.Name
-            foreach ($checkboxName in $_.Value) {
-                if ($category -ne "Install") {
-                    $flattenedJson += $checkboxName
+    switch ($type) {
+        "export" {
+            try {
+                $Config = ConfigDialog
+                if ($Config) {
+                    $jsonFile = Get-WinUtilCheckBoxes -unCheck $false | ConvertTo-Json
+                    $jsonFile | Out-File $Config -Force
+                    "iex ""& { `$(irm christitus.com/win) } -Config '$Config'""" | Set-Clipboard
                 }
+            } catch {
+                Write-Error "An error occurred while exporting: $_"
+            }
+        }
+        "import" {
+            try {
+                $Config = ConfigDialog
+                if ($Config) {
+                    try {
+                        if ($Config -match '^https?://') {
+                            $jsonFile = (Invoke-WebRequest "$Config").Content | ConvertFrom-Json
+                        } else {
+                            $jsonFile = Get-Content $Config | ConvertFrom-Json
+                        }
+                    } catch {
+                        Write-Error "Failed to load the JSON file from the specified path or URL: $_"
+                        return
+                    }
+                    $flattenedJson = $jsonFile.PSObject.Properties.Where({ $_.Name -ne "Install" }).ForEach({ $_.Value })
+                    Invoke-WPFPresets -preset $flattenedJson -imported $true
+                }
+            } catch {
+                Write-Error "An error occurred while importing: $_"
             }
         }
-
-        Invoke-WPFPresets -preset $flattenedJson -imported $true
     }
 }

tools/Invoke-Preprocessing.ps1

@@ -72,80 +72,45 @@ function Invoke-Preprocessing {
         throw "[Invoke-Preprocessing] Invalid Paramter Value for 'WorkingDir', passed value: '$WorkingDir'. Either the path is a File or Non-Existing/Invlid, please double check your code."
     }
 
-    $count = $ExcludedFiles.Count
-
-    # Make sure there's a * at the end of folders in ExcludedFiles list
-    for ($i = 0; $i -lt $count; $i++) {
-        $excludedFile = $ExcludedFiles[$i]
-        $isFolder = ($excludedFile) -match '\\$'
-        if ($isFolder) { $ExcludedFiles[$i] = $excludedFile + '*' }
+    $InternalExcludedFiles = [System.Collections.Generic.List[string]]::new($ExcludedFiles.Count)
+    ForEach ($excludedFile in $ExcludedFiles) {
+        $InternalExcludedFiles.Add($excludedFile) | Out-Null
     }
 
-    # Validate the ExcludedFiles List before continuing on,
-    # that's if there's a list in the first place, and '-SkipExcludedFilesValidation' was not provided.
-    if (-not $SkipExcludedFilesValidation) {
-        for ($i = 0; $i -lt $count; $i++) {
-            $excludedFile = $ExcludedFiles[$i]
+    # Validate the ExcludedItems List before continuing on,
+    # that's if there's a list in the first place, and '-SkipInternalExcludedFilesValidation' was not provided.
+    if ($ExcludedFiles.Count -gt 0) {
+        ForEach ($excludedFile in $ExcludedFiles) {
             $filePath = "$(($WorkingDir -replace ('\\$', '')) + '\' + ($excludedFile -replace ('\.\\', '')))"
-
-            # Handle paths with wildcards in a different implementation
-            $matches = ($filePath) -match '^.*?\*'
-
-            if ($matches) {
-                if (-NOT (Get-ChildItem -Recurse -Path "$filePath" -File -Force)) {
-                    $failedFilesList += "'$filePath', "
+            $files = Get-ChildItem -Recurse -Path "$filePath" -File -Force
+            if ($files.Count -gt 0) {
+                ForEach ($file in $files) {
+                    $InternalExcludedFiles.Add("$($file.FullName)") | Out-Null
                 }
-            } else {
-                if (-NOT (Test-Path -Path "$filePath")) {
-                    $failedFilesList += "'$filePath', "
-                }
-            }
+            } else { $failedFilesList += "'$filePath', " }
         }
         $failedFilesList = $failedFilesList -replace (',\s*$', '')
-        if (-NOT $failedFilesList -eq "") {
+        if ((-not $failedFilesList -eq "") -and (-not $SkipExcludedFilesValidation)) {
             throw "[Invoke-Preprocessing] One or more File Paths and/or File Patterns were not found, you can use '-SkipExcludedFilesValidation' switch to skip this check, the failed to validate are: $failedFilesList"
         }
     }
 
     # Get Files List
-    [System.Collections.ArrayList]$files = Get-ChildItem $WorkingDir -Recurse -Exclude $ExcludedFiles -File -Force
-    $numOfFiles = $files.Count
+    [System.Collections.ArrayList]$files = Get-ChildItem -LiteralPath $WorkingDir -Recurse -Exclude $InternalExcludedFiles -File -Force
 
     # Only keep the 'FullName' Property for every entry in the list
-    for ($i = 0; $i -lt $numOfFiles; $i++) {
+    for ($i = 0; $i -lt $files.Count; $i++) {
         $file = $files[$i]
         $files[$i] = $file.FullName
     }
 
     # If a file(s) are found in Exclude List,
     # Remove the file from files list.
-    for ($j = 0; $j -lt $excludedFiles.Count; $j++) {
-        # Prepare some variables
-        $excluded = $excludedFiles[$j]
-        $pathToFind = ($excluded) -replace ('^\.\\', '')
-        $pathToFind = $WorkingDir + '\' + $pathToFind
-        $index = -1 # reset index on every iteration
-
-        # Handle paths with wildcards in a different implementation
-        $matches = ($pathToFind) -match '^.*?\*'
-
-        if ($matches) {
-             $filesToCheck = Get-ChildItem -Recurse -Path "$pathToFind" -File -Force
-             if ($filesToCheck) {
-                for ($k = 0; $k -lt $filesToCheck.Count; $k++) {
-                    $fileToCheck = $filesToCheck[$k]
-                    $index = $files.IndexOf("$fileToCheck")
-                    if ($index -ge 0) { $files.RemoveAt($index) }
-                }
-             }
-        } else {
-            $index = $files.IndexOf("$pathToFind")
-            if ($index -ge 0) { $files.RemoveAt($index) }
-        }
+    ForEach ($excludedFile in $InternalExcludedFiles) {
+        $index = $files.IndexOf("$excludedFile")
+        if ($index -ge 0) { $files.RemoveAt($index) }
     }
 
-    # Make sure 'numOfFiles' is synced with the actual Number of Files found in '$files'
-    # This's done because previous may or may not edit the files list, so we should update it
     $numOfFiles = $files.Count
 
     if ($numOfFiles -eq 0) {