Merge pull request #2206 from wabbajack-tools/admin-sid

Improve admin check
This commit is contained in:
Timothy Baldridge
2022-11-17 06:40:13 -07:00
committed by GitHub
2 changed files with 6 additions and 1 deletions

View File

@ -1,9 +1,10 @@
### Changelog ### Changelog
#### Version - 3.0.4.1 - TBD #### Version - 3.0.4.1 - TBD
* Improved Admin Check
* Improved naming of installation fields to clear up some confusion. * Improved naming of installation fields to clear up some confusion.
#### Version - 3.0.4.0 - 11/12/2022 #### Version - 3.0.4.0 - 11/12/2022
* Upgrade GameFinder to 2.2.1 * Upgrade GameFinder to 2.2.1
* Update to .NET 7.0 (no user updates required) * Update to .NET 7.0 (no user updates required)

View File

@ -99,8 +99,12 @@ namespace Wabbajack
try try
{ {
var identity = WindowsIdentity.GetCurrent(); var identity = WindowsIdentity.GetCurrent();
var owner = identity.Owner;
if (owner is not null) return owner.IsWellKnown(WellKnownSidType.BuiltinAdministratorsSid);
var principle = new WindowsPrincipal(identity); var principle = new WindowsPrincipal(identity);
return principle.IsInRole(WindowsBuiltInRole.Administrator); return principle.IsInRole(WindowsBuiltInRole.Administrator);
} }
catch (Exception) catch (Exception)
{ {