Skip to content

Commit 7c54cf7

Browse files
eliweitzmanTheDeadGPU
eliweitzman
and
TheDeadGPU
authored
1.3 Merge (#92)
* Added Toolbox component Work towards #68 in progress. #63 as well! * Fixed #71 #71 Complete * Started integration of #73 * Update ETT.ps1 Dropped our duplicate tabs #63 For now, it's all hidden. However, need to work out the keyboard shortcut migration. * Update ETT.ps1 Starting remediation for #74 * Implementation of #64 * Update README.md Fixed a URL bug Signed-off-by: Eli Weitzman <22529819+eliweitzman@users.noreply.github.com> * Update README.md Also missing a ) Signed-off-by: Eli Weitzman <22529819+eliweitzman@users.noreply.github.com> * Fixed #74 * Create ETTToolbox.png Added logo - #72 * Update README.md Signed-off-by: Eli Weitzman <22529819+eliweitzman@users.noreply.github.com> * Update SECURITY.md Signed-off-by: Eli Weitzman <22529819+eliweitzman@users.noreply.github.com> * Update LICENSE Signed-off-by: Eli Weitzman <22529819+eliweitzman@users.noreply.github.com> * Created Custom Functions Config File #24 * App Variables and Custom Functions can be added via JSON #24 * Custom Function Code Cleanup * Added Function Description to Custom Listbox #24 * Added AzureADTenantId and LAPSAppClientID #24 * Restored Hardcoded Custom Functions Display #24 * RSAT identification conditions testing Application currently lags in main UX loading due to a hanging RSAT check. This is the start of a tricky effort to test for RSAT presence, and conditionally show the AD tab. * Added Feature "Anime Mode" #58 * Added Custom Variant of ps2exe Added -resources parameter so we can add multiple PS1 files to the compiled app. * Started Code Rewrite #78 To compile, do the following. .\ps2exe.ps1 Invoke-ps2exe .\ETT.ps1 .\ETT.exe -resources .\MiniClients\BitlockerTool.ps1, .\MiniClients\LAPSTool.ps1, .\MiniClients\ADLookup.ps1 * Fixed LAPSTool Output * Added 🧰 Icon to Custom Functions * Added Display Name and Require Admin to Config #24 * Optimized Tab Creation #78 * Compiler was broken. This is now fixed. * Added Application Title and Header Text Config Options #24 * Optimized Config File Checks Also added MSDefender check * Fixed RSAT Tools Detection #77 * Fixed RSAT Detection Bug (For real this time) #77 * Fixed issue where app name wasn't being set on notifications * Fixed Theme Issue with MiniClients * UI Improvements * Added Admin Mode Status to Application Title * Fixed Domain Name Bug in LAPSTool On first launch of the LAPSTool, the domain field would be empty. I changed this so the domain auto populates on first run. * Updated Logic for AutoUpdatCheckerFlag * Optimized Function and ListBox Item Creation #78 * Gutted Old Code #78 * Added MSGraph Session Info to LAPS Mini Client * Updated LAPS and BitLocker Tools * Upping License year * Added error handling to AD test Built in error action for Active Directory RSAT check, resolving #77 's bug * Updated ExecuteButton Script Logic * Updated GUI logic for GenericToolWindow * Added Logic for Azure Proxy Apps * GUI Fixes * First attempt in the work for #81 * Update SettingsMenu.ps1 * Update .gitignore * Update SettingsMenu.ps1 Added more settings switches, and started some toggle validation work * Update SettingsMenu.ps1 * Integration and deployment of Settings UI #81 first try deployed - validation needed in next steps. * chore: Update winget install command to include source parameter * Update SettingsMenu.ps1 refactor: Add textbox for application timeout length in SettingsMenu.ps1 * New Settings Controls Added settings GUI toggle in config file - part of ongoing work in #81 * Added config file generation from #76 -Format cleanup of ETT.ps1 - Added new conditions for #76 * Update ETT.ps1 - Finalization and tweaks for #81 and #76 - Fixed a missing config error suppression bug * Resolved #84 #84 Resolved Squashing more bugs! * Update SettingsMenu.ps1 Fixed a bug in #81 * feat: Add Defender Enrollment Check to ETT.ps1 and SettingsMenu.ps1 * refactor: Copy Windows Activation Key to Clipboard in Get-WindowsActivationKey function (Resolving #86) * feat: Add host file integrity check to ETT.ps1 prerun for #87 * Reorganized Compiler variant and added attributed license. * Updated ps2exe with custom compile code within - makes it easier to use generally in runtime * Resolving #88 * Added new installer logo assets * Update bug_report.md * feat: Update copyright year in ETT.ps1 The commit updates the copyright year in the ETT.ps1 file to 2024. * Update README.md Signed-off-by: Eli Weitzman <22529819+eliweitzman@users.noreply.github.com> * refactor: Update save dialog filename in ETT.ps1 The save dialog filename in ETT.ps1 has been updated from "DeviceInfo.txt" to "Device_Info.txt" to improve clarity and consistency. * fixed autoupdate checker control switches, as a part of #89 * refactor: Update ETT.ps1 to enable Defender enrollment check The code changes in ETT.ps1 enable the Defender enrollment check by adding the `$settings.DefenderEnrollCheckActive` property. This allows the user to control whether the Defender enrollment check is active or not. * refactor: Enable Defender enrollment check in ETT.ps1 The code changes in ETT.ps1 enable the Defender enrollment check by adding the `$settings.DefenderEnrollCheckActive` property. This allows the user to control whether the Defender enrollment check is active or not. * Fixed bug where MSGraph wasn't being checked * Added more anime wallpapers :P * Fixed Compiler Bug * Added Parameters to Compiler .\Compiler\ps2exe.ps1 -inputFile .\ETT.ps1 -outputFile .\ETT.exe -resources .\MiniClients\BitlockerToolV2.ps1, .\MiniClients\LAPSToolV2.ps1, .\MiniClients\ADLookup.ps1, .\PSAssets\ToolboxFunctions.ps1, .\PSAssets\GenericToolWindow.ps1, .\MiniClients\SettingsMenu.ps1 -version 1.3 --------- Signed-off-by: Eli Weitzman <22529819+eliweitzman@users.noreply.github.com> Co-authored-by: TheDeadGPU <dsfreak0109@gmail.com>
1 parent e148f31 commit 7c54cf7

24 files changed

Lines changed: 6599 additions & 2255 deletions

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Bug report
33
about: Create a report to help us improve
44
title: "[BUG]"
5-
labels: bug, enhancement
5+
labels: bug
66
assignees: ''
77

88
---

‎.github/SECURITY.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ This Security Policy provides guidelines and procedures for maintaining the conf
44

55
## Supported Versions
66

7-
Due to the nature of the application being effectively just a PowerShell script, releases are only supported in active development. Should a security issue arise on your current version, patches only roll on newer updates, and there is no backwards support cycle currently in place. Users are expected to use the most recent version of the application for the best security and feature set. However, there is as well NO built-in update path yet.
7+
Due to the nature of the application being effectively just a PowerShell script, releases are only supported in active development. Should a security issue arise on your current version, patches only roll on newer updates, and there is no backwards support cycle currently in place. Users are expected to use the most recent version of the application for the best security and feature set. As of version 1.2.1, a built-in update path is now officially supported using the Windows Package Manager.
88

99
| Version | Supported |
1010
| ------- | ------------------ |
11-
| 1.x | :white_check_mark: |
11+
| 1.0/1.1 | :stop_sign: - End of Support|
12+
| 1.2.1 | :warning: - EOL with 1.3 rollout, autoupdate is supported |
13+
| 1.3 | :white_check_mark: |
1214

1315
## ETT-Admin Version Support
1416

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ ImageAssets/Thumbs.db
77
ImageAssets/Thumbs.db
88
ImageAssets/Thumbs.db
99
*.db
10+
ImageAssets/Thumbs.db

‎Compiler/LICENSE.txt‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
MICROSOFT LIMITED PUBLIC LICENSE version 1.1
2+
3+
4+
This license governs use of code marked as �sample� or �example� available on this web site without a license agreement, as provided under the section above titled �NOTICE SPECIFIC TO SOFTWARE AVAILABLE ON THIS WEB SITE.� If you use such code (the �software�), you accept this license. If you do not accept the license, do not use the software.
5+
6+
7+
1. Definitions
8+
9+
The terms �reproduce,� �reproduction,� �derivative works,� and �distribution� have the same meaning here as under U.S. copyright law.
10+
11+
A �contribution� is the original software, or any additions or changes to the software.
12+
13+
A �contributor� is any person that distributes its contribution under this license.
14+
15+
�Licensed patents� are a contributor�s patent claims that read directly on its contribution.
16+
17+
18+
2. Grant of Rights
19+
20+
(A) Copyright Grant - Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
21+
22+
(B) Patent Grant - Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
23+
24+
25+
3. Conditions and Limitations
26+
27+
(A) No Trademark License- This license does not grant you rights to use any contributors� name, logo, or trademarks.
28+
29+
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
30+
31+
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
32+
33+
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
34+
35+
(E) The software is licensed �as-is.� You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
36+
37+
(F) Platform Limitation - The licenses granted in sections 2(A) and 2(B) extend only to the software or derivative works that you create that run directly on a Microsoft Windows operating system product, Microsoft run-time technology (such as the .NET Framework or Silverlight), or Microsoft application platform (such as Microsoft Office or Microsoft Dynamics).

0 commit comments

Comments
 (0)