Skip to content

Windows: Root/state create with right ACL and in right place#3120

Merged
crosbymichael merged 2 commits intocontainerd:masterfrom
lowenna:jjh/create-data-root-with-permissions
Mar 22, 2019
Merged

Windows: Root/state create with right ACL and in right place#3120
crosbymichael merged 2 commits intocontainerd:masterfrom
lowenna:jjh/create-data-root-with-permissions

Conversation

@lowenna
Copy link
Copy Markdown

@lowenna lowenna commented Mar 22, 2019

Signed-off-by: John Howard [email protected]

@jterry75 PTAL. This:

  • moves the default root to under programdata rather than program files;
  • creates the root/state directories ACL'd to administrators & localsystem
  • fixes a bug in the recursion of the previously unused mkdirall which wasn't passing the requested adminAndLocalSystem

After this change:

PS C:\programdata> icacls containerd
containerd BUILTIN\Administrators:(OI)(CI)(F)
           NT AUTHORITY\SYSTEM:(OI)(CI)(F)

Successfully processed 1 files; Failed processing 0 files
PS C:\programdata> icacls .\containerd\root\
.\containerd\root\ BUILTIN\Administrators:(OI)(CI)(F)
                   NT AUTHORITY\SYSTEM:(OI)(CI)(F)

Successfully processed 1 files; Failed processing 0 files
PS C:\programdata> icacls .\containerd\state\
.\containerd\state\ BUILTIN\Administrators:(OI)(CI)(F)
                    NT AUTHORITY\SYSTEM:(OI)(CI)(F)

Successfully processed 1 files; Failed processing 0 files
PS C:\programdata>

John Howard added 2 commits March 21, 2019 18:47
jterry75
jterry75 approved these changes Mar 22, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@jterry75 jterry75 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for doing this.

@codecov-io
Copy link
Copy Markdown

codecov-io commented Mar 22, 2019

Codecov Report

Merging #3120 into master will decrease coverage by 3.99%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master    #3120     +/-   ##
=========================================
- Coverage   47.57%   43.58%     -4%     
=========================================
  Files          93      104     +11     
  Lines        8590    11137   +2547     
=========================================
+ Hits         4087     4854    +767     
- Misses       3776     5547   +1771     
- Partials      727      736      +9
Flag Coverage Δ
#linux 47.56% <0%> (-0.02%) ⬇️
#windows 40.47% <0%> (?)
Impacted Files Coverage Δ
sys/filesys_unix.go 0% <0%> (ø) ⬆️
services/server/server.go 1.52% <0%> (-0.34%) ⬇️
snapshots/native/native.go 43.04% <0%> (-9.99%) ⬇️
metadata/snapshot.go 45.8% <0%> (-8.96%) ⬇️
archive/tar.go 43.79% <0%> (-7.07%) ⬇️
metadata/containers.go 47.97% <0%> (-6.62%) ⬇️
content/local/writer.go 57.84% <0%> (-6.36%) ⬇️
content/local/store.go 48.51% <0%> (-5.03%) ⬇️
archive/tar_opts.go 28.57% <0%> (-4.77%) ⬇️
archive/compression/compression.go 58.69% <0%> (-4.7%) ⬇️
... and 63 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ceba568...a849664. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Mar 22, 2019

LGTM

@crosbymichael crosbymichael merged commit 24beaec into containerd:master Mar 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jterry75 jterry75 jterry75 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lowenna @codecov-io @crosbymichael @jterry75