nicolas
/
liche
mirror of https://github.com/nmasse-itix/liche.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix absolute path resolution

renovate/configure
Yota Toyama 8 years ago
parent
883ff06021
commit
cd9d305cdd
3 changed files with 41 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      examples/html.feature
  2. 33
      url_checker.go
  3. 6
      url_checker_test.go

19
examples/html.feature
View File

@ -76,3 +76,22 @@ Feature: HTML
""" """
When I run `liche foo.html` When I run `liche foo.html`
Then the exit status should be 1 Then the exit status should be 1
Scenario: Set document root to a sub directory
Given a directory named "sub"
And a file named "sub/foo.html" with:
"""
<!DOCTYPE html>
<html>
<head>
<title>My title</title>
</head>
<body>
<div>
<a href="/foo.html">Google</a>
</div>
</body>
</html>
"""
When I successfully run `liche --document-root sub sub/foo.html`
Then the stderr should contain exactly ""

33
url_checker.go
View File

@ -5,7 +5,6 @@ import (
"net/url" "net/url"
"os" "os"
"path" "path"
"strings"
"sync" "sync"
"time" "time"
@ -23,7 +22,7 @@ func newURLChecker(t time.Duration, d string, s semaphore) urlChecker {
} }
func (c urlChecker) Check(u string, f string) error { func (c urlChecker) Check(u string, f string) error {
u, err := c.resolveURL(u) u, err := c.resolveURL(u, f)
if err != nil { if err != nil {
return err return err
@ -36,7 +35,8 @@ func (c urlChecker) Check(u string, f string) error {
} }
if uu.Scheme == "" { if uu.Scheme == "" {
return checkRelativePath(u, f) _, err := os.Stat(uu.Path)
return err
} }
c.semaphore.Request() c.semaphore.Request()
@ -67,19 +67,24 @@ func (c urlChecker) CheckMany(us []string, f string, rc chan<- urlResult) {
close(rc) close(rc)
} }
func (c urlChecker) resolveURL(u string) (string, error) { func (c urlChecker) resolveURL(u string, f string) (string, error) {
abs := strings.HasPrefix(u, "/") uu, err := url.Parse(u)
if abs && c.documentRoot != "" { if err != nil {
return path.Join(c.documentRoot, u), nil return "", err
} else if abs {
return "", errors.New("document root directory is not specified")
} }
return u, nil if uu.Scheme != "" {
} return u, nil
}
func checkRelativePath(p string, f string) error { if !path.IsAbs(uu.Path) {
_, err := os.Stat(path.Join(path.Dir(f), p)) return path.Join(path.Dir(f), uu.Path), nil
return err }
if c.documentRoot == "" {
return "", errors.New("document root directory is not specified")
}
return path.Join(c.documentRoot, uu.Path), nil
} }

6
url_checker_test.go
View File

@ -51,7 +51,7 @@ func TestURLCheckerResolveURL(t *testing.T) {
{"foo", "foo"}, {"foo", "foo"},
{"https://google.com", "https://google.com"}, {"https://google.com", "https://google.com"},
} { } {
u, err := f.resolveURL(c.source) u, err := f.resolveURL(c.source, "foo.md")
assert.Equal(t, nil, err) assert.Equal(t, nil, err)
assert.Equal(t, c.target, u) assert.Equal(t, c.target, u)
@ -61,7 +61,7 @@ func TestURLCheckerResolveURL(t *testing.T) {
func TestURLCheckerResolveURLWithAbsolutePath(t *testing.T) { func TestURLCheckerResolveURLWithAbsolutePath(t *testing.T) {
f := newURLChecker(0, "", newSemaphore(1024)) f := newURLChecker(0, "", newSemaphore(1024))
u, err := f.resolveURL("/foo") u, err := f.resolveURL("/foo", "foo.md")
assert.NotEqual(t, nil, err) assert.NotEqual(t, nil, err)
assert.Equal(t, "", u) assert.Equal(t, "", u)
@ -75,7 +75,7 @@ func TestURLCheckerResolveURLWithDocumentRoot(t *testing.T) {
{"https://google.com", "https://google.com"}, {"https://google.com", "https://google.com"},
{"/foo", "foo/foo"}, {"/foo", "foo/foo"},
} { } {
u, err := f.resolveURL(c.source) u, err := f.resolveURL(c.source, "foo.md")
assert.Equal(t, nil, err) assert.Equal(t, nil, err)
assert.Equal(t, c.target, u) assert.Equal(t, c.target, u)

Write Preview
Loading…
Cancel
Save