summaryrefslogtreecommitdiff
path: root/IkiWiki
AgeCommit message (Collapse)Author
2008-04-26toc: Add the table of contents at sanitize time, rather than at format time. ↵Joey Hess
This allows the toc to be displayed when previewing an edit. It also avoids headers in the page template from showing up in the toc.
2008-04-10Use bzr --quiet to avoid it outputting stuff and messing up http headers. ↵Joey Hess
(Scott Bronson)
2008-04-10Fix broken rcs_update for bzr. (Scott Bronson)Joey Hess
2008-04-10Fix CSRF attacks against the preferences and edit forms. Closes: #475445Joey Hess
The fix involved embedding the session id in the forms, and not allowing the forms to be submitted if the embedded id does not match the session id. In the case of the preferences form, if the session id is not embedded, then the CGI parameters are cleared. This avoids a secondary attack where the link to the preferences form prefills password or other fields, and the user hits "submit" without noticing these prefilled values. In the case of the editpage form, the anonok plugin can allow anyone to edit, and so I chose not to guard against CSRF attacks against users who are not logged in. Otherwise, it also embeds the session id and checks it. For page editing, I assume that the user will notice if content or commit message is changed because of CGI parameters, and won't blndly hit save page. So I didn't block those CGI paramters. (It's even possible to use those CGI parameters, for good, not for evil, I guess..) The only other CSRF attack I can think of in ikiwiki involves the poll plugin. It's certianly possible to set up a link that causes the user to unknowingly vote in a poll. However, the poll plugin is not intended to be used for things that people would want to attack, since anyone can after all edit the poll page and fill in any values they like. So this "attack" is ignorable.
2008-04-03need to handle urls to images the sameJoey Hess
Also, simplified finding the url to the top of the site.
2008-04-03Bug#473987: [PATCH] Links relative to baseurl mangled in atom/rss feedsManoj Srivastava
tag 473987 +patch thanks Hi, The issue is that we need to convert relative links to absolute ones for atom and rss feeds -- but there are two types of relative links. The first kind, relative to the current document ( href="some/path") is handled correctly. The second kind of relative url is is relative to the http server base (href="/semi-abs/path"), and that broke. It broke because we just prepended the url of the current document to the href (http://host/path/to/this-doc/ + link), which gave us, in the first place: http://host/path/to/this-doc/some/path [correct], and http://host/path/to/this-doc//semi-abs/path [wrong] The fix is to calculate the base for the http server (the base of the wiki does not help, since the base of the wiki can be different from the base of the http server -- I have, for example, "url => http://host.name.mine/blog/manoj/"), and prepend that to the relative references that start with a /. This has been tested. Signed-off-by: Manoj Srivastava <srivasta@debian.org>
2008-04-03aggregate: Correct a mistake in the code that dummy up a guid for feeds ↵Joey Hess
lacking one.
2008-03-29Added a hardlink option in the setup file, useful if the source and dest are ↵Joey Hess
on the same filesystem and the wiki includes large media files, which would normally be copied, wasting time and space.
2008-03-23revert destpage part of f7bdc2385Joey Hess
destpage does not normally need to be worried about when creating other files as part of the process of rendering a page. Using destpage results in inlined pages creating two copies of such files. It works to not use destpage in this case because the inlining page depends on the source page, so if the source page is modified or deleted the inlining page will be updated.
2008-03-23inline: Allow the "feedshow" parameter to take values greater than the value ↵Joey Hess
for "show".
2008-03-21typosJoey Hess
2008-03-21Allow external plugins to return no valuemartin f. krafft
Instead of using the XML-RPC v2 extension <nil/>, which Perl's XML::RPC::Parser does not (yet) support (Joey's patch is pending), we agreed on a sentinel: {'null':''}, that is, a hash with a single key "null" pointing to the empty string. The Python proxy automatically converts None appropriately and raises an exception if a hook function should, by weird coincidence, attempt to return {'null':''}. Signed-off-by: martin f. krafft <madduck@madduck.net>
2008-03-21work around perl warningJoey Hess
2008-03-21delete inline data after it's usedJoey Hess
2008-03-21crazy optimisation to work around slow markdownJoey Hess
Markdown is slow. Especially if it has to process an enormous page. The most common enormous page is currently the recentchanges page, which gets processed a lot, and contains very little actual markdown. Most of it is a big <div>, which markdown skips ... slowly. This is a rather sick optimisation to work around markdown's speed issues. Now inline inserts a small, dummy div, allows markdown to quickly render the actual page content, then replaces the dummy with the actual inlined pages later. Results: Rendering just a recentchanges page, with diffs included, dropped from 4.5 seconds to 2.7 seconds on my laptop. Building the entire wiki dropped from 46.6 seconds to 39.5 seconds. (It would be better if inline were a *post*-processor directive.)
2008-03-21process smilies in a sanitize hookJoey Hess
I had to move it to sanitize so all the markup is htmlized, so it can scan for <pre> and <code>.
2008-03-21another fixJoey Hess
I'm suprised that the second m//g didn't seem to clobber @-, but I don't want to rely on that, so preserve it beforehand.
2008-03-21various fixes and simplificationsJoey Hess
2008-03-21smiley: Detect smileys inside pre and tags, and do not expand.Joey Hess
2008-03-21Close meta tag for redir properly.Joey Hess
2008-03-19Store userinfo in network byte order for easy portability. (Old files will ↵Joey Hess
be automatically converted.)
2008-03-19optimisation, only load openid module when signing inJoey Hess
This makes the CGI about .2 seconds faster when editing pages etc.
2008-03-19fix setstateJoey Hess
Same fix as in d7f1292c3134fd9464ca4005f48b9274be861c10
2008-03-19make setargv take an arrayJoey Hess
for consistentcy with getargv, which returns one
2008-03-19fix setvarJoey Hess
It was incorrectly setting the value to the number of items in @_, ie, always 1.
2008-03-19getargv needs to return a list referenceJoey Hess
xml rpc only allows functions to return a single value, no lists. So getargv needs to return a list reference, which means that the caller will see an xml rpc array.
2008-03-17* Record new pages in %pagesources temporarily when previewing so thatJoey Hess
things that need to know the page source or type can query it from there. Fixes previewing of tables when creating a new page.
2008-03-15* external: Add getargv and setargv methods to allow access to ikiwiki'sJoey Hess
@ARGV.
2008-03-15* htmltidy: Pass --markup yes, in case tidy's config file disabled it.Joey Hess
2008-03-15* external: Fix support of XML::RPC::fault.Joey Hess
2008-03-14* Fix expiry of old recentchanges changeset pages.Joey Hess
2008-03-14load HTML::Entities at topJoey Hess
Used in several subs, not all of which load it on demand, this seems simpler.
2008-03-12no need to use HTML::Entities, as it's loaded on demand by code belowJoey Hess
2008-03-12* Use absolute url for feedurl when filling out the feed templates.Joey Hess
Closes: #470530
2008-03-12truncate recentchangesdiffs after 200 linesJoey Hess
This works around a perl crasher bug, and also avoids bloating pages with enormous diffs. rcs_recentchanges modified to return a list in an array context.
2008-03-12use git show to get the diffJoey Hess
If a diff of the firsst commit in a git repo was requested, it would fail and print to stderr since first^ isn't valid. Using git show will always work.
2008-03-12* Use forcebaseurl to make page previews be displayed with the html baseJoey Hess
set to the destination page. This avoids need for hacks to munge the urls in preview mode, which fixes several bugs. * Several destpage fixes in plugins.
2008-03-12* monotone: Require version 0.38 or greater, and stop using the mtnmergercJoey Hess
option. (Brian May)
2008-03-12fix syntax errorJoey Hess
2008-03-11Correct meta.robots attribute value->contentmartin f. krafft
This was a silly typo, sorry. <meta ...> takes an attribute content, not value. Signed-off-by: martin f. krafft <madduck@madduck.net>
2008-03-11Generate openid2 headers as wellmartin f. krafft
This causes meta.openid to also generate the openid2 headers. Signed-off-by: martin f. krafft <madduck@madduck.net>
2008-03-11Let meta.openid set X-XRDS-Location headermartin f. krafft
Adds an optional xrds-location parameter to the openid meta handler, which allows for XRDS delegation. A good document on XRDS is http://www.windley.com/archives/2007/05/using_xrds.shtml Signed-off-by: martin f. krafft <madduck@madduck.net>
2008-03-07* Remove locking code in git rcs_commit. I'm not sure if this was everJoey Hess
correct, and it's certianly not correct now, since the wiki is locked before rcs_commit is ever called, and should not be unlocked by rcs_commit either.
2008-03-04test for Text::Markdown::[Mm]arkdown and use the available oneJoey Hess
Markdown is such a splintered mess.. The current debian package provides only Text::Markdown::Markdown, while all versions of Text::Markdown support Text::Markdown::markdown, and old versions also support the capitalised version, while new ones don't. It's getting to the point where `grep /markdown/i %symbol_table` is the only sane way to figure out what function to call..
2008-03-04* Use Text::Markdown::markdown, since version 1.0.16 of Text::MarkdownJoey Hess
no longer supports Text::Markdown::Markdown. All old versions of Text::Markdown also support the lower-case version.
2008-03-03* Add recentchangesdiff plugin that adds diffs to the recentchanges feeds.Joey Hess
* rcs_diff is a new function that rcs modules should implement. * Implemented rcs_diff for git, svn, and tla (tla version untested). Mercurial and monotone still todo.
2008-03-02Add robots tag to meta pluginmartin f. krafft
Add special handling for <meta name="robots" ...> which needs not be scrubbed as it's harmless. Signed-off-by: martin f. krafft <madduck@madduck.net> (cherry picked from commit b15d0299a7f7b147e89d8a202d6cca1c21491af2)
2008-03-02Make directives generated by shortcuts accept a `desc` parameter.Adeodato Simó
(cherry picked from commit 252da396bfa728b99af7c9bb304a7b5f3f6d94e6)
2008-02-29Allow colons in URLs after the first slashAdeodato Simó
A new regexp fixes this bug: http://ikiwiki.info/bugs/No_link_for_blog_items_when_filename_contains_a_colon/ I traced this down to htmlscrubber. If disabled, it works. If enabled, then $safe_url_regexp determines the URL unsafe because of the colon and hence removes the src attribute. Digging into this, I find that RFC 3986 pretty much discourages colons in filenames: """ A path segment that contains a colon character (e.g., "this:that") cannot be used as the first segment of a relative-path reference, as it would be mistaken for a scheme name. Such a segment must be preceded by a dot-segment (e.g., "./this:that") to make a relative- path reference. """ on the other hand, with usedirs, any link to another page will be prepended by ../ anyway, so that makes them okay again. The solution still seems not to use colons. In any case, htmlscrubber should get a new regexp, courtesy of dato. I have tested and verified this. Signed-off-by: martin f. krafft <madduck@madduck.net>
2008-02-24avoid calling getctime on internal pagesJoey Hess
internal pages won't be in revision control so this avoids some ugly noise