jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rst parser does not support 'raw' directive per default (security risk)

Browse source
This commit is contained in:
Araq 2012-05-01 22:55:06 +02:00
commit 28b68d914e
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/docgen.nim
View file

@ -72,7 +72,7 @@ proc initIndexFile(d: PDoc) =
d.indexValFilename = changeFileExt(extractFilename(d.filename), HtmlExt) d.indexValFilename = changeFileExt(extractFilename(d.filename), HtmlExt)
if ExistsFile(gIndexFile): if ExistsFile(gIndexFile):
d.indexFile = rstParse(readFile(gIndexFile), gIndexFile, 0, 1, d.indexFile = rstParse(readFile(gIndexFile), gIndexFile, 0, 1,
dummyHasToc, {}) dummyHasToc, {roSupportRawDirective})
d.theIndex = findIndexNode(d.indexFile) d.theIndex = findIndexNode(d.indexFile)
if (d.theIndex == nil) or (d.theIndex.kind != rnDefList): if (d.theIndex == nil) or (d.theIndex.kind != rnDefList):
rawMessage(errXisNoValidIndexFile, gIndexFile) rawMessage(errXisNoValidIndexFile, gIndexFile)
@ -96,6 +96,7 @@ proc newDocumentor(filename: string): PDoc =
result.filename = filename result.filename = filename
result.id = 100 result.id = 100
result.splitAfter = 20 result.splitAfter = 20
result.options = {roSupportRawDirective}
var s = getConfigVar("split.item.toc") var s = getConfigVar("split.item.toc")
if s != "": result.splitAfter = parseInt(s) if s != "": result.splitAfter = parseInt(s)
@ -885,7 +886,8 @@ proc CommandRstAux(filename, outExt: string) =
var filen = addFileExt(filename, "txt") var filen = addFileExt(filename, "txt")
var d = newDocumentor(filen) var d = newDocumentor(filen)
initIndexFile(d) initIndexFile(d)
var rst = rstParse(readFile(filen), filen, 0, 1, d.hasToc, {}) var rst = rstParse(readFile(filen), filen, 0, 1, d.hasToc,
{roSupportRawDirective})
d.modDesc = renderRstToOut(d, rst) d.modDesc = renderRstToOut(d, rst)
writeOutput(d, filename, outExt) writeOutput(d, filename, outExt)
generateIndex(d) generateIndex(d)

8
compiler/rst.nim
View file

@ -68,6 +68,8 @@ type
roSkipPounds, ## skip ``#`` at line beginning (documentation roSkipPounds, ## skip ``#`` at line beginning (documentation
## embedded in Nimrod comments) ## embedded in Nimrod comments)
roSupportSmilies, ## make the RST parser support smilies like ``:)`` roSupportSmilies, ## make the RST parser support smilies like ``:)``
roSupportRawDirective ## support the ``raw`` directive (don't support
## it for sandboxing)
TRstParseOptions* = set[TRstParseOption] TRstParseOptions* = set[TRstParseOption]
@ -1629,7 +1631,11 @@ proc parseDotDot(p: var TRstParser): PRstNode =
of dkTitle: result = dirTitle(p) of dkTitle: result = dirTitle(p)
of dkContainer: result = dirContainer(p) of dkContainer: result = dirContainer(p)
of dkContents: result = dirContents(p) of dkContents: result = dirContents(p)
of dkRaw: result = dirRaw(p) of dkRaw:
if roSupportRawDirective in p.s.options:
result = dirRaw(p)
else:
rstMessage(p, errInvalidDirectiveX, d)
of dkCodeblock: result = dirCodeBlock(p) of dkCodeblock: result = dirCodeBlock(p)
of dkIndex: result = dirIndex(p) of dkIndex: result = dirIndex(p)
else: rstMessage(p, errInvalidDirectiveX, d) else: rstMessage(p, errInvalidDirectiveX, d)