github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

agnhost: Check symlink target's permissions for Windows

Browse Source 
We're not interested in checking the file permissions of the
symlink itself, but it's target's permissions.
This commit is contained in:
Claudiu Belu 2021-08-27 16:00:47 -07:00
parent ab4aa182a5
commit 14708f23b5
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/images/agnhost/README.md
View File

@ -32,7 +32,7 @@ For example, let's consider the following `pod.yaml` file:
containers:
- args:
- dns-suffix
image: registry.k8s.io/e2e-test-images/agnhost:2.14
image: registry.k8s.io/e2e-test-images/agnhost:2.40
name: agnhost
dnsConfig:
nameservers:
@ -201,7 +201,7 @@ Usage:
```console
guestbook="test/e2e/testing-manifests/guestbook"
sed_expr="s|{{.AgnhostImage}}|registry.k8s.io/e2e-test-images/agnhost:2.14|"
sed_expr="s|{{.AgnhostImage}}|registry.k8s.io/e2e-test-images/agnhost:2.40|"
# create the services.
kubectl create -f ${guestbook}/frontend-service.yaml
@ -306,14 +306,14 @@ Examples:
```console
docker run -i \
registry.k8s.io/e2e-test-images/agnhost:2.29 \
registry.k8s.io/e2e-test-images/agnhost:2.40 \
logs-generator --log-lines-total 10 --run-duration 1s
```
```console
kubectl run logs-generator \
--generator=run-pod/v1 \
--image=registry.k8s.io/e2e-test-images/agnhost:2.29 \
--image=registry.k8s.io/e2e-test-images/agnhost:2.40 \
--restart=Never \
-- logs-generator -t 10 -d 1s
```
@ -492,7 +492,7 @@ Usage:
```console
kubectl run test-agnhost \
--generator=run-pod/v1 \
--image=registry.k8s.io/e2e-test-images/agnhost:2.14 \
--image=registry.k8s.io/e2e-test-images/agnhost:2.40 \
--restart=Never \
--env "POD_IP=<POD_IP>" \
--env "NODE_IP=<NODE_IP>" \
@ -547,7 +547,7 @@ Usage:
```console
kubectl run test-agnhost \
--generator=run-pod/v1 \
--image=registry.k8s.io/e2e-test-images/agnhost:2.21 \
--image=registry.k8s.io/e2e-test-images/agnhost:2.40 \
--restart=Never \
--env "BIND_ADDRESS=localhost" \
--env "BIND_PORT=8080" \
@ -667,6 +667,6 @@ The Windows `agnhost` image includes a `nc` binary that is 100% compliant with i
## Image
The image can be found at `registry.k8s.io/e2e-test-images/agnhost:2.35` for both Linux and
The image can be found at `registry.k8s.io/e2e-test-images/agnhost:2.40` for both Linux and
Windows containers (based on `mcr.microsoft.com/windows/nanoserver:1809`, `mcr.microsoft.com/windows/nanoserver:20H2`, and
`mcr.microsoft.com/windows/nanoserver:ltsc2022`).

2
test/images/agnhost/VERSION
View File

@ -1 +1 @@
2.39
2.40

14
test/images/agnhost/mounttest/mt_utils_windows.go
View File

@ -24,6 +24,7 @@ import (
"fmt"
"os"
"os/exec"
"path/filepath"
"strconv"
"strings"
)
@ -73,11 +74,22 @@ func getFilePerm(path string) (os.FileMode, error) {
errOut bytes.Buffer
)
// NOTE(claudiub): Symlinks have different permissions which might not match the target's.
// We want to evaluate the permissions of the target's not the symlink's.
info, err := os.Lstat(path)
if err == nil && info.Mode()&os.ModeSymlink != 0 {
evaluated, err := filepath.EvalSymlinks(path)
if err != nil {
return 0, err
}
path = evaluated
}
cmd := exec.Command("powershell.exe", "-NonInteractive", "./filePermissions.ps1",
"-FileName", path)
cmd.Stdout = &out
cmd.Stderr = &errOut
err := cmd.Run()
err = cmd.Run()
if err != nil {
fmt.Printf("error from PowerShell Script: %v, %v\n", err, errOut.String())