diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,30 @@
+Version 0.12.3 released 09 Oct 2018
+
+ * Change hk-pyg.css to highlighting.css with new CSS for pandoc 2
+ and skylighting 0.7.4. NOTE: You must change your existing
+ custom.css to refer to highlighting.css instead of
+ hk-pyg.css, or highlighted code will not display properly.
+ * Ensure that the proper extensions are used for each format.
+ * Add Ext_emoji to readerExtensions (#616).
+ * Add Paths_gitit to other-modules to avoid warning.
+ * screen.css: remove special padding and border and color for code.
+ This interferes with pandoc's new highlighting.
+ * Fixed static in gitignore
+ * Update stack.yaml, use latest lts-12.
+ * Updates for pandoc 2.x (Myron Wu).
+ * Require skylighting >= 0.7.4.
+ * Remove jsMath as it was dropped from pandoc >= 2 (#617, Myron Wu).
+ * Add Ext_emoji to readerExtensions (#616, Conal Elliott).
+ * Changes to use recent versions of dependencies.
+ Especially feed 1.0, which uses a different xml type
+ and requires a new dependency on xml-conduit to render it.
+ * Remove support for ghc versions < 8 (Myron Wu).
+ * Bump hoauth2 to 1.3.0 && < 1.6 to catch up with nix and other
+ curated package sets (Myron Wu).
+ * Updated mathjax cdn to cloudflare.
+ * Redirect to requested wiki page after github oauth callback (Myron Wu).
+ * Use skylighting instead of deprecated highlighting-kate.
+
Version 0.12.2.1 released 14 Feb 2017
* Bump version bounds for time, pandoc, blaze-html, aeson.
diff --git a/README.markdown b/README.markdown
--- a/README.markdown
+++ b/README.markdown
@@ -307,21 +307,15 @@
Gitit can display TeX math in three different ways, depending on the
setting of `math` in the configuration file:
-1. `mathml` (default): Math will be converted to MathML using
+1. `mathjax` (default): Math will be rendered using the [MathJax] javascript.
+
+2. `mathml`: Math will be converted to MathML using
[texmath]. This method works with IE+mathplayer, Firefox, and
Opera, but not Safari.
-2. `jsMath`: Math will be rendered using the [jsMath] javascript.
- If you want to use this method, download `jsMath` and `jsMath
- Image Fonts` from the [jsMath download page]. You'll have two
- `.zip` archives. Unzip them both in the `static/js` directory (a new
- subdirectory, `jsMath`, will be created). This works with all
- browsers, but is slower and not as nice looking as MathML.
-
3. `raw`: Math will be rendered as raw LaTeX codes.
-[jsMath]: http://www.math.union.edu/~dpvc/jsmath/
-[jsMath download page]: http://sourceforge.net/project/showfiles.php?group_id=172663
+[MathJax]: https://www.mathjax.org/
Restricting access
------------------
diff --git a/data/default.conf b/data/default.conf
--- a/data/default.conf
+++ b/data/default.conf
@@ -72,19 +72,17 @@
math: mathjax
# specifies how LaTeX math is to be displayed. Possible values
-# are MathML, raw, mathjax, jsMath, and google. If mathml is selected,
+# are MathML, raw, mathjax, and google. If mathml is selected,
# gitit will convert LaTeX math to MathML and link in a script,
# MathMLinHTML.js, that allows the MathML to be seen in Gecko browsers, IE +
# mathplayer, and Opera. In other browsers you may get a jumble of characters.
# If raw is selected, the LaTeX math will be displayed as raw LaTeX math.
# If mathjax is selected, gitit will link to the remote mathjax script.
-# If jsMath is selected, gitit will link to the script /js/jsMath/easy/load.js,
-# and will assume that jsMath has been installed into the js/jsMath directory.
-# This is the most portable solution. If google is selected, the google chart
-# API is called to render the formula as an image. This requires a connection
-# to google, and might raise a technical or a privacy problem.
+# If google is selected, the google chart API is called to render the formula
+# as an image. This requires a connection to google, and might raise a
+# technical or a privacy problem.
-mathjax-script: https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML
+mathjax-script: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS_CHTML-full
# specifies the path to MathJax rendering script.
# You might want to use your own MathJax script to render formulas without
# Internet connection or if you want to use some special LaTeX packages.
diff --git a/data/markup.DocBook b/data/markup.DocBook
--- a/data/markup.DocBook
+++ b/data/markup.DocBook
@@ -112,7 +112,7 @@
|
$x = \frac{{ - b \pm \sqrt {b^2 - 4ac} }}{{2a}}$
- If this looks like code, it's because jsMath is not installed on
+ If this looks like code, it's because MathJax is not installed on
your system. Contact your administrator to request it.
diff --git a/data/markup.Markdown b/data/markup.Markdown
--- a/data/markup.Markdown
+++ b/data/markup.Markdown
@@ -63,7 +63,7 @@
|
$x = \frac{{ - b \pm \sqrt {b^2 - 4ac} }}{{2a}}$^[If this looks like
-code, it's because jsMath is
+code, it's because MathJax is
not installed on your system. Contact your administrator to request it.]
|
diff --git a/data/markup.Org b/data/markup.Org
--- a/data/markup.Org
+++ b/data/markup.Org
@@ -350,7 +350,7 @@
To link to a directory listing for a subdirectory, use a trailing slash:
=[Wine/]()= will link to a listing of the =Wine= subdirectory.
-[1] If this looks like code, it's because jsMath is not installed on
+[1] If this looks like code, it's because MathJax is not installed on
your system. Contact your administrator to request it.
[2] Or is it so simple?
diff --git a/data/markup.Textile b/data/markup.Textile
--- a/data/markup.Textile
+++ b/data/markup.Textile
@@ -245,7 +245,7 @@
To link to a directory listing for a subdirectory, use a trailing slash: @[Wine/]()@ will link to a listing of the @Wine@ subdirectory.
-fn1. If this looks like code, it's because jsMath is not installed on your system. Contact your administrator to request it.
+fn1. If this looks like code, it's because MathJax is not installed on your system. Contact your administrator to request it.
fn2. Or is it so simple?
diff --git a/data/static/css/custom.css b/data/static/css/custom.css
--- a/data/static/css/custom.css
+++ b/data/static/css/custom.css
@@ -1,5 +1,5 @@
@import url("screen.css"); /* default gitit screen styles */
-@import url("hk-pyg.css"); /* for syntax highlighting */
+@import url("highlighting.css"); /* for syntax highlighting */
/* Put your custom style modifications here: */
diff --git a/data/static/css/highlighting.css b/data/static/css/highlighting.css
new file mode 100644
--- /dev/null
+++ b/data/static/css/highlighting.css
@@ -0,0 +1,61 @@
+a.sourceLine { display: inline-block; line-height: 1.25; }
+a.sourceLine { pointer-events: none; color: inherit; text-decoration: inherit; }
+a.sourceLine:empty { height: 1.2em; }
+.sourceCode { overflow: visible; }
+code.sourceCode { white-space: pre; position: relative; }
+div.sourceCode { margin: 1em 0; }
+pre.sourceCode { margin: 0; }
+@media screen {
+div.sourceCode { overflow: auto; }
+}
+@media print {
+code.sourceCode { white-space: pre-wrap; }
+a.sourceLine { text-indent: -1em; padding-left: 1em; }
+}
+pre.numberSource a.sourceLine
+ { position: relative; left: -4em; }
+pre.numberSource a.sourceLine::before
+ { content: attr(title);
+ position: relative; left: -1em; text-align: right; vertical-align: baseline;
+ border: none; pointer-events: all; display: inline-block;
+ -webkit-touch-callout: none; -webkit-user-select: none;
+ -khtml-user-select: none; -moz-user-select: none;
+ -ms-user-select: none; user-select: none;
+ padding: 0 4px; width: 4em;
+ color: #aaaaaa;
+ }
+pre.numberSource { margin-left: 3em; border-left: 1px solid #aaaaaa; padding-left: 4px; }
+div.sourceCode
+ { }
+@media screen {
+a.sourceLine::before { text-decoration: underline; }
+}
+code span.al { color: #ff0000; font-weight: bold; } /* Alert */
+code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+code span.at { color: #7d9029; } /* Attribute */
+code span.bn { color: #40a070; } /* BaseN */
+code span.bu { } /* BuiltIn */
+code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+code span.ch { color: #4070a0; } /* Char */
+code span.cn { color: #880000; } /* Constant */
+code span.co { color: #60a0b0; font-style: italic; } /* Comment */
+code span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */
+code span.do { color: #ba2121; font-style: italic; } /* Documentation */
+code span.dt { color: #902000; } /* DataType */
+code span.dv { color: #40a070; } /* DecVal */
+code span.er { color: #ff0000; font-weight: bold; } /* Error */
+code span.ex { } /* Extension */
+code span.fl { color: #40a070; } /* Float */
+code span.fu { color: #06287e; } /* Function */
+code span.im { } /* Import */
+code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+code span.op { color: #666666; } /* Operator */
+code span.ot { color: #007020; } /* Other */
+code span.pp { color: #bc7a00; } /* Preprocessor */
+code span.sc { color: #4070a0; } /* SpecialChar */
+code span.ss { color: #bb6688; } /* SpecialString */
+code span.st { color: #4070a0; } /* String */
+code span.va { color: #19177c; } /* Variable */
+code span.vs { color: #4070a0; } /* VerbatimString */
+code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
diff --git a/data/static/css/hk-pyg.css b/data/static/css/hk-pyg.css
deleted file mode 100644
--- a/data/static/css/hk-pyg.css
+++ /dev/null
@@ -1,17 +0,0 @@
-table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
- margin: 0; padding: 0; vertical-align: baseline; border: none; }
-table.sourceCode { width: 100%; }
-td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; color: #aaaaaa; border-right: 1px solid #aaaaaa; }
-td.sourceCode { padding-left: 5px; }
-code > span.kw { color: #007020; font-weight: bold; }
-code > span.dt { color: #902000; }
-code > span.dv { color: #40a070; }
-code > span.bn { color: #40a070; }
-code > span.fl { color: #40a070; }
-code > span.ch { color: #4070a0; }
-code > span.st { color: #4070a0; }
-code > span.co { color: #60a0b0; font-style: italic; }
-code > span.ot { color: #007020; }
-code > span.al { color: #ff0000; font-weight: bold; }
-code > span.fu { color: #06287e; }
-code > span.er { color: #ff0000; font-weight: bold; }
diff --git a/data/static/css/screen.css b/data/static/css/screen.css
--- a/data/static/css/screen.css
+++ b/data/static/css/screen.css
@@ -106,8 +106,7 @@
.search_result { margin-bottom: 15px; }
.search_result .match { margin-bottom: 15px; }
-pre>code { display: block; padding: 0.7em 1em; }
-code { font-size: 93%; background-color: #f8f8f8; border: 1px solid #ddd; overflow: auto; border-radius: 0.2em; }
+pre>code { display: block; }
pre.matches { margin: 0; padding: 0; }
#pattern { background-color: yellow; font-weight: bold; }
pre.matches span.highlighted { background-color: yellow; }
diff --git a/data/static/js/preview.js b/data/static/js/preview.js
--- a/data/static/js/preview.js
+++ b/data/static/js/preview.js
@@ -8,8 +8,6 @@
$('#previewpane').html(data);
// Process any mathematics if we're using MathML
if (typeof(convert) == 'function') { convert(); }
- // Process any mathematics if we're using jsMath
- if (typeof(jsMath) == 'object') { jsMath.ProcessBeforeShowing(); }
// Process any mathematics if we're using MathJax
if (typeof(window.MathJax) == 'object') {
// http://docs.mathjax.org/en/latest/typeset.html
diff --git a/gitit.cabal b/gitit.cabal
--- a/gitit.cabal
+++ b/gitit.cabal
@@ -1,5 +1,5 @@
name: gitit
-version: 0.12.2.1
+version: 0.12.3
Cabal-version: >= 1.8
build-type: Simple
synopsis: Wiki using happstack, git or darcs, and pandoc.
@@ -49,7 +49,7 @@
data/static/js/jquery-ui.draggable-1.6rc2.js
data/static/js/jquery-ui.tabs-1.6rc2.js
data-files: data/static/css/screen.css, data/static/css/print.css,
- data/static/css/ie.css, data/static/css/hk-pyg.css,
+ data/static/css/ie.css, data/static/css/highlighting.css,
data/static/css/reset-fonts-grids.css,
data/static/css/custom.css,
data/static/img/logo.png, data/static/img/icons/feed.png,
@@ -122,12 +122,14 @@
Network.Gitit.Authentication.Github,
Network.Gitit.Util, Network.Gitit.Server
Network.Gitit.Cache, Network.Gitit.State,
- Paths_gitit, Network.Gitit.Export,
+ Network.Gitit.Export,
Network.Gitit.Handlers,
Network.Gitit.Plugins, Network.Gitit.Rpxnow,
Network.Gitit.Page, Network.Gitit.Feed,
- Network.Gitit.Compat.Except
- build-depends: base >= 3 && < 5,
+ Network.Gitit.Compat.Except,
+ Paths_gitit
+ build-depends: base >= 4.9 && < 5,
+ syb,
filepath,
safe,
parsec,
@@ -139,9 +141,9 @@
directory,
mtl,
old-time,
- pandoc >= 1.12.4 && < 1.20,
- pandoc-types >= 1.12.3 && < 1.18,
- highlighting-kate >= 0.5.0.1 && < 0.7,
+ pandoc >= 2.2,
+ pandoc-types >= 1.17.4.2 && < 1.18,
+ skylighting >= 0.7.4 && < 0.8,
bytestring,
text,
random,
@@ -150,30 +152,30 @@
HTTP >= 4000.0 && < 4000.4,
HStringTemplate >= 0.6 && < 0.9,
old-locale >= 1,
- time >= 1.1 && < 1.8,
+ time >= 1.1 && < 1.10,
recaptcha >= 0.1,
filestore >= 0.6 && < 0.7,
zlib >= 0.5 && < 0.7,
url >= 2.1 && < 2.2,
- happstack-server >= 7.0 && < 7.5,
+ happstack-server >= 7.0 && < 7.6,
base64-bytestring >= 0.1 && < 1.1,
xml >= 1.3.5,
hslogger >= 1 && < 1.3,
ConfigFile >= 1 && < 1.2,
- feed >= 0.3.6 && < 0.4,
+ feed >= 1.0 && < 1.1,
xss-sanitize >= 0.3 && < 0.4,
tagsoup >= 0.13 && < 0.15,
blaze-html >= 0.4 && < 0.10,
json >= 0.4 && < 0.10,
uri >= 0.1 && < 0.2,
+ uri-bytestring >= 0.2.3.3 && <= 0.4,
split,
- hoauth2 >= 0.4.2 && < 0.6,
- http-conduit >= 2.1.4 && < 2.3,
+ hoauth2 >= 1.3.0 && < 1.8,
+ xml-conduit >= 1.5 && < 1.9,
+ http-conduit >= 2.1.6 && < 2.4,
http-client-tls >= 0.2.2 && < 0.4,
- aeson >= 0.7 && < 1.2,
+ aeson >= 0.7 && < 1.5,
uuid >= 1.3 && < 1.4
- if impl(ghc >= 6.10)
- build-depends: base >= 4, syb
if flag(network-uri)
build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6
else
@@ -183,10 +185,7 @@
build-depends: ghc, ghc-paths
cpp-options: -D_PLUGINS
extensions: CPP
- if impl(ghc >= 6.12)
- ghc-options: -Wall -fno-warn-unused-do-bind
- else
- ghc-options: -Wall
+ ghc-options: -Wall -fno-warn-unused-do-bind
ghc-prof-options: -fprof-auto-exported
Executable gitit
@@ -197,28 +196,25 @@
mtl,
hslogger,
bytestring,
+ text,
utf8-string,
directory
+ other-modules: Paths_gitit
if flag(network-uri)
build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6
else
build-depends: network >= 2 && < 2.6
extensions: CPP
- if impl(ghc >= 6.12)
- ghc-options: -Wall -threaded -fno-warn-unused-do-bind
- else
- ghc-options: -Wall -threaded
+ ghc-options: -Wall -threaded -fno-warn-unused-do-bind
ghc-prof-options: -fprof-auto-exported -rtsopts
Executable expireGititCache
hs-source-dirs: .
main-is: expireGititCache.hs
- build-depends: base >=3 && < 5, HTTP, url, filepath
+ build-depends: base >= 4.9 && < 5, HTTP, url, filepath, syb
if flag(network-uri)
build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6
else
build-depends: network >= 2 && < 2.6
- if impl(ghc >= 6.10)
- build-depends: base >= 4, syb
ghc-options: -Wall
diff --git a/gitit.hs b/gitit.hs
--- a/gitit.hs
+++ b/gitit.hs
@@ -24,6 +24,7 @@
import Network.Gitit.Util (readFileUTF8)
import System.Directory
import Data.Maybe (isNothing)
+import Data.Text.Encoding (encodeUtf8)
import Network.Gitit.Compat.Except()
import Control.Monad.Reader
import System.Log.Logger (Priority(..), setLevel, setHandlers,
@@ -54,7 +55,7 @@
putErr ExitSuccess (progname ++ " version " ++
showVersion version ++ compileInfo ++ copyrightMessage)
Left PrintDefaultConfig -> getDataFileName "data/default.conf" >>=
- readFileUTF8 >>= B.putStrLn . fromString >> exitSuccess
+ readFileUTF8 >>= B.putStrLn . encodeUtf8 >> exitSuccess
Right xs -> return xs
conf' <- case [f | ConfigFile f <- opts] of
@@ -96,7 +97,7 @@
sock <- socket AF_INET Stream defaultProtocol
setSocketOption sock ReuseAddr 1
device <- inet_addr (address conf)
- bindSocket sock (SockAddrInet (toEnum (portNumber conf)) device)
+ bind sock (SockAddrInet (toEnum (portNumber conf)) device)
listen sock 10
-- start the server
diff --git a/src/Network/Gitit/Authentication.hs b/src/Network/Gitit/Authentication.hs
--- a/src/Network/Gitit/Authentication.hs
+++ b/src/Network/Gitit/Authentication.hs
@@ -446,13 +446,12 @@
withData $ \(sk :: Maybe SessionKey) ->
do
mbSd <- maybe (return Nothing) getSession sk
- mbGititState <- case mbSd of
- Nothing -> return Nothing
- Just sd -> return $ sessionGithubState sd
- let gititState = fromMaybe (error "No Github state found in session (is it the same domain?)") mbGititState
+ let mbGititState = mbSd >>= sessionGithubData
+ githubData = fromMaybe (error "No Github state found in session (is it the same domain?)") mbGititState
+ gititState = sessionGithubState githubData
+ destination = sessionGithubDestination githubData
mUser <- getGithubUser ghConfig githubCallbackPars gititState
base' <- getWikiBase
- let destination = base' ++ "/"
case mUser of
Right user -> do
let userEmail = uEmail user
@@ -475,7 +474,7 @@
-> [Handler]
githubAuthHandlers ghConfig =
[ dir "_logout" $ withData logoutUser
- , dir "_login" $ loginGithubUser $ oAuth2 ghConfig
+ , dir "_login" $ withData $ loginGithubUser $ oAuth2 ghConfig
, dir "_loginFailure" $ githubLoginFailure
, dir "_githubCallback" $ withData $ oauthGithubCallback ghConfig
, dir "_user" currentUser ]
diff --git a/src/Network/Gitit/Authentication/Github.hs b/src/Network/Gitit/Authentication/Github.hs
--- a/src/Network/Gitit/Authentication/Github.hs
+++ b/src/Network/Gitit/Authentication/Github.hs
@@ -10,11 +10,14 @@
import Network.Gitit.Types
import Network.Gitit.Server
import Network.Gitit.State
+import Network.Gitit.Util
+import Network.Gitit.Framework
import qualified Data.ByteString.Char8 as BS
import qualified Data.ByteString.Lazy as BSL
+import qualified URI.ByteString as URI
import Network.HTTP.Conduit
-import Network.HTTP.Client.TLS
import Network.OAuth.OAuth2
+import Network.OAuth.OAuth2.TokenRequest as OA
import Control.Monad (liftM, mplus, mzero)
import Data.Maybe
import Data.Aeson
@@ -27,16 +30,18 @@
import qualified Control.Exception as E
import Prelude
-loginGithubUser :: OAuth2 -> Handler
-loginGithubUser githubKey = do
+loginGithubUser :: OAuth2 -> Params -> Handler
+loginGithubUser githubKey params = do
state <- liftIO $ fmap toString nextRandom
- key <- newSession (sessionDataGithubState state)
+ base' <- getWikiBase
+ let destination = pDestination params `orIfNull` (base' ++ "/")
+ key <- newSession $ sessionDataGithubStateUrl state destination
cfg <- getConfig
addCookie (MaxAge $ sessionTimeout cfg) (mkCookie "sid" (show key))
let usingOrg = isJust $ org $ githubAuth cfg
let scopes = "user:email" ++ if usingOrg then ",read:org" else ""
- let url = authorizationUrl githubKey `appendQueryParam` [("state", BS.pack state), ("scope", BS.pack scopes)]
- seeOther (BS.unpack url) $ toResponse ("redirecting to github" :: String)
+ let url = appendQueryParams [("state", BS.pack state), ("scope", BS.pack scopes)] $ authorizationUrl githubKey
+ seeOther (BS.unpack (URI.serializeURIRef' url)) $ toResponse ("redirecting to github" :: String)
data GithubLoginError = GithubLoginError { ghUserMessage :: String
, ghDetails :: Maybe String
@@ -46,8 +51,8 @@
-> GithubCallbackPars -- ^ Authentication code gained after authorization
-> String -- ^ Github state, we expect the state we sent in loginGithubUser
-> GititServerPart (Either GithubLoginError User) -- ^ user email and name (password 'none')
-getGithubUser ghConfig githubCallbackPars githubState =
- withManagerSettings tlsManagerSettings getUserInternal
+getGithubUser ghConfig githubCallbackPars githubState = liftIO $
+ newManager tlsManagerSettings >>= getUserInternal
where
getUserInternal mgr =
liftIO $ do
@@ -57,13 +62,13 @@
let (Just code) = rCode githubCallbackPars
ifSuccess
"No access token found yet"
- (fetchAccessToken mgr (oAuth2 ghConfig) (sToBS code))
+ (fetchAccessToken mgr (oAuth2 ghConfig) (ExchangeToken $ pack code))
(\at -> ifSuccess
"User Authentication failed"
- (userInfo mgr at)
+ (userInfo mgr (accessToken at))
(\githubUser -> ifSuccess
("No email for user " ++ unpack (gLogin githubUser) ++ " returned by Github")
- (mailInfo mgr at)
+ (mailInfo mgr (accessToken at))
(\githubUserMail -> do
let gitLogin = gLogin githubUser
user <- mkUser (unpack gitLogin)
@@ -74,7 +79,7 @@
Nothing -> return $ Right user
Just githuborg -> ifSuccess
("Membership check failed: the user " ++ unpack gitLogin ++ " is required to be a member of the organization " ++ unpack githuborg ++ ".")
- (orgInfo gitLogin githuborg mgr at)
+ (orgInfo gitLogin githuborg mgr (accessToken at))
(\_ -> return $ Right user))))
else
return $ Left $
@@ -97,17 +102,26 @@
vState <- liftM Just (look "state") `mplus` return Nothing
return GithubCallbackPars {rCode = vCode, rState = vState}
-userInfo :: Manager -> AccessToken -> IO (OAuth2Result GithubUser)
-userInfo mgr token = authGetJSON mgr token "https://api.github.com/user"
+userInfo :: Manager -> AccessToken -> IO (OAuth2Result OA.Errors GithubUser)
+userInfo mgr token = authGetJSON mgr token $ githubUri "/user"
-mailInfo :: Manager -> AccessToken -> IO (OAuth2Result [GithubUserMail])
-mailInfo mgr token = authGetJSON mgr token "https://api.github.com/user/emails"
+mailInfo :: Manager -> AccessToken -> IO (OAuth2Result OA.Errors [GithubUserMail])
+mailInfo mgr token = authGetJSON mgr token $ githubUri "/user/emails"
-orgInfo :: Text -> Text -> Manager -> AccessToken -> IO (OAuth2Result BSL.ByteString)
+orgInfo :: Text -> Text -> Manager -> AccessToken -> IO (OAuth2Result OA.Errors BSL.ByteString)
orgInfo gitLogin githubOrg mgr token = do
- let url = "https://api.github.com/orgs/" `BS.append` encodeUtf8 githubOrg `BS.append` "/members/" `BS.append` encodeUtf8 gitLogin
+ let url = githubUri $ "/orgs/" `BS.append` encodeUtf8 githubOrg `BS.append` "/members/" `BS.append` encodeUtf8 gitLogin
authGetBS mgr token url
+type UriPath = BS.ByteString
+
+githubUri :: UriPath -> URI.URI
+githubUri p = URI.URI { URI.uriScheme = URI.Scheme "https"
+ , URI.uriAuthority = Just $ URI.Authority Nothing (URI.Host "api.github.com") Nothing
+ , URI.uriPath = p
+ , URI.uriQuery = URI.Query []
+ , URI.uriFragment = Nothing }
+
data GithubUser = GithubUser { gLogin :: Text
} deriving (Show, Eq)
@@ -125,6 +139,3 @@
<$> o .: "email"
<*> o .: "primary"
parseJSON _ = mzero
-
-sToBS :: String -> BS.ByteString
-sToBS = encodeUtf8 . pack
diff --git a/src/Network/Gitit/Config.hs b/src/Network/Gitit/Config.hs
--- a/src/Network/Gitit/Config.hs
+++ b/src/Network/Gitit/Config.hs
@@ -35,24 +35,20 @@
import Data.ConfigFile hiding (readfile)
import Data.List (intercalate)
import Data.Char (toLower, toUpper, isDigit)
-import Data.Text (pack)
+import qualified Data.Text as T
import Paths_gitit (getDataFileName)
import System.FilePath (())
-import Text.Pandoc hiding (MathML, WebTeX, MathJax)
+import Text.Pandoc hiding (ERROR, WARNING, MathJax, MathML, WebTeX, getDataFileName)
import qualified Control.Exception as E
-import Network.OAuth.OAuth2
+import Network.OAuth.OAuth2 (OAuth2(..), oauthCallback, oauthOAuthorizeEndpoint, oauthClientId, oauthClientSecret)
+import URI.ByteString (parseURI, laxURIParserOptions)
import qualified Data.ByteString.Char8 as BS
import Network.Gitit.Compat.Except
import Control.Monad
import Control.Monad.Trans
-
-#if MIN_VERSION_pandoc(1,14,0)
import Text.Pandoc.Error (handleError)
-#else
-handleError :: Pandoc -> Pandoc
-handleError = id
-#endif
+
forceEither :: Show e => Either e a -> a
forceEither = either (error . show) id
@@ -83,7 +79,7 @@
-> IO (m ConfigParser)
readfile cp path' = do
contents <- readFileUTF8 path'
- return $ readstring cp contents
+ return $ readstring cp $ T.unpack contents
extractConfig :: ConfigParser -> IO Config
extractConfig cp = do
@@ -141,9 +137,10 @@
let (pt, lhs) = parsePageType cfDefaultPageType
let markupHelpFile = show pt ++ if lhs then "+LHS" else ""
markupHelpPath <- liftIO $ getDataFileName $ "data" "markupHelp" markupHelpFile
- markupHelpText <- liftM (writeHtmlString def . handleError .
- readMarkdown def) $
- liftIO $ readFileUTF8 markupHelpPath
+ markupHelp' <- liftIO $ readFileUTF8 markupHelpPath
+ markupHelpText <- liftIO $ handleError $ runPure $ do
+ helpDoc <- readMarkdown def{ readerExtensions = getDefaultExtensions "markdown" } markupHelp'
+ writeHtml5String def helpDoc
mimeMap' <- liftIO $ readMimeTypesFile cfMimeTypesFile
let authMethod = map toLower cfAuthenticationMethod
@@ -166,7 +163,6 @@
, defaultPageType = pt
, defaultExtension = cfDefaultExtension
, mathMethod = case map toLower cfMathMethod of
- "jsmath" -> JsMathScript
"mathml" -> MathML
"mathjax" -> MathJax cfMathjaxScript
"google" -> WebTeX "http://chart.apis.google.com/chart?cht=tx&chl="
@@ -253,21 +249,28 @@
extractGithubConfig cp = do
cfOauthClientId <- getGithubProp "oauthClientId"
cfOauthClientSecret <- getGithubProp "oauthClientSecret"
- cfOauthCallback <- getGithubProp "oauthCallback"
- cfOauthOAuthorizeEndpoint <- getGithubProp "oauthOAuthorizeEndpoint"
- cfOauthAccessTokenEndpoint <- getGithubProp "oauthAccessTokenEndpoint"
+ cfOauthCallback <- getUrlProp "oauthCallback"
+ cfOauthOAuthorizeEndpoint <- getUrlProp "oauthOAuthorizeEndpoint"
+ cfOauthAccessTokenEndpoint <- getUrlProp "oauthAccessTokenEndpoint"
cfOrg <- if hasGithubProp "github-org"
then fmap Just (getGithubProp "github-org")
else return Nothing
- let cfgOAuth2 = OAuth2 { oauthClientId = BS.pack cfOauthClientId
- , oauthClientSecret = BS.pack cfOauthClientSecret
- , oauthCallback = Just $ BS.pack cfOauthCallback
- , oauthOAuthorizeEndpoint = BS.pack cfOauthOAuthorizeEndpoint
- , oauthAccessTokenEndpoint = BS.pack cfOauthAccessTokenEndpoint
+ let cfgOAuth2 = OAuth2 { oauthClientId = T.pack cfOauthClientId
+ , oauthClientSecret = T.pack cfOauthClientSecret
+ , oauthCallback = Just cfOauthCallback
+ , oauthOAuthorizeEndpoint = cfOauthOAuthorizeEndpoint
+ , oauthAccessTokenEndpoint = cfOauthAccessTokenEndpoint
}
- return $ githubConfig cfgOAuth2 $ fmap pack cfOrg
+ return $ githubConfig cfgOAuth2 $ fmap T.pack cfOrg
where getGithubProp = get cp "Github"
hasGithubProp = has_option cp "Github"
+ getUrlProp prop = getGithubProp prop >>= \s ->
+ case parseURI laxURIParserOptions (BS.pack s) of
+ Left e -> throwError (ParseError $ "couldn't parse url " ++ s
+ ++ " from (Github/" ++ prop ++ "): "
+ ++ (show e)
+ , "getUrlProp")
+ Right uri -> return uri
fromQuotedMultiline :: String -> String
fromQuotedMultiline = unlines . map doline . lines . dropWhile (`elem` " \t\n")
@@ -315,7 +318,7 @@
-- extensions, separated by spaces. Example: text/plain txt text
readMimeTypesFile :: FilePath -> IO (M.Map String String)
readMimeTypesFile f = E.catch
- (liftM (foldr (go . words) M.empty . lines) $ readFileUTF8 f)
+ (liftM (foldr (go . words) M.empty . lines . T.unpack) $ readFileUTF8 f)
handleMimeTypesFileNotFound
where go [] m = m -- skip blank lines
go (x:xs) m = foldr (`M.insert` x) m xs
diff --git a/src/Network/Gitit/ContentTransformer.hs b/src/Network/Gitit/ContentTransformer.hs
--- a/src/Network/Gitit/ContentTransformer.hs
+++ b/src/Network/Gitit/ContentTransformer.hs
@@ -73,8 +73,10 @@
import Control.Monad.State
import Control.Monad.Reader (ask)
import Data.Foldable (traverse_)
+import Data.Char (toLower)
import Data.List (stripPrefix)
import Data.Maybe (isNothing, mapMaybe)
+import Data.Semigroup ((<>))
import Network.Gitit.Cache (lookupCache, cacheContents)
import Network.Gitit.Export (exportFormats)
import Network.Gitit.Framework hiding (uriPath)
@@ -83,13 +85,15 @@
import Network.Gitit.Server
import Network.Gitit.State
import Network.Gitit.Types
+import Network.Gitit.Util (getPageTypeDefaultExtensions)
import Network.HTTP (urlDecode)
import Network.URI (isUnescapedInURI)
import Network.URL (encString)
import System.FilePath
import qualified Text.Pandoc.Builder as B
+import Text.Pandoc.Extensions (getDefaultExtensions)
import Text.HTML.SanitizeXSS (sanitizeBalance)
-import Text.Highlighting.Kate
+import Skylighting hiding (Context)
import Text.Pandoc hiding (MathML, WebTeX, MathJax)
import Text.XHtml hiding ( (), dir, method, password, rev )
import Text.XHtml.Strict (stringToHtmlString)
@@ -99,7 +103,6 @@
import Text.Blaze.Renderer.String as Blaze ( renderHtml )
#endif
import qualified Data.Text as T
-import qualified Data.Set as Set
import qualified Data.ByteString as S (concat)
import qualified Data.ByteString.Char8 as SC (unpack)
import qualified Data.ByteString.Lazy as L (toChunks, fromChunks)
@@ -107,12 +110,6 @@
import qualified Text.Pandoc as Pandoc
import Text.URI (parseURI, URI(..), uriQueryItems)
-#if MIN_VERSION_pandoc(1,14,0)
-import Text.Pandoc.Error (handleError)
-#else
-handleError :: Pandoc -> Pandoc
-handleError = id
-#endif
--
-- ContentTransformer runners
--
@@ -362,7 +359,7 @@
modifyContext $ \ctx -> ctx{ ctxTOC = pageTOC page'
, ctxCategories = pageCategories page'
, ctxMeta = pageMeta page' }
- return $ readerFor (pageFormat page') (pageLHS page') (pageText page')
+ either (liftIO . E.throwIO) return $ readerFor (pageFormat page') (pageLHS page') (pageText page')
-- | Detects if the page is a redirect page and handles accordingly. The exact
-- behaviour is as follows:
@@ -525,32 +522,24 @@
-- | Converts pandoc document to HTML.
pandocToHtml :: Pandoc -> ContentTransformer Html
pandocToHtml pandocContents = do
- base' <- lift getWikiBase
toc <- liftM ctxTOC get
bird <- liftM ctxBirdTracks get
cfg <- lift getConfig
let tpl = "$if(toc)$\n$toc$\n
\n$endif$\n$body$"
return $ primHtml $ T.unpack .
- (if xssSanitize cfg then sanitizeBalance else id) . T.pack $
- writeHtmlString def{
-#if MIN_VERSION_pandoc(1,19,0)
+ (if xssSanitize cfg then sanitizeBalance else id) $
+ either E.throw id . runPure $ writeHtml5String def{
writerTemplate = Just tpl
-#else
- writerStandalone = True
- , writerTemplate = tpl
-#endif
, writerHTMLMathMethod =
case mathMethod cfg of
- MathML -> Pandoc.MathML Nothing
+ MathML -> Pandoc.MathML
WebTeX u -> Pandoc.WebTeX u
MathJax u -> Pandoc.MathJax u
- _ -> JsMath (Just $ base' ++
- "/js/jsMath/easy/load.js")
+ RawTeX -> Pandoc.PlainMath
, writerTableOfContents = toc
- , writerHighlight = True
+ , writerHighlightStyle = Just pygments
, writerExtensions = if bird
- then Set.insert
- Ext_literate_haskell
+ then enableExtension Ext_literate_haskell
$ writerExtensions def
else writerExtensions def
-- note: javascript obfuscation gives problems on preview
@@ -563,11 +552,15 @@
highlightSource (Just source) = do
file <- getFileName
let formatOpts = defaultFormatOpts { numberLines = True, lineAnchors = True }
- case languagesByExtension $ takeExtension file of
+ case syntaxesByFilename defaultSyntaxMap file of
[] -> mzero
- (l:_) -> return $ primHtml $ Blaze.renderHtml
- $ formatHtmlBlock formatOpts
- $! highlightAs l $ filter (/='\r') source
+ (l:_) -> case tokenize TokenizerConfig{
+ syntaxMap = defaultSyntaxMap
+ , traceOutput = False} l
+ $ T.pack $ filter (/='\r') source of
+ Left e -> fail (show e)
+ Right r -> return $ primHtml $ Blaze.renderHtml
+ $ formatHtmlBlock formatOpts r
--
-- Plugin combinators
@@ -651,7 +644,6 @@
conf <- lift getConfig
updateLayout $ \l ->
case mathMethod conf of
- JsMathScript -> addScripts l ["jsMath/easy/load.js"]
MathML -> addScripts l ["MathMLinHTML.js"]
WebTeX _ -> l
MathJax u -> addScripts l [u]
@@ -693,29 +685,23 @@
-- Pandoc and wiki content conversion support
--
-readerFor :: PageType -> Bool -> String -> Pandoc
+readerFor :: PageType -> Bool -> String -> Either PandocError Pandoc
readerFor pt lhs =
- let defPS = def{ readerSmart = True
- , readerExtensions = if lhs
- then Set.insert Ext_literate_haskell
- $ readerExtensions def
- else readerExtensions def
- , readerParseRaw = True
- }
- in handleError . case pt of
+ let defExts = getDefaultExtensions $ map toLower $ show pt
+ defPS = def{ readerExtensions = defExts
+ <> extensionsFromList [Ext_emoji]
+ <> getPageTypeDefaultExtensions pt lhs
+ <> readerExtensions def }
+ in runPure . (case pt of
RST -> readRST defPS
Markdown -> readMarkdown defPS
-#if MIN_VERSION_pandoc(1,14,0)
CommonMark -> readCommonMark defPS
-#else
- CommonMark -> error "CommonMark input requires pandoc 1.14"
-#endif
LaTeX -> readLaTeX defPS
HTML -> readHtml defPS
Textile -> readTextile defPS
Org -> readOrg defPS
DocBook -> readDocBook defPS
- MediaWiki -> readMediaWiki defPS
+ MediaWiki -> readMediaWiki defPS) . T.pack
wikiLinksTransform :: Pandoc -> PluginM Pandoc
wikiLinksTransform pandoc
@@ -724,17 +710,10 @@
-- | Convert links with no URL to wikilinks.
convertWikiLinks :: Config -> Inline -> Inline
-#if MIN_VERSION_pandoc(1,16,0)
convertWikiLinks cfg (Link attr ref ("", "")) | useAbsoluteUrls cfg =
Link attr ref ("/" baseUrl cfg inlinesToURL ref, "Go to wiki page")
convertWikiLinks _cfg (Link attr ref ("", "")) =
Link attr ref (inlinesToURL ref, "Go to wiki page")
-#else
-convertWikiLinks cfg (Link ref ("", "")) | useAbsoluteUrls cfg =
- Link ref ("/" baseUrl cfg inlinesToURL ref, "Go to wiki page")
-convertWikiLinks _cfg (Link ref ("", "")) =
- Link ref (inlinesToURL ref, "Go to wiki page")
-#endif
convertWikiLinks _cfg x = x
-- | Derives a URL from a list of Pandoc Inline elements.
@@ -757,21 +736,14 @@
Cite _ xs -> concatMap go xs
Code _ s -> s
Space -> " "
-#if MIN_VERSION_pandoc(1,16,0)
SoftBreak -> " "
-#endif
LineBreak -> " "
Math DisplayMath s -> "$$" ++ s ++ "$$"
Math InlineMath s -> "$" ++ s ++ "$"
RawInline (Format "tex") s -> s
RawInline _ _ -> ""
-#if MIN_VERSION_pandoc(1,16,0)
Link _ xs _ -> concatMap go xs
Image _ xs _ -> concatMap go xs
-#else
- Link xs _ -> concatMap go xs
- Image xs _ -> concatMap go xs
-#endif
Note _ -> ""
Span _ xs -> concatMap go xs
diff --git a/src/Network/Gitit/Export.hs b/src/Network/Gitit/Export.hs
--- a/src/Network/Gitit/Export.hs
+++ b/src/Network/Gitit/Export.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
{-
Copyright (C) 2009 John MacFarlane
@@ -21,14 +20,14 @@
-}
module Network.Gitit.Export ( exportFormats ) where
-import Text.Pandoc hiding (HTMLMathMethod(..))
+import Control.Exception (throwIO)
+import Text.Pandoc hiding (HTMLMathMethod(..), getDataFileName)
import qualified Text.Pandoc as Pandoc
import Text.Pandoc.PDF (makePDF)
import Text.Pandoc.SelfContained as SelfContained
-import Text.Pandoc.Shared (readDataFileUTF8)
import qualified Text.Pandoc.UTF8 as UTF8
import Network.Gitit.Server
-import Network.Gitit.Framework (pathForPage, getWikiBase)
+import Network.Gitit.Framework (pathForPage)
import Network.Gitit.State (getConfig)
import Network.Gitit.Types
import Network.Gitit.Cache (cacheContents, lookupCache)
@@ -38,118 +37,87 @@
import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as L
import System.FilePath ((), takeDirectory)
-import Control.Exception (throwIO)
import System.Directory (doesFileExist)
import Text.HTML.SanitizeXSS
-import Text.Pandoc.Writers.RTF (writeRTFWithEmbeddedImages)
+import Text.Pandoc.Writers.RTF (writeRTF)
+import Data.ByteString.Lazy (fromStrict)
+import Data.Text (Text)
import qualified Data.Text as T
+import Data.Text.Encoding (encodeUtf8)
import Data.List (isPrefixOf)
-import Text.Highlighting.Kate (styleToCss, pygments)
+import Skylighting (styleToCss, pygments)
import Paths_gitit (getDataFileName)
defaultRespOptions :: WriterOptions
-defaultRespOptions = def { writerHighlight = True }
-
-respond :: String
- -> String
- -> (Pandoc -> IO L.ByteString)
- -> String
- -> Pandoc
- -> Handler
-respond mimetype ext fn page doc = liftIO (fn doc) >>=
- ok . setContentType mimetype .
- (if null ext then id else setFilename (page ++ "." ++ ext)) .
- toResponseBS B.empty
+defaultRespOptions = def { writerHighlightStyle = Just pygments }
respondX :: String -> String -> String
- -> (WriterOptions -> Pandoc -> IO L.ByteString)
+ -> (WriterOptions -> Pandoc -> PandocIO L.ByteString)
-> WriterOptions -> String -> Pandoc -> Handler
respondX templ mimetype ext fn opts page doc = do
cfg <- getConfig
- template' <- liftIO $ getDefaultTemplate (pandocUserData cfg) templ
- template <- case template' of
- Right t -> return t
- Left e -> liftIO $ throwIO e
doc' <- if ext `elem` ["odt","pdf","beamer","epub","docx","rtf"]
then fixURLs page doc
else return doc
- respond mimetype ext (fn opts{
-#if MIN_VERSION_pandoc(1,19,0)
- writerTemplate = Just template
-#else
- writerTemplate = template
- ,writerStandalone = True
-#endif
- ,writerUserDataDir = pandocUserData cfg})
- page doc'
+ doc'' <- liftIO $ runIO $ do
+ setUserDataDir $ pandocUserData cfg
+ template <- getDefaultTemplate templ
+ fn opts{ writerTemplate = Just template } doc'
+ either (liftIO . throwIO)
+ (ok . setContentType mimetype .
+ (if null ext then id else setFilename (page ++ "." ++ ext)) .
+ toResponseBS B.empty)
+ doc''
-respondS :: String -> String -> String -> (WriterOptions -> Pandoc -> String)
+respondS :: String -> String -> String -> (WriterOptions -> Pandoc -> PandocIO Text)
-> WriterOptions -> String -> Pandoc -> Handler
respondS templ mimetype ext fn =
- respondX templ mimetype ext (\o d -> return $ UTF8.fromStringLazy $ fn o d)
+ respondX templ mimetype ext (\o d -> fromStrict . encodeUtf8 <$> fn o d)
-respondSlides :: String -> HTMLSlideVariant -> String -> Pandoc -> Handler
-respondSlides templ slideVariant page doc = do
+respondSlides :: String -> (WriterOptions -> Pandoc -> PandocIO Text) -> String -> Pandoc -> Handler
+respondSlides templ fn page doc = do
cfg <- getConfig
- base' <- getWikiBase
let math = case mathMethod cfg of
- MathML -> Pandoc.MathML Nothing
+ MathML -> Pandoc.MathML
WebTeX u -> Pandoc.WebTeX u
- JsMathScript -> Pandoc.JsMath
- (Just $ base' ++ "/js/jsMath/easy/load.js")
_ -> Pandoc.PlainMath
- let opts' = defaultRespOptions {
- writerSlideVariant = slideVariant
- ,writerIncremental = True
- ,writerHtml5 = templ == "dzslides"
- ,writerHTMLMathMethod = math}
+ let opts' = defaultRespOptions { writerIncremental = True
+ , writerHTMLMathMethod = math}
-- We sanitize the body only, to protect against XSS attacks.
-- (Sanitizing the whole HTML page would strip out javascript
-- needed for the slides.) We then pass the body into the
-- slide template using the 'body' variable.
Pandoc meta blocks <- fixURLs page doc
- let body' = writeHtmlString opts' (Pandoc meta blocks) -- just body
- let body'' = T.unpack
- $ (if xssSanitize cfg then sanitizeBalance else id)
- $ T.pack body'
- variables' <- if mathMethod cfg == MathML
- then do
- s <- liftIO $ readDataFileUTF8 (pandocUserData cfg)
- "MathMLinHTML.js"
- return [("mathml-script", s)]
- else return []
- template' <- liftIO $ getDefaultTemplate (pandocUserData cfg) templ
- template <- case template' of
- Right t -> return t
- Left e -> liftIO $ throwIO e
- dzcore <- if templ == "dzslides"
- then do
- dztempl <- liftIO $ readDataFileUTF8 (pandocUserData cfg)
- $ "dzslides" "template.html"
- return $ unlines
- $ dropWhile (not . isPrefixOf "