Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Class names for Add-Type and check if class was already added #226

Merged
merged 1 commit into from
Aug 24, 2021
Merged

Fix: Class names for Add-Type and check if class was already added #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/31-Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
## Bugfixes

* [#224](https://github.com/Icinga/icinga-powershell-plugins/pull/224) Fixes `Invoke-IcingaCheckUsedPartitionSpace` label names, which might have caused conflicts with Graphite/InfluxDB, because of changed metric unit
* [#226](https://github.com/Icinga/icinga-powershell-plugins/pull/226) Fixes class names of `Add-Type` for `Get-IcingaDiskAttributes` and `Get-IcingaUNCPathSize` and adds checks if the class was already added inside the session

### Enhancements

Expand Down
80 changes: 41 additions & 39 deletions provider/disks/Get-IcingaDiskAttributes.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,55 +34,57 @@ function Get-IcingaDiskAttributes()
$DISK_ATTRIBUTE_OFFLINE = 0x0000000000000001;
$DISK_ATTRIBUTE_READ_ONLY = 0x0000000000000002;

Add-Type -TypeDefinition @"
using System;
using System.IO;
using System.Diagnostics;
using System.Runtime.InteropServices;
if ((Test-IcingaAddTypeExist -Type 'IcingaDiskAttributes') -eq $FALSE) {
Add-Type -TypeDefinition @"
using System;
using System.IO;
using System.Diagnostics;
using System.Runtime.InteropServices;

public static class kernel32 {
[DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
public static extern IntPtr CreateFile(
[MarshalAs(UnmanagedType.LPTStr)] string filename,
[MarshalAs(UnmanagedType.U4)] FileAccess access,
[MarshalAs(UnmanagedType.U4)] FileShare share,
IntPtr securityAttributes,
[MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
[MarshalAs(UnmanagedType.U4)] FileAttributes flagsAndAttributes,
IntPtr templateFile
);
public static class IcingaDiskAttributes {
[DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
public static extern IntPtr CreateFile(
[MarshalAs(UnmanagedType.LPTStr)] string filename,
[MarshalAs(UnmanagedType.U4)] FileAccess access,
[MarshalAs(UnmanagedType.U4)] FileShare share,
IntPtr securityAttributes,
[MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
[MarshalAs(UnmanagedType.U4)] FileAttributes flagsAndAttributes,
IntPtr templateFile
);

public struct Icinga_Disk_Data {
[MarshalAs(UnmanagedType.U4)]public UInt32 Version;
[MarshalAs(UnmanagedType.U4)]public UInt32 Reserved1;
[MarshalAs(UnmanagedType.U8)]public UInt64 Attributes;
}
public struct Icinga_Disk_Data {
[MarshalAs(UnmanagedType.U4)]public UInt32 Version;
[MarshalAs(UnmanagedType.U4)]public UInt32 Reserved1;
[MarshalAs(UnmanagedType.U8)]public UInt64 Attributes;
}

[DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
public static extern bool DeviceIoControl(
IntPtr hDevice,
uint dwIoControlCode,
IntPtr lpInBuffer,
uint nInBufferSize,
out Icinga_Disk_Data lpOutBuffer,
uint nOutBufferSize,
out uint lpBytesReturned,
IntPtr lpOverlapped
);
[DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
public static extern bool DeviceIoControl(
IntPtr hDevice,
uint dwIoControlCode,
IntPtr lpInBuffer,
uint nInBufferSize,
out Icinga_Disk_Data lpOutBuffer,
uint nOutBufferSize,
out uint lpBytesReturned,
IntPtr lpOverlapped
);

[DllImport("kernel32.dll", SetLastError=true)]
public static extern bool CloseHandle(IntPtr hObject);
}
[DllImport("kernel32.dll", SetLastError=true)]
public static extern bool CloseHandle(IntPtr hObject);
}
"@
}

[bool]$DiskOffline = $FALSE;
[bool]$DiskReadOnly = $FALSE;
$KernelHandle = [kernel32]::CreateFile($PhysicalDisk, 0, [System.IO.FileShare]::ReadWrite, [System.IntPtr]::Zero, [System.IO.FileMode]::Open, 0, [System.IntPtr]::Zero);
$KernelHandle = [IcingaDiskAttributes]::CreateFile($PhysicalDisk, 0, [System.IO.FileShare]::ReadWrite, [System.IntPtr]::Zero, [System.IO.FileMode]::Open, 0, [System.IntPtr]::Zero);

if ($KernelHandle) {
$DiskData = New-Object -TypeName Kernel32+Icinga_Disk_Data;
$DiskData = New-Object -TypeName IcingaDiskAttributes+Icinga_Disk_Data;
$Value = New-Object -TypeName UInt32;
$Result = [kernel32]::DeviceIoControl($KernelHandle, $IOCTL_DISK_GET_DISK_ATTRIBUTES, [System.IntPtr]::Zero, 0, [ref]$DiskData, [System.Runtime.InteropServices.Marshal]::SizeOf($DiskData), [ref]$Value, [System.IntPtr]::Zero);
$Result = [IcingaDiskAttributes]::DeviceIoControl($KernelHandle, $IOCTL_DISK_GET_DISK_ATTRIBUTES, [System.IntPtr]::Zero, 0, [ref]$DiskData, [System.Runtime.InteropServices.Marshal]::SizeOf($DiskData), [ref]$Value, [System.IntPtr]::Zero);
if ($Result) {
if (($DiskData.attributes -band $DISK_ATTRIBUTE_OFFLINE) -eq $DISK_ATTRIBUTE_OFFLINE) {
$DiskOffline = $TRUE;
Expand All @@ -91,7 +93,7 @@ function Get-IcingaDiskAttributes()
$DiskReadOnly = $TRUE;
}
}
$Result = [kernel32]::CloseHandle($KernelHandle);
$Result = [IcingaDiskAttributes]::CloseHandle($KernelHandle);
}

return @{
Expand Down
34 changes: 18 additions & 16 deletions provider/disks/Get-IcingaUNCPathSize.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,24 @@ function Get-IcingaUNCPathSize()
-Force;
}

# Register our kernel32.dll Windows API function call
Add-Type -TypeDefinition @"
using System;
using System.Runtime.InteropServices;

public static class kernel32 {
[DllImport("kernel32.dll", PreserveSig = true, CharSet = CharSet.Auto)]

public static extern int GetDiskFreeSpaceEx(
IntPtr lpDirectoryName, // UNC Path for share
out long lpFreeBytesAvailable, // Free Bytes available on path
out long lpTotalNumberOfBytes, // Bytes available on target disk / path
out long lpTotalNumberOfFreeBytes // Total available space on target disk / path
);
}
if ((Test-IcingaAddTypeExist -Type 'IcingaUNCPath') -eq $FALSE) {
# Register our kernel32.dll Windows API function call
Add-Type -TypeDefinition @"
using System;
using System.Runtime.InteropServices;

public static class IcingaUNCPath {
[DllImport("kernel32.dll", PreserveSig = true, CharSet = CharSet.Auto)]

public static extern int GetDiskFreeSpaceEx(
IntPtr lpDirectoryName, // UNC Path for share
out long lpFreeBytesAvailable, // Free Bytes available on path
out long lpTotalNumberOfBytes, // Bytes available on target disk / path
out long lpTotalNumberOfFreeBytes // Total available space on target disk / path
);
}
"@
}

# Setup variables as object which we can use to reference data into
$ShareFree = New-Object -TypeName long;
Expand All @@ -38,7 +40,7 @@ Add-Type -TypeDefinition @"
[System.IntPtr]$ptrPath = [System.Runtime.InteropServices.Marshal]::StringToHGlobalAuto($Path);

# Call our function we registered within the Add-Type definition
[kernel32]::GetDiskFreeSpaceEx($ptrPath, [ref]$ShareFree, [ref]$ShareSize, [ref]$TotalFree) | Out-Null;
[IcingaUNCPath]::GetDiskFreeSpaceEx($ptrPath, [ref]$ShareFree, [ref]$ShareSize, [ref]$TotalFree) | Out-Null;
$ShareFreePercent = 0;

if ($ShareSize -ne 0) {
Expand Down