Commit Graph
350 Commits
Author SHA1 Message Date
Hamza El-Saawy 6a0f8b69d1 [etw] Add String() functions, JSON field option (#285)
Add `String()` functions to `etw.Level` and `etw.Opcode` types.

Add `etw.JSONStringField()`, which denotes a string field containing
JSON data.

Fix doc comment casing.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2023-04-26 12:56:36 -04:00
Hamza El-Saawy 070c828abb update linter and fix lints (#284)
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2023-04-14 15:24:28 -04:00
Hamza El-Saawy b884eb77db Add fs.ResolvePath to resolve symbolic links (#275)
* Add `fs.ResolvePath` to resolve symbolic links

`filepath.EvalSymlinks` does not work well on Windows, and can enter
infinite loops in certain situations and error out.
Use Win32 API GetFinalPathNameByHandle to handle path resolution.

Implementation based off on: https://github.com/containerd/containerd/pull/5411

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* PR: types, documentation

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* remove unneded constant groups

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* Attempt normalized path first

Update logic to try querying for normalized path initially, then use
opened path if access is denied.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

---------

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2023-04-14 12:58:14 -04:00
rcarman-r7 41915dceb0 apply ObjectAttributes fix for certain Windows environments (#280)
Signed-off-by: Robert Carman <robert_carman@rapid7.com>
2023-03-16 13:30:07 -04:00
Hamza El-Saawy 2a14e68005 Apply two upstream CL to mkwinsyscall (#278)
* Apply CL463216: write source to temp file if formatting fails

This change writes the unformatted Go source code to a temp file if
"format.Source" fails. Print the temp file path to the console to make
it easy to find. The source code is what causes formatting errors, and
it can be difficult to diagnose them without this context.

CL link: https://go-review.googlesource.com/c/sys/+/463216
commit: 4112509618ee88519f899be20efc6882496b57c8

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* Apply CL463215: support "." and "-" in DLL name

This change adds "." and "-" support for DLL filenames in "//sys".

Supporting "." requires a change in how mkwinsyscall handles the
"= <filename>.<function>" syntax. Instead of assuming that only one "."
can appear in this string, now mkwinsyscall assumes that any additional
"." belongs to the filename.

Supporting "." also requires changing how Go identifiers are created for
each DLL. This change also allows mkwinsyscall to support "-". When
creating a Go identifier, "." and "-" in the DLL filename are replaced
with "_". Otherwise, mkwinsyscall would produce invalid Go code, causing
"format.Source" to fail.

CL link: https://go-review.googlesource.com/c/sys/+/463215
commit: 71da6904945ac440253cb5c132d64712f80ca497

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

---------

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2023-03-03 15:52:45 -05:00
Gabriel dd5de6900b Add some basic bind filter functions (#274)
* Add some basic bind filter functions

This change adds the ability to mount a a single folder or a volume
inside another folder, using the bind filter API.

While the API allows mounting multiple sources inside a single mount
point, acting as an overlay, we disable this functionality in the ApplyFileBinding
function.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

* Add some tests

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

* Move bind filter to different package

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

* Use string in signature and fix getFinalPath

  * Properly close handle in getFinalPath()
  * Use string in function signature. mksyscall generates proper code to
    convert to utf16
  * Enable TestRemoveFileBinding on Windows Server 2019

Windows Server 2019 only exposes 2 function in bindfltapi.dll:

  * BfRemoveMapping
  * BfSetupFilter

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

* Use windows.UTF16ToString to decode string

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

* Optimize bfGetMappings signature

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

* Skip unsupported tests on ltsc2019

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

* Fix typo, add testcase

  * Additionally check if we can write to a read-only mount point, not
    just delete from it
  * No need to set FILE_FLAG_OPEN_REPARSE_POINT when opening a file

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

* Remove extra flags

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

* Add test to account for symlinks as sources

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

---------

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
2023-02-28 11:37:19 -05:00
Hamza El-Saawy 6a35904fd4 update dependencies (#277)
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2023-02-13 12:19:14 -05:00
Sebastiaan van Stijn cbf4dd9782 pkg/etw/sample: remove dependency on github.com/sirupsen/logrus (#267)
It looks like for the purpose of the example "a" logger was needed, so not
strictly logrus (probably `fmt.Println()` would've worked even).

This patch removes logrus as dependency for the example. The only remaining
use of logrus in this repository is now in the pkg/etc/etwlogrus package, which
_does_ need logrus, but (possibly) could become its own module if we want to
remove logrus as dependency of go-winio itself.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2023-02-13 11:25:49 -05:00
Hamza El-Saawy 650a2e464c Update version, remove deprecated linter (#265)
`structcheck` is deprecated.
Update golanci-lint to 1.50.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-10-28 12:31:56 -04:00
Hamza El-Saawy a059ad7ac1 Soften linter (#264)
Remove some aggressive linters: `godoc`, `goconst`, `misspel`, `nestif`,
and `prealloc.
Also remove `stylecheck` since it is subsumed by `revive`, and
the later is more configurable.

Allow tests and build stages to continue even if linter fails.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-10-24 15:53:06 -04:00
Hamza El-Saawy 376b2013fe GUID tests to use t.Run (#256)
Switched to subtests using `t.Run()` for GUID testing, rather than using
log statements to demarcate different tests.

Added `.String` to GUID `Variant` and `Version` using
`golang.org/x/tools/cmd/stringer`.

Added `tools.go` to version `stringer` in go.mod and allow
`go generate ./...` to be run without needing a `go get` call.
Based off of [go wiki](https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module)
recommendation.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-08-29 16:27:34 -04:00
Hamza El-Saawy ebbecbd9b5 Update internal/socket go generate, spelling (#259)
`./internal/socket/socket.go` uses `github.com/Microsoft/go-winio/tools/mkwinsyscall`
instead of `golang.org/x/sys/windows/mkwinsyscall` for its
`//go:generate` directive, keeping it consistent with the rest of the
repo.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-08-29 15:17:06 -04:00
Hamza El-Saawy 0a5d7766c0 add version number to fix linting issues (#258)
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-08-24 12:07:59 -04:00
Hamza El-Saawy e268c11e27 Add lint and go generate steps to CI (#254)
* Add lint and go generate stages to CI

Add CI step to verify `go generate` was run on repo.
Add linter stage to CI along with linter config file,
`.golangci.yml`.
Will likely prefer revive over static-check.

Updated README Contributing section on linting requirements.

Added sequence ordering to make sure lint and go generate stages run
before tests and build.
This way, build and tests are not run on code that could potentially:

    1. not build due to `gofmt` issues;
    2. contain bugs;
    3. have to be re-submitted after issues are fixed; or
    4. contain outdated Win32 syscall or other auto-generated files.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* Fixed linter issues

Code changes to satisfy linters:

 - Ran `gofmt -s -w` on repo.
 - Broke up long lines.
 - When possible, changed names with incorrect initialism formatting
   - Added exceptions for exported variables.
 - Added exceptions for ALL_CAPS_WITH_UNDERSCORES code.
   - Switched to using `windows` or `syscall` definitions if possible;
     especially if some constants were unused.
 - Added `_ =` to satisfy error linter, and acknowledge that errors are
   being ignored.
 - Switched to using `errors.Is` and `As` in places, elsewhere added
   exceptions if error value was known to be `syscall.Errno`.
 - Removed bare returns.
 - Prevented variables from being overshadowed in certain places
   (ignoring cases of overshadowing `err`).
 - Renamed variables and functions (eg, `len`, `eventMetadata.bytes`) to
   prevent shadowing pre-built functions and imported pacakges.
 - Removed unused method receivers.
 - Added exceptions to certain unused (unexported) constants and
   functions.
   - Deleted unused `once` from `pkg/etw.providerMap`.
 - Renamed `noop.go` files to `main_other.go` or `doc.go`, to better fit
   style recommendations.
 - Added exceptions for non-secure use of SHA1 and weak crypto
   libraries.
 - Replaced `ioutil` with `io` and `os` (and `t.TempDir` in tests).
 - Added fully exhaustive checks for `switch` statements in `pkg/etw`.
 - Defined constant strings for `tools/mkwinsyscall`.
 - Removed unnecessary conversions.
 - Made sure `context.Cancel` was called.

Additionally, added `//go:build windows" constraints on files with
unexported code, since linter will complain about unused code on
non-Windows platforms.

Added a stub `main() {}` for `mkwinsyscall` for non-Windows builds, just in
case `//go:generate` directives are added to OS-agnostic files.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* PR: spelling, constants, fuzzing

Moved HVSocket fuzzing tests to separate file with go 1.18 build
constraint.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-08-23 15:05:05 -04:00
Hamza El-Saawy 79ae8cea02 Added HV Socket tests (#240)
* Added HV Socket tests

Added tests for core Hyper-V socket functionality, including testing
CloseRead and CloseWrite, as well as checking addresses are appropriate
and timeouts work.

Added fuzzing test to check for edge case read/write issues.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* pr: asserts, naming, fatal in test

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-08-22 11:09:02 -04:00
Hamza El-Saawy d68e55cd0b Added HV Socket known IDs, Dial, bug fixes (#239)
* Added HV Socket known IDs, Dial, bug fixes

Added:
* Well-know Hyper-V VMIDs for parents, children, and loopback.
* VSock interop service GUID.
* `Dial()` and `DialContext()` to dial a specific Hyper-V socket at a
  known address (along with a corresponding `HvsockDialer` struct.

Bug fixes:
* Dial (and Listen) now properly initialize and set properties of their
  sockets after ConnectEx (and AcceptEx).
* The `socketError` used by `bind` was incorrect, it should be `int32(-1)`,
  not `uintptr(^0)`
* Return errors for `(*HvsockConn) SetDeadline`

Created a `sockets` package, currently only with syscalls to `Bind`,
`ConnectEx` and `GetSockName`, bypassing `syscall/windows` restrictions
on the types that can do so.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* PR: error handling bug, rebase, unexport, naming

* comments and todos statements
* spelling
* removed dead code
* changed names to be more conventional
* unexported socket code
* made `(*HvsockDialer) Dial` take `Context`, removed `DialContext`
* added default `Dial` function
* rebased onto main
* cleaned up `Dial(` retry loop

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* PR: RawSockaddr validation, `.As(` style

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-07-21 19:33:50 -04:00
Hamza El-Saawy c62166d832 Merge pull request #223 from jcchavezs/patch-1
chore: removes unneeded receiver in timeoutError
2022-07-14 09:49:26 -04:00
José Carlos Chávez 4f8488cc54 chore: removes unneeded receiver in timeoutError
Signed-off-by: José Carlos Chávez <jcchavezs@gmail.com>
2022-07-14 10:23:56 +02:00
meeehow 8fca75951f Allow to build WIM module for linux (#252)
* Update decompress.go

Add linux to build tags

Signed-off-by: Michał Legin <mlegin@google.com>

* Update wim.go

Add linux to build tags

Signed-off-by: Michał Legin <mlegin@google.com>
2022-07-12 10:53:07 -04:00
Danny Canter 4ed8d49cc0 Merge pull request #228 from bitgestalt/fix_localized_account_names
Add lookup of account names by SID
2022-07-06 08:12:37 -07:00
Maksim An a0519181eb Merge pull request #250 from microsoft/users/GitHubPolicyService/e09101fd-8910-4005-b2ff-aee889857ab9
Adding Microsoft SECURITY.MD
2022-06-17 11:46:28 -05:00
microsoft-github-policy-service[bot] e2e8947fb0 Microsoft mandatory file 2022-06-16 18:05:25 +00:00
Hamza El-Saawy 35837cff61 Update mkwinsyscall and make stand alone tool (#248)
* Add latest mkwinsyscall file

Copied file from:
https://github.com/golang/sys/blob/bc2c85ada10aa9b6aa9607e9ac9ad0761b95cf1d/windows/mkwinsyscall/mkwinsyscall.go

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* Update to match hcsshim mksyscall_windows

Added hr error return type, cmdline flags for winio import, utf16, and
sorting.

Generated file has build constrain comment.

Input files can be specified with a glob pattern.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* PR: update comment, use glob

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-06-16 14:05:19 -04:00
Hamza El-Saawy bdacbf1c28 Upgrade golang/sys to fix warning (#246)
Language server complains about
`invalid operation: operator | not defined on windows.TOKEN_ADJUST_PRIVILEGES`
in `privilege.go`. Upgrading to new golang.org/x/sys fixes issue.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-05-10 14:34:13 -04:00
Hamza El-Saawy 87532d1cfe Set ETW event name and options for logrus hook (#245)
* ETW name and options functionality

Added functionality to set the event (task) name and options (such as
event or associated event ID) for ETW events created by the hook based
on the logrus.Entry fields.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

* PR: export and comment

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-04-27 15:00:13 -04:00
Hamza El-Saawy 75ee807f27 Merge pull request #244 from helsaawy/he/gitignore
Add .vscode folder and go workspaces to git ignore
2022-04-20 18:34:32 -04:00
Hamza El-Saawy bda1d8b099 Add .vscode folder and go workspaces to git ignore
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-04-20 17:37:42 -04:00
Danny Canter 5af2f31378 Merge pull request #242 from dcantah/swap-to-neterrclosed
Assign ErrPipeListenerClosed to net.ErrClosed
2022-04-20 13:34:27 -07:00
Daniel Canter 708df50a26 CI: Run tests on Go 1.17+
Add in a ^1.17.0 go-version for the actions/setup-go@v2 action. This
was set for our build step but not for the step that runs all of the
unit tests.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-04-06 01:54:17 -07:00
Daniel Canter 02e8aff16e Assign ErrPipeListenerClosed to net.ErrClosed
This error used to just be a `errors.New` with the text exactly matching
the "use of closed network connection" that you'd get from the Go stdlib.
Now that that error was exported as `net.ErrClosed` in Go 1.16 we should
be able to swap to this safely, and anyone who relied on checking the
string explicitly should still be fine.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-04-05 18:07:44 -07:00
Danny Canter 1e35b45f32 Bump go version to 1.17 in go.mod/CI (#230)
1.13 is sufficiently old at this point and net.ErrClosed from 1.16 will be nice
to use.

This change additionally runs go fmt to bring in the new 1.17 build tag syntax
and builds the binaries in our CI with 1.17+.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-04-05 15:56:47 -07:00
Hamza El-Saawy 94764bf229 Merge pull request #241 from helsaawy/he/buildconstr
Updating windows build constraints
2022-03-29 16:44:36 -04:00
Hamza El-Saawy b52bba4773 Updating windows build constraints
pkg/guid is not windows specific, as it can run on Linux.
Build constraints on guid_windows and guid_nonwindows are redundant with
file names, but added for consistency.

Added missing build constraints.

Added Ubuntu to test matrix, along with windows 2022.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-03-29 12:38:23 -04:00
Sebastiaan van Stijn 843abba285 backuptar: SecurityDescriptorFromTarHeader() don't decode twice (#233)
This may be a theoretical situation, but the tar headers may contain
both the old and new headers, in which case we would be decoding
both.

This patch rewrites the function to try the new headers first, and
return early if found, then fall back to trying the old headers.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-03-23 10:28:27 -07:00
Kathryn Baldauf 197bc5d0d1 Merge pull request #237 from johanvdw/patch-1
fix typos
2022-03-10 12:03:43 -08:00
Johan Van de Wauw 850283a2d5 fix typos
Signed-off-by: Johan Van de Wauw <johan@gisky.be>
2022-03-08 23:53:12 +01:00
Hamza El-Saawy dfd7da8f92 Merge pull request #231 from helsaawy/he/close
HvsockConn shutdown bugfix, added .IsClosed() functions
2022-02-17 12:31:29 -05:00
Hamza El-Saawy 0aa6c0a16b HvsockConn shutdown, and .IsClosed() function
Corrected `HvsockConn` `CloseRead`/`Write` to check if the socket
has been closed before attempting to shutdown the socket for
reading or writing.
Additionally, `shutdown` was not respecting whether to shutdown reading
or writing, and only shutting down the socket for reading.

Added `IsClosed` function to `win32File` (and therefore `win32Pipe` and
`win32MessageBytePipe`) and `HvsockConn` to check if the socket/pipe
has been closed already.

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
2022-02-17 11:54:17 -05:00
ambarve 7689f4c38c Merge pull request #220 from ambarve/encode_functions
functions SDDL, EA & Reparse encoding
2022-02-16 16:57:50 -08:00
Danny Canter 7de02db153 Fix 'OpenVirtualDiskParameters' BOOL fields (#226)
* Fix 'OpenVirtualDiskParameters' BOOL fields

While reworking the vhd package I'd mistakingly replaced some of the fields
in the OpenVersion2 structure with the incorrect types. They're defined as
Windows BOOLS which is just a type alias for an int, and I'd put their type as
go bools.

As the type is already passed into some functions, to avoid a breaking change just
convert the incorrect type to a new structure with the correct definition internally.
Truthfully this turns out a bit better as supplying a bool makes more sense and is
more go friendly.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2022-02-14 21:11:00 -08:00
Michael Hofmann e50e8e7af4 Add lookup of account names by SID
This commit adds a new function LookupNameBySid that wraps
LookupAccountSidW and works as an inverse of the already existing
LookupSidByName. In addition to offering new functionality, this
fixes #202.

Signed-off-by: Michael Hofmann <michael.hofmann@bitgestalt.com>
2022-02-09 18:16:47 +01:00
Amit Barve 184126a9f0 backuptar: Export tar header parsing functions
Separates out Security Descriptor (SDDL), Extended Attribute (EA) and Reparse tag encoding
code into individual functions so that those functions can be reused in other code (like
CimFS layer writing)

Signed-off-by: Amit Barve <ambarve@microsoft.com>
2022-01-25 08:37:46 -08:00
Danny Canter 01a3671376 Merge pull request #227 from bitgestalt/use_stdlib_errors
Replace github.com/pkg/errors with stdlib errors
2021-12-02 12:27:00 -08:00
Kathryn Baldauf 568b5c2571 Merge pull request #225 from bitgestalt/fix_test_empty_name
Fix TestLookupEmptyNameFails
2021-12-01 10:50:10 -08:00
Michael Hofmann c4cf81c481 Replace github.com/pkg/errors with stdlib errors
Since Go version 1.13, the standard library has built-in support for
wrapping and unwrapping of error values.  This commit bumps the minimum
version required by the module from 1.12 to 1.13, replaces all calls to
errors.Wrap/f with fmt.Errorf and removes the now unneeded dependency on
github.com/pkg/errors.

Signed-off-by: Michael Hofmann <michael.hofmann@bitgestalt.com>
2021-12-01 11:09:15 +01:00
Michael Hofmann 05c1e887e7 Fix TestLookupEmptyNameFails
TestLookupEmptyNameFails was an identical copy of TestLookupInvalidSid
in the same file. This commit changes the account name queried by the
former to an empty string which is what the name of the test case
suggests.

Signed-off-by: Michael Hofmann <michael.hofmann@bitgestalt.com>
2021-12-01 09:16:45 +01:00
Kathryn Baldauf 60c1574cd7 Merge pull request #169 from dcormier/dc/guid
Allow guid package to be used on non-Windows GOOS targets
2021-10-25 17:23:25 -07:00
Kevin Parsons 6c24dfa01e Merge pull request #217 from kylewo/master
Fixing corruption in callbacks introduced by x86 changes
2021-10-13 04:01:28 -07:00
Kyle Wojtaszek 4c72048b5c FIxing corruption in callbacks
Signed-off-by: Kyle Wojtaszek <kylewo@microsoft.com>
2021-10-12 14:31:04 -07:00
Kevin Parsons 7ec923885d Merge pull request #221 from kevpar/sparse
backuptar: Fix sparse file handling
2021-10-04 14:26:55 -07:00