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.

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

[Unprivileged] Windows enablement #4264

Merged
merged 55 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from 54 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
a74cf31
Work on creating user/group on windows.
blakerouse Feb 8, 2024
5b59d62
Allow install on Windows.
blakerouse Feb 9, 2024
cd0de99
Set correct permissions on install.
blakerouse Feb 9, 2024
a72e02a
Remove the FreeSID causing crash.
blakerouse Feb 9, 2024
322c363
Return correct errors for FindGID and FindUID.
blakerouse Feb 9, 2024
5523eff
Add SeRestorePrivilege.
blakerouse Feb 12, 2024
da71060
Set the password for the service.
blakerouse Feb 13, 2024
685f3d3
Un-comment the uninstall on error.
blakerouse Feb 13, 2024
6dd742b
Set the local security policy for the created user.
blakerouse Feb 13, 2024
f65da0d
Fix set password to use a specific struct.
blakerouse Feb 13, 2024
4aab797
Fix vault and listener permissions.
blakerouse Feb 14, 2024
6ec63f2
Update notice.
blakerouse Feb 14, 2024
94cf61f
Merge branch 'main' into unprivileged-windows
blakerouse Feb 14, 2024
c57d4fa
Fix deps.
blakerouse Feb 14, 2024
df4e2fb
Merge branch 'main' into unprivileged-windows
blakerouse Feb 14, 2024
6aaebc3
Fix lint.
blakerouse Feb 15, 2024
b4c3e6d
Fix windows lint.
blakerouse Feb 15, 2024
8c7ed65
Fix windows lint.
blakerouse Feb 15, 2024
733c443
Adjust integration tests for allowing unprivileged on Windows.
blakerouse Feb 15, 2024
0840e4c
Adjust more tests.
blakerouse Feb 15, 2024
c3943e2
Merge branch 'main' into unprivileged-windows
blakerouse Mar 7, 2024
83af91c
Fix test.
blakerouse Mar 8, 2024
909d48a
Fix user create.
blakerouse Mar 8, 2024
de92fb7
More work on Windows.
blakerouse Mar 13, 2024
c619711
Merge branch 'main' into unprivileged-windows
blakerouse Mar 13, 2024
7f21ab0
Fix test.
blakerouse Mar 13, 2024
8fec77a
More permission adjustments.
blakerouse Mar 13, 2024
263af6a
skip takeOwnership when not root.
blakerouse Mar 13, 2024
5ac6368
Impove comments.
blakerouse Mar 13, 2024
0285399
Fix RunningUnderSupervisor to work running as unprivileged service.
blakerouse Mar 13, 2024
a7ee861
Adjust RunningUnderSupervisor.
blakerouse Mar 13, 2024
fbf7285
Fix re-exec on Windows with unprivileged.
blakerouse Mar 13, 2024
cbefd7e
Set DACL correctly on service.
blakerouse Mar 14, 2024
1916b3a
Fix enrollment during install on Windows with unprivileged.
blakerouse Mar 19, 2024
17ac3d1
Merge branch 'main' into unprivileged-windows
blakerouse Mar 19, 2024
2ad71d4
Fix issues from merge.
blakerouse Mar 19, 2024
5b6d11c
Fix lint.
blakerouse Mar 19, 2024
9312f5c
Fix windows lint.
blakerouse Mar 19, 2024
46fb164
Fix reexec_windows subcommand.
blakerouse Mar 20, 2024
38f5a5f
Fix install test.
blakerouse Mar 20, 2024
ade3f50
Merge remote-tracking branch 'upstream/main' into unprivileged-windows
blakerouse Mar 20, 2024
94bff9a
Fix metrics monitoring test.
blakerouse Mar 20, 2024
bb8f2b9
Merge remote-tracking branch 'upstream/main' into unprivileged-windows
blakerouse Mar 21, 2024
131b24f
Switch from privileged to unprivileged in control protocol.
blakerouse Mar 21, 2024
60a9835
Merge branch 'main' into unprivileged-windows
blakerouse Mar 21, 2024
39bcb29
Improve logging on start.
blakerouse Apr 1, 2024
bb665a7
Merge branch 'main' into unprivileged-windows
blakerouse Apr 1, 2024
f9e69d5
Fix TestMetricsMonitoringCorrectBinaries.
blakerouse Apr 1, 2024
ee6a4ab
Fix more issues and test.
blakerouse Apr 1, 2024
f989d44
Some code cleanup.
blakerouse Apr 2, 2024
a5ad1e8
Fix logging of context cancelled.
blakerouse Apr 2, 2024
d05c552
Fix restart delay.
blakerouse Apr 2, 2024
12f7b16
Add comment for windows.Token(0), and more context.
blakerouse Apr 2, 2024
9e30596
Merge remote-tracking branch 'upstream/main' into unprivileged-windows
blakerouse Apr 2, 2024
af2cbe7
Switch to crypto/rand.
blakerouse Apr 3, 2024
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
212 changes: 212 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6275,6 +6275,218 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


--------------------------------------------------------------------------------
Dependency : github.com/winlabs/gowin32
Version: v0.0.0-20221003142512-0d265587d3c9
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/winlabs/gowin32@v0.0.0-20221003142512-0d265587d3c9/LICENSE:


Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.


--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm
Version: v1.15.0
Expand Down
2 changes: 2 additions & 0 deletions control_v2.proto
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ message StateAgentInfo {
bool snapshot = 5;
// Current running PID.
int32 pid = 6;
// True when running as unprivileged.
bool unprivileged = 7;
}

// StateResponse is the current state of Elastic Agent.
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b
github.com/winlabs/gowin32 v0.0.0-20221003142512-0d265587d3c9
go.elastic.co/apm/module/apmgorilla v1.15.0
go.elastic.co/ecszap v1.0.1
go.elastic.co/go-licence-detector v0.5.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1846,6 +1846,8 @@ github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
github.com/winlabs/gowin32 v0.0.0-20221003142512-0d265587d3c9 h1:U8aCPFEMnxAEyj9IonhMVV1gSL4nzelh8uvoXp0hrq0=
github.com/winlabs/gowin32 v0.0.0-20221003142512-0d265587d3c9/go.mod h1:N51TYkG9JGR5sytj0EoPl31Xg2kuB507lxEmrwSNvfQ=
github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
Expand Down
26 changes: 21 additions & 5 deletions internal/pkg/agent/application/info/agent_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ package info

import (
"context"
"fmt"

"github.com/elastic/elastic-agent/internal/pkg/release"
"github.com/elastic/elastic-agent/pkg/core/logger"
"github.com/elastic/elastic-agent/pkg/utils"
)

type Agent interface {
Expand All @@ -32,12 +34,16 @@ type Agent interface {

// Version returns the version for this Agent.
Version() string

// Unprivileged returns true when this Agent is running unprivileged.
Unprivileged() bool
}

// AgentInfo is a collection of information about agent.
type AgentInfo struct {
agentID string
logLevel string
agentID string
logLevel string
unprivileged bool

// esHeaders will be injected into the headers field of any elasticsearch
// output created by this agent (see component.toIntermediate).
Expand All @@ -55,11 +61,16 @@ func NewAgentInfoWithLog(ctx context.Context, level string, createAgentID bool)
if err != nil {
return nil, err
}
isRoot, err := utils.HasRoot()
if err != nil {
return nil, fmt.Errorf("failed to determine root/Administrator: %w", err)
}

return &AgentInfo{
agentID: agentInfo.ID,
logLevel: agentInfo.LogLevel,
esHeaders: agentInfo.Headers,
agentID: agentInfo.ID,
logLevel: agentInfo.LogLevel,
unprivileged: !isRoot,
esHeaders: agentInfo.Headers,
}, nil
}

Expand Down Expand Up @@ -119,3 +130,8 @@ func (*AgentInfo) Snapshot() bool {
func (i *AgentInfo) Headers() map[string]string {
return i.esHeaders
}

// Unprivileged returns true when this Agent is running unprivileged.
func (i *AgentInfo) Unprivileged() bool {
return i.unprivileged
}
Loading
Loading