Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: client/internal/common/filesystem_view.go

Issue 2981243002: isolate: (refactor) extract blacklisting into common package (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: client/internal/common/filesystem_view.go
diff --git a/client/internal/common/filesystem_view.go b/client/internal/common/filesystem_view.go
new file mode 100644
index 0000000000000000000000000000000000000000..86c59f1d8a61de39f5c084c74c89df9e0aeb1c67
--- /dev/null
+++ b/client/internal/common/filesystem_view.go
@@ -0,0 +1,80 @@
+// Copyright 2017 The LUCI 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.
+
+package common
+
+import (
+ "fmt"
+ "path/filepath"
+)
+
+// FilesystemView provides a very simple restricted "view" into a filesystem.
mithro 2017/07/19 04:48:41 Maybe just 'FilesystemView provides a filtered "vi
mcgreevy 2017/07/19 05:11:04 Done.
+// It translates absolute paths to relative paths based on its configured root path.
+// It also hides any paths which match a blacklist entry.
+type FilesystemView struct {
+ root string
+ blacklist []string
+}
+
+// NewFilesystemView returns a FilesystemView based on the supplied root and blacklist, or
+// an error if blacklist contains a bad pattern.
+// root is the the base path used by RelativePath to calulate relative paths.
+// blacklist is a list of globs of files to ignore. See RelativePath for more information.
+func NewFilesystemView(root string, blacklist []string) (FilesystemView, error) {
+ for _, b := range blacklist {
+ if _, err := filepath.Match(b, b); err != nil {
+ return FilesystemView{}, fmt.Errorf("bad blacklist pattern \"%s\"", b)
+ }
+ }
+ return FilesystemView{root: root, blacklist: blacklist}, nil
+}
+
+// RelativePath returns a version of path which is relative to the FilesystemView root,
+// or an empty string if path matches a blacklist entry.
mithro 2017/07/19 04:48:41 Why an empty string rather than nil?
mcgreevy 2017/07/19 05:11:04 That would require returning an *string, rather th
mithro 2017/07/19 05:46:18 I can't think of a way that an empty string would
mcgreevy 2017/07/21 04:15:50 I considered all these options (plus returning an
+//
+// Blacklist entries are matched against each of:
+// * the path relative to the FilesystemView root.
+// * the basename return by filepath.Base(path).
mithro 2017/07/19 04:48:41 Is this a full string match or partial? IE would
mcgreevy 2017/07/19 05:11:04 It's full match, but they're not regexes -- they'r
mithro 2017/07/19 05:46:18 Ack - Looks okay. I might change "Blacklist entri
mcgreevy 2017/07/21 04:15:50 I did...
+func (ff FilesystemView) RelativePath(path string) (string, error) {
+ relPath, err := filepath.Rel(ff.root, path)
+ if err != nil {
+ return "", fmt.Errorf("calculating relative path(%q): %v", path, err)
+ }
+ if ff.skipRelPath(relPath) {
+ relPath = ""
+ }
+ return relPath, nil
+}
+
+func (ff FilesystemView) skipRelPath(relPath string) bool {
+ // filepath.Rel is documented to call filepath.Clean on its result before returning it,
+ // which results in "." for an empty relative path.
+ if relPath == "." { // Root directory.
+ return false
+ }
+
+ for _, glob := range ff.blacklist {
+ if match(glob, relPath) || match(glob, filepath.Base(relPath)) {
+ return true
+ }
+ }
+
+ return false
+}
+
+// match is equivalent to filepath.Match, but assumes that pattern is valid.
+func match(pattern, name string) bool {
+ matched, _ := filepath.Match(pattern, name)
+ return matched
+}

Powered by Google App Engine
This is Rietveld 408576698