cmd/go: align checks of module path during initialization.

Fixes #45025.

Change-Id: I70c2b745f764484e4b3a2824adc470f168fb2c50
Reviewed-on: https://go-review.googlesource.com/c/go/+/320310
Trust: Jay Conrod <jayconrod@google.com>
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Jay Conrod <jayconrod@google.com>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Jay Conrod <jayconrod@google.com>
TryBot-Result: Go Bot <gobot@golang.org>

diff --git a/src/cmd/go/internal/modload/init.go b/src/cmd/go/internal/modload/init.go
index e358230e74887112e5459eda6c2d71d50204f97c..df9f48e8ea0511ab45c7e472228c0cc3f5fc09ca 100644 (file)
--- a/src/cmd/go/internal/modload/init.go
+++ b/src/cmd/go/internal/modload/init.go
@@ -432,7 +432,10 @@ func loadModFile(ctx context.Context) (rs *Requirements, needCommit bool) {
        initTarget(f.Module.Mod)
        index = indexModFile(data, f, fixed)
 
-       if err := checkModulePathLax(f.Module.Mod.Path); err != nil {
+       if err := module.CheckImportPath(f.Module.Mod.Path); err != nil {
+               if pathErr, ok := err.(*module.InvalidPathError); ok {
+                       pathErr.Kind = "module"
+               }
                base.Fatalf("go: %v", err)
        }
 
@@ -492,7 +495,15 @@ func CreateModFile(ctx context.Context, modPath string) {
                if err != nil {
                        base.Fatalf("go: %v", err)
                }
-       } else if err := checkModulePathLax(modPath); err != nil {
+       } else if err := module.CheckImportPath(modPath); err != nil {
+               if pathErr, ok := err.(*module.InvalidPathError); ok {
+                       pathErr.Kind = "module"
+                       // Same as build.IsLocalPath()
+                       if pathErr.Path == "." || pathErr.Path == ".." ||
+                               strings.HasPrefix(pathErr.Path, "./") || strings.HasPrefix(pathErr.Path, "../") {
+                               pathErr.Err = errors.New("is a local import path")
+                       }
+               }
                base.Fatalf("go: %v", err)
        }
 
@@ -536,49 +547,6 @@ func CreateModFile(ctx context.Context, modPath string) {
        }
 }
 
-// checkModulePathLax checks that the path meets some minimum requirements
-// to avoid confusing users or the module cache. The requirements are weaker
-// than those of module.CheckPath to allow room for weakening module path
-// requirements in the future, but strong enough to help users avoid significant
-// problems.
-func checkModulePathLax(p string) error {
-       // TODO(matloob): Replace calls of this function in this CL with calls
-       // to module.CheckImportPath once it's been laxened, if it becomes laxened.
-       // See golang.org/issue/29101 for a discussion about whether to make CheckImportPath
-       // more lax or more strict.
-
-       errorf := func(format string, args ...interface{}) error {
-               return fmt.Errorf("invalid module path %q: %s", p, fmt.Sprintf(format, args...))
-       }
-
-       // Disallow shell characters " ' * < > ? ` | to avoid triggering bugs
-       // with file systems and subcommands. Disallow file path separators : and \
-       // because path separators other than / will confuse the module cache.
-       // See fileNameOK in golang.org/x/mod/module/module.go.
-       shellChars := "`" + `"'*<>?|`
-       fsChars := `\:`
-       if i := strings.IndexAny(p, shellChars); i >= 0 {
-               return errorf("contains disallowed shell character %q", p[i])
-       }
-       if i := strings.IndexAny(p, fsChars); i >= 0 {
-               return errorf("contains disallowed path separator character %q", p[i])
-       }
-
-       // Ensure path.IsAbs and build.IsLocalImport are false, and that the path is
-       // invariant under path.Clean, also to avoid confusing the module cache.
-       if path.IsAbs(p) {
-               return errorf("is an absolute path")
-       }
-       if build.IsLocalImport(p) {
-               return errorf("is a local import path")
-       }
-       if path.Clean(p) != p {
-               return errorf("is not clean")
-       }
-
-       return nil
-}
-
 // fixVersion returns a modfile.VersionFixer implemented using the Query function.
 //
 // It resolves commit hashes and branch names to versions,
@@ -918,14 +886,8 @@ func findModulePath(dir string) (string, error) {
                }
                if rel := search.InDir(dir, filepath.Join(gpdir, "src")); rel != "" && rel != "." {
                        path := filepath.ToSlash(rel)
-                       // TODO(matloob): replace this with module.CheckImportPath
-                       // once it's been laxened.
-                       // Only checkModulePathLax here. There are some unpublishable
-                       // module names that are compatible with checkModulePathLax
-                       // but they already work in GOPATH so don't break users
-                       // trying to do a build with modules. gorelease will alert users
-                       // publishing their modules to fix their paths.
-                       if err := checkModulePathLax(path); err != nil {
+                       // gorelease will alert users publishing their modules to fix their paths.
+                       if err := module.CheckImportPath(path); err != nil {
                                badPathErr = err
                                break
                        }

diff --git a/src/cmd/go/testdata/script/mod_init_path.txt b/src/cmd/go/testdata/script/mod_init_path.txt
index ccdfc92317583e96a8176a91daa97c7ab650c784..e5fd4ddbcb92c7d585b1e5b239a6dfc5cfe8089d 100644 (file)
--- a/src/cmd/go/testdata/script/mod_init_path.txt
+++ b/src/cmd/go/testdata/script/mod_init_path.txt
@@ -1,7 +1,7 @@
 env GO111MODULE=on
 
 ! go mod init .
-stderr '^go: invalid module path "\.": is a local import path$'
+stderr '^go: malformed module path ".": is a local import path$'
 
 cd x
 go mod init example.com/x

diff --git a/src/cmd/go/testdata/script/mod_invalid_path.txt b/src/cmd/go/testdata/script/mod_invalid_path.txt
index c8c075daaefe85a1f26cfb1bfaaac0f38bdfe28e..333a3ffa35cba157e6228157414be59a4cb59b92 100644 (file)
--- a/src/cmd/go/testdata/script/mod_invalid_path.txt
+++ b/src/cmd/go/testdata/script/mod_invalid_path.txt
@@ -8,11 +8,8 @@ stderr '^go: no module declaration in go.mod. To specify the module path:\n\tgo
 # Test that go mod init in GOPATH doesn't add a module declaration
 # with a path that can't possibly be a module path, because
 # it isn't even a valid import path.
-# The single quote and backtick are the only characters  we don't allow
-# in checkModulePathLax, but is allowed in a Windows file name.
-# TODO(matloob): choose a different character once
-# module.CheckImportPath is laxened and replaces
-# checkModulePathLax.
+# The single quote and backtick are the only characters which are not allowed
+# but are a valid Windows file name.
 cd $WORK/'gopath/src/m''d'
 ! go mod init
 stderr 'cannot determine module path'
@@ -21,7 +18,7 @@ stderr 'cannot determine module path'
 # possibly be a module path, because it isn't even a valid import path
 cd $WORK/gopath/src/badname
 ! go list .
-stderr 'invalid module path'
+stderr 'malformed module path'
 
 # Test that an import path containing an element with a leading dot is valid,
 # but such a module path is not.