zerica
/
hugo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modules: Allow absolute paths for project imports 

Fixes #7910
This commit is contained in:
Bjørn Erik Pedersen 2020-10-30 10:14:08 +01:00
parent 332b65e4cc
commit beabc8d998
No known key found for this signature in database
GPG Key ID: 330E6E2BD4859D8F
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/client.go
View File

@ -614,10 +614,19 @@ func (c *Client) shouldVendor(path string) bool {
}
func (c *Client) createThemeDirname(modulePath string, isProjectMod bool) (string, error) {
invalid := errors.Errorf("invalid module path %q; must be relative to themesDir when defined outside of the project", modulePath)
modulePath = filepath.Clean(modulePath)
if filepath.IsAbs(modulePath) {
if isProjectMod {
return modulePath, nil
}
return "", invalid
}
moduleDir := filepath.Join(c.ccfg.ThemesDir, modulePath)
if !isProjectMod && !strings.HasPrefix(moduleDir, c.ccfg.ThemesDir) {
return "", errors.Errorf("invalid module path %q; must be relative to themesDir when defined outside of the project", modulePath)
return "", invalid
}
return moduleDir, nil
}

9
modules/client_test.go
View File

@ -15,6 +15,7 @@ package modules
import (
"bytes"
"fmt"
"os"
"path/filepath"
"testing"
@ -157,6 +158,14 @@ project github.com/gohugoio/hugoTestModules1_darwin/modh2_2_2@v1.3.0+vendor
dirname, err = client.createThemeDirname("../../foo", false)
c.Assert(err, qt.Not(qt.IsNil))
absDir := filepath.Join(client.ccfg.WorkingDir, "..", "..")
dirname, err = client.createThemeDirname(absDir, true)
c.Assert(err, qt.IsNil)
c.Assert(dirname, qt.Equals, absDir)
dirname, err = client.createThemeDirname(absDir, false)
fmt.Println(dirname)
c.Assert(err, qt.Not(qt.IsNil))
})
}