diff options
| author | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2013-04-22 11:16:54 -0700 |
|---|---|---|
| committer | Jasper Van der Jeugt <jaspervdj@gmail.com> | 2013-04-22 11:16:54 -0700 |
| commit | 79215f71eb501f65d3e74fdda3e592fbcadd9c7e (patch) | |
| tree | 3e2da560d44af4479af4830c516f62d9d27c933f | |
| parent | 0954e893a019ae357fdbd1baa8f4042f82c79a02 (diff) | |
| parent | 63a3000f9cab6446ce40cf6d9671123baee6c22b (diff) | |
| download | hakyll-79215f71eb501f65d3e74fdda3e592fbcadd9c7e.tar.gz | |
Merge pull request #133 from simukis/scheme-relative
Account for scheme-relative URLs
| -rw-r--r-- | src/Hakyll/Check.hs | 10 | ||||
| -rw-r--r-- | src/Hakyll/Web/Html.hs | 2 | ||||
| -rw-r--r-- | tests/Hakyll/Web/Html/Tests.hs | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/Hakyll/Check.hs b/src/Hakyll/Check.hs index 48bb655..68ece18 100644 --- a/src/Hakyll/Check.hs +++ b/src/Hakyll/Check.hs @@ -198,12 +198,14 @@ checkExternalUrl url = do else do isOk <- liftIO $ handle (failure logger) $ Http.withManager $ \mgr -> do - request <- Http.parseUrl url + request <- Http.parseUrl $ urlToCheck url response <- Http.http (settings request) mgr let code = Http.statusCode (Http.responseStatus response) return $ code >= 200 && code < 300 - modify $ S.insert url + modify $ if schemeRelative url + then S.insert (urlToCheck url) . S.insert url + else S.insert url if isOk then ok url else faulty url where -- Add additional request info @@ -221,6 +223,10 @@ checkExternalUrl url = do failure logger (SomeException e) = case cast e of Just UserInterrupt -> throw UserInterrupt _ -> Logger.error logger (show e) >> return False + + -- Check scheme-relative links + schemeRelative = isPrefixOf "//" + urlToCheck uri = if schemeRelative uri then "http:" ++ uri else uri #else checkExternalUrl _ = return () #endif diff --git a/src/Hakyll/Web/Html.hs b/src/Hakyll/Web/Html.hs index 90f963e..58b5c43 100644 --- a/src/Hakyll/Web/Html.hs +++ b/src/Hakyll/Web/Html.hs @@ -120,7 +120,7 @@ toSiteRoot = emptyException . joinPath . map parent -------------------------------------------------------------------------------- -- | Check if an URL links to an external HTTP(S) source isExternal :: String -> Bool -isExternal url = any (flip isPrefixOf url) ["http://", "https://"] +isExternal url = any (flip isPrefixOf url) ["http://", "https://", "//"] -------------------------------------------------------------------------------- diff --git a/tests/Hakyll/Web/Html/Tests.hs b/tests/Hakyll/Web/Html/Tests.hs index 1c17f5c..bfb6b7c 100644 --- a/tests/Hakyll/Web/Html/Tests.hs +++ b/tests/Hakyll/Web/Html/Tests.hs @@ -58,6 +58,7 @@ tests = testGroup "Hakyll.Web.Html.Tests" $ concat , fromAssertions "isExternal" [ assert (isExternal "http://reddit.com") , assert (isExternal "https://mail.google.com") + , assert (isExternal "//ajax.googleapis.com") , assert (not (isExternal "../header.png")) , assert (not (isExternal "/foo/index.html")) ] |