Skip to content

Commit 49ecdec

Browse files
committed
runtimetest: add mounts existence validation
Signed-off-by: liang chenye <[email protected]>
1 parent 89907b6 commit 49ecdec

File tree

9 files changed

+496
-0
lines changed

9 files changed

+496
-0
lines changed

cmd/runtimetest/main.go

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"syscall"
1313

1414
"github.com/Sirupsen/logrus"
15+
"github.com/opencontainers/ocitools/cmd/runtimetest/mount"
1516
rspec "github.com/opencontainers/runtime-spec/specs-go"
1617
"github.com/syndtr/gocapability/capability"
1718
)
@@ -241,6 +242,67 @@ func validateROPaths(spec *rspec.Spec) error {
241242
return fmt.Errorf("%v should be readonly", v)
242243
}
243244
}
245+
246+
return nil
247+
}
248+
249+
func mountMatch(specMount rspec.Mount, sysMount rspec.Mount) error {
250+
if specMount.Destination != sysMount.Destination {
251+
return fmt.Errorf("mount destination expected: %v, actual: %v", specMount.Destination, sysMount.Destination)
252+
}
253+
254+
if specMount.Type != sysMount.Type {
255+
return fmt.Errorf("mount %v type expected: %v, actual: %v", specMount.Destination, specMount.Type, sysMount.Type)
256+
}
257+
258+
if specMount.Source != sysMount.Source {
259+
return fmt.Errorf("mount %v source expected: %v, actual: %v", specMount.Destination, specMount.Source, sysMount.Source)
260+
}
261+
262+
optMap := make(map[string]bool)
263+
for _, opt := range sysMount.Options {
264+
optMap[opt] = true
265+
}
266+
for _, option := range specMount.Options {
267+
if _, ok := optMap[option]; !ok {
268+
return fmt.Errorf("mount %v option %v does not exist", specMount.Destination, option)
269+
}
270+
}
271+
272+
return nil
273+
}
274+
275+
func validateMountsExistence(spec *rspec.Spec) error {
276+
fmt.Println("validating mounts existence")
277+
infos, err := mount.GetMounts()
278+
if err != nil {
279+
return err
280+
}
281+
282+
mountsMap := make(map[string][]rspec.Mount)
283+
for _, info := range infos {
284+
m := rspec.Mount{
285+
Destination: info.Mountpoint,
286+
Type: info.Fstype,
287+
Source: info.Source,
288+
Options: append(strings.Split(info.Opts, ","), strings.Split(info.VfsOpts, ",")...),
289+
}
290+
mountsMap[info.Mountpoint] = append(mountsMap[info.Mountpoint], m)
291+
}
292+
293+
for _, specMount := range spec.Mounts {
294+
found := false
295+
for _, sysMount := range mountsMap[specMount.Destination] {
296+
if err := mountMatch(specMount, sysMount); err == nil {
297+
found = true
298+
break
299+
}
300+
}
301+
if !found {
302+
return fmt.Errorf("Expected mount %v does not exist", specMount)
303+
}
304+
}
305+
244306
return nil
245307
}
246308

@@ -259,6 +321,7 @@ func main() {
259321
validateSysctls,
260322
validateMaskedPaths,
261323
validateROPaths,
324+
validateMountsExistence,
262325
}
263326

264327
for _, v := range validations {

cmd/runtimetest/mount/LICENSE

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
https://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
Copyright 2013-2016 Docker, Inc.
180+
181+
Licensed under the Apache License, Version 2.0 (the "License");
182+
you may not use this file except in compliance with the License.
183+
You may obtain a copy of the License at
184+
185+
https://www.apache.org/licenses/LICENSE-2.0
186+
187+
Unless required by applicable law or agreed to in writing, software
188+
distributed under the License is distributed on an "AS IS" BASIS,
189+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
190+
See the License for the specific language governing permissions and
191+
limitations under the License.

cmd/runtimetest/mount/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Original code
2+
`github.com/docker/docker/pkg/mount`
3+
commit 089166ebe29c1801483965b0e30b41fda53b1ec2
4+
5+
## Changelog
6+
Keep the implementation of `mountinfo*`, remove `flags*` `mounter*` `shared*` files.

cmd/runtimetest/mount/mountinfo.go

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package mount
2+
3+
// Info reveals information about a particular mounted filesystem. This
4+
// struct is populated from the content in the /proc/<pid>/mountinfo file.
5+
type Info struct {
6+
// ID is a unique identifier of the mount (may be reused after umount).
7+
ID int
8+
9+
// Parent indicates the ID of the mount parent (or of self for the top of the
10+
// mount tree).
11+
Parent int
12+
13+
// Major indicates one half of the device ID which identifies the device class.
14+
Major int
15+
16+
// Minor indicates one half of the device ID which identifies a specific
17+
// instance of device.
18+
Minor int
19+
20+
// Root of the mount within the filesystem.
21+
Root string
22+
23+
// Mountpoint indicates the mount point relative to the process's root.
24+
Mountpoint string
25+
26+
// Opts represents mount-specific options.
27+
Opts string
28+
29+
// Optional represents optional fields.
30+
Optional string
31+
32+
// Fstype indicates the type of filesystem, such as EXT3.
33+
Fstype string
34+
35+
// Source indicates filesystem specific information or "none".
36+
Source string
37+
38+
// VfsOpts represents per super block options.
39+
VfsOpts string
40+
}
41+
42+
// GetMounts retrieves a list of mounts for the current running process.
43+
func GetMounts() ([]*Info, error) {
44+
return parseMountTable()
45+
}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package mount
2+
3+
/*
4+
#include <sys/param.h>
5+
#include <sys/ucred.h>
6+
#include <sys/mount.h>
7+
*/
8+
import "C"
9+
10+
import (
11+
"fmt"
12+
"reflect"
13+
"unsafe"
14+
)
15+
16+
// Parse /proc/self/mountinfo because comparing Dev and ino does not work from
17+
// bind mounts.
18+
func parseMountTable() ([]*Info, error) {
19+
var rawEntries *C.struct_statfs
20+
21+
count := int(C.getmntinfo(&rawEntries, C.MNT_WAIT))
22+
if count == 0 {
23+
return nil, fmt.Errorf("Failed to call getmntinfo")
24+
}
25+
26+
var entries []C.struct_statfs
27+
header := (*reflect.SliceHeader)(unsafe.Pointer(&entries))
28+
header.Cap = count
29+
header.Len = count
30+
header.Data = uintptr(unsafe.Pointer(rawEntries))
31+
32+
var out []*Info
33+
for _, entry := range entries {
34+
var mountinfo Info
35+
mountinfo.Mountpoint = C.GoString(&entry.f_mntonname[0])
36+
mountinfo.Source = C.GoString(&entry.f_mntfromname[0])
37+
mountinfo.Fstype = C.GoString(&entry.f_fstypename[0])
38+
out = append(out, &mountinfo)
39+
}
40+
return out, nil
41+
}

0 commit comments

Comments
 (0)