-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Check file access information in conformance tests #5102
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -72,6 +72,14 @@ func testFiles(t *testing.T, clients *test.Clients, paths map[string]types.FileI | |||||
return fmt.Errorf("%s has invalid permissions string %s: %w", path, riFile.Perm, err) | ||||||
} | ||||||
} | ||||||
|
||||||
riFileAccess, ok := ri.Host.FileAccess[path] | ||||||
if ok && riFileAccess.ReadErr != "" { | ||||||
return fmt.Errorf("Want no read errors for file %s, got error: %s", path, riFileAccess.ReadErr) | ||||||
} | ||||||
if ok && riFileAccess.WriteErr != "" { | ||||||
return fmt.Errorf("Want no write errors for file %s, got error: %s", path, riFileAccess.WriteErr) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
} | ||||||
} | ||||||
return nil | ||||||
} | ||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
/* | ||
Copyright 2019 The Knative Authors | ||
|
||
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. | ||
*/ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the copied license is not the correct format. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice catch, we've fixed this now |
||
|
||
package handlers | ||
|
||
import ( | ||
"io/ioutil" | ||
"os" | ||
|
||
"knative.dev/serving/test/types" | ||
) | ||
|
||
type permissionBits uint32 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. https://golang.org/pkg/os/#FileMode should work just as well? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah both FileMode and |
||
|
||
const ( | ||
otherRead permissionBits = 1 << (2 - iota) | ||
otherWrite | ||
) | ||
|
||
func (p permissionBits) hasPermission(mode permissionBits) bool { | ||
return p&mode == mode | ||
} | ||
|
||
func fileAccessAttempt(filePaths ...string) map[string]types.FileAccessInfo { | ||
files := map[string]types.FileAccessInfo{} | ||
for _, path := range filePaths { | ||
accessInfo := types.FileAccessInfo{} | ||
|
||
if err := checkReadable(path); err != nil { | ||
accessInfo.ReadErr = err.Error() | ||
} | ||
|
||
if err := checkWritable(path); err != nil { | ||
accessInfo.WriteErr = err.Error() | ||
} | ||
|
||
files[path] = accessInfo | ||
} | ||
return files | ||
} | ||
|
||
// checkReadable function checks whether path file or directory is readable | ||
func checkReadable(path string) error { | ||
file, err := os.Stat(path) // It should only return error only if file does not exist | ||
if err != nil { | ||
return err | ||
} | ||
|
||
// We aren't expected to be able to read, so just exit | ||
perm := permissionBits(file.Mode().Perm()) | ||
if !perm.hasPermission(otherRead) { | ||
return nil | ||
} | ||
|
||
if file.IsDir() { | ||
_, err := ioutil.ReadDir(path) | ||
return err | ||
} | ||
|
||
readFile, err := os.OpenFile(path, os.O_RDONLY, 0) | ||
if err != nil { | ||
return err | ||
} | ||
return readFile.Close() | ||
} | ||
|
||
// checkWritable function checks whether path file or directory is writable | ||
func checkWritable(path string) error { | ||
file, err := os.Stat(path) // It should only return error only if file does not exist | ||
if err != nil { | ||
return err | ||
} | ||
|
||
// We aren't expected to be able to write, so just exits | ||
perm := permissionBits(file.Mode().Perm()) | ||
if !perm.hasPermission(otherWrite) { | ||
return nil | ||
} | ||
|
||
if file.IsDir() { | ||
writeFile, err := ioutil.TempFile(path, "random") | ||
if writeFile != nil { | ||
os.Remove(writeFile.Name()) | ||
} | ||
return err | ||
} | ||
|
||
writeFile, err := os.OpenFile(path, os.O_APPEND, 0) | ||
shashwathi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if writeFile != nil { | ||
defer writeFile.Close() | ||
} | ||
return err | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.