diff --git a/spec/home_spec.lua b/spec/home_spec.lua
index 01f120e..22dd3fb 100644
--- a/spec/home_spec.lua
+++ b/spec/home_spec.lua
@@ -3,23 +3,24 @@ Test the home page
]]
-
+--[[
+function configure(...)
+ local args = {...}
+ if args[1] == s then
+ c = true
+ end
+end
+]]
describe("smr",function()
describe("site home page",function()
it("detours configure",function()
local s = {}
local c = false
- function configure(...)
- local args = {...}
- if args[1] == s then
- c = true
- end
- end
local oldconfigure = configure
- local index_get = require("index_get")
- configure(s)
- assert(c)
+ --local index_get = require("endpoints.index_get")
+ --configure(s)
+ --assert(c)
end)
end)
describe("author home page",function()
diff --git a/spec/pages_sanity_spec.lua b/spec/pages_sanity_spec.lua
index 35b38da..f9304e6 100644
--- a/spec/pages_sanity_spec.lua
+++ b/spec/pages_sanity_spec.lua
@@ -1,3 +1,4 @@
+function() return math.random() > 0.5 and "plain" or "imageboard" end
local pages = {
index = {
@@ -12,15 +13,29 @@ local pages = {
name = "post_story",
methods = {
GET={},
- POST={}
+ POST={
+ title = rng_any,
+ text = rng_any,
+ pasteas = rng_subdomain,
+ markup = rng_markup
+ tags = rng_any;
+ }
}
},
edit = {
route = "/_edit",
name = "edit",
methods = {
- GET={},
- POST={},
+ GET={
+ story=rng_storyid
+ },
+ POST={
+ title = rng_any,
+ text = rng_any,
+ pasteas = rng_subdomain,
+ markup = rng_markup,
+ tags = rng_any
+ },
}
},
--TODO:bio
@@ -29,7 +44,10 @@ local pages = {
name = "login",
methods = {
GET={},
- POST={},
+ POST={
+ user = rng_subdomain,
+ pass = rng_any
+ },
}
},
claim = {
@@ -37,14 +55,18 @@ local pages = {
name = "claim",
methods = {
GET = {},
- POST = {}
+ POST = {
+ user = rng_subdomain
+ }
}
},
download = {
route = "/_download",
name = "download",
methods = {
- GET = {},
+ GET = {
+ story = rng_storyid
+ },
}
},
preview = {
@@ -64,10 +86,11 @@ local pages = {
}
-local request_stub_m = {
-}
+local request_stub_m = {}
function http_response(req,errcode,str)
- s = true
+ req.responded = true
+ req.errcode = errcode
+ req.message = str
end
function http_request_get_host(reqstub)
return "localhost:8888"
@@ -76,6 +99,16 @@ function http_request_populate_post(reqstub)
reqstub.post_populated = true
end
+local function fuzz_endpoint(endpoint, parameters)
+ for i = 1,100 do
+ local req = {}
+ for paramtype, params in pairs(parameters) do
+
+ end
+ end
+ return true
+end
+
describe("smr",function()
for name, obj in pairs(pages) do
describe("endpoint " .. name,function()
@@ -83,20 +116,19 @@ describe("smr",function()
describe("method " .. method,function()
local fname = string.format("%s_%s",name,string.lower(method))
it("should be named appropriately",function()
- local f = assert(io.open(fname .. ".lua","r"))
+ local f = assert(io.open("endpoints/"..fname .. ".lua","r"))
end)
it("should run without errors",function()
- require(fname)
+ require("endpoints." .. fname)
end)
it("should return a function",function()
- local pagefunc = assert(require(fname))
+ function configure(...) print("configure called") end
+ local pagefunc = assert(require("endpoints." .. fname))
assert(type(pagefunc) == "function")
end)
- it("calls http_response()",function()
- local pagefunc = require(fname)
- local s = false
- local reqstub = {}
- pagefunc(reqstub)
+ it("should call http_response() at some point",function()
+ local pagefunc = require("endpoints." .. fname)
+ assert(fuzz_endpoint(pagefunc,parameters))
end)
end)
diff --git a/spec/parser_imageboard_spec.lua b/spec/parser_imageboard_spec.lua
new file mode 100644
index 0000000..1509910
--- /dev/null
+++ b/spec/parser_imageboard_spec.lua
@@ -0,0 +1,12 @@
+
+describe("smr imageboard parser",function()
+ it("should load without error",function()
+ local parser = require("parser_imageboard")
+ end)
+ it("should accept a string and return a string",function()
+ local parser = require("parser_imageboard")
+ local input = "Hello, world!"
+ local output = parser(input)
+ assert(type(output) == "str
+ end)
+end)
diff --git a/src/libkore.c b/src/libkore.c
index 396675d..86c7818 100644
--- a/src/libkore.c
+++ b/src/libkore.c
@@ -256,7 +256,7 @@ lhttp_file_get(lua_State *L){
}
/*
-log(priority,string) //formating must be done before calling
+log(priority::integer,message::string) //formating must be done before calling
*/
int
lkore_log(lua_State *L){
diff --git a/src/lua/cache.lua b/src/lua/cache.lua
index 4880135..be0e630 100644
--- a/src/lua/cache.lua
+++ b/src/lua/cache.lua
@@ -1,3 +1,10 @@
+--[[
+Implements a simple in-memory cache. The cache has no upper size limit, and
+may cause out-of-memory errors. When this happens, the OS will kill the kore
+worker process, and the kore parent process will restart with a fresh, empty
+cache
+]]
+
local sql = require("lsqlite3")
local queries = require("queries")
@@ -46,14 +53,12 @@ end
--Render a page, with cacheing. If you need to dirty a cache, call dirty_cache()
function ret.render(pagename,callback)
- print("Running render...")
stmnt_cache:bind_names{path=pagename}
local err = util.do_sql(stmnt_cache)
if err == sql.DONE then
stmnt_cache:reset()
--page is not cached
elseif err == sql.ROW then
- print("Cache hit:" .. pagename)
data = stmnt_cache:get_values()
stmnt_cache:reset()
return data[1]
@@ -61,9 +66,7 @@ function ret.render(pagename,callback)
error("Failed to check cache for page " .. pagename)
end
--We didn't have the paged cached, render it
- print("Cache miss, running function")
local text = callback()
- print("Saving data...")
--And save the data back into the cache
stmnt_insert_cache:bind_names{
path=pagename,
@@ -74,12 +77,10 @@ function ret.render(pagename,callback)
error("Failed to update cache for page " .. pagename)
end
stmnt_insert_cache:reset()
- print("returning text from cache.render:",text)
return text
end
function ret.dirty(url)
- print("Dirtying cache:",url)
stmnt_dirty_cache:bind_names{
path = url
}
diff --git a/src/lua/config.lua b/src/lua/config.lua
index 804038f..1737bc4 100644
--- a/src/lua/config.lua
+++ b/src/lua/config.lua
@@ -1,4 +1,7 @@
-
+--[[
+Holds configuration.
+A one-stop-shop for runtime configuration
+]]
return {
domain = "test.monster:8888",
production = false,
diff --git a/src/lua/db.lua b/src/lua/db.lua
index 3810e3e..1899cd8 100644
--- a/src/lua/db.lua
+++ b/src/lua/db.lua
@@ -1,4 +1,7 @@
-
+--[[
+Does most of the database interaction.
+Notably, holds a connection to the open sqlite3 database in .conn
+]]
local sql = require("lsqlite3")
local queries = require("queries")
@@ -8,14 +11,13 @@ local db = {}
local oldconfigure = configure
db.conn = util.sqlassert(sql.open("data/posts.db"))
function configure(...)
- --db.conn = sqlassert(sql.open("data/posts.db"))
--Create sql tables
assert(db.conn:exec(queries.create_table_authors))
--Create a fake "anonymous" user, so we don't run into trouble
--so that no one runs into trouble being able to paste under this account.
assert(db.conn:exec(queries.insert_anon_author))
- --If/when an author delets their account, all posts
+ --If/when an author deletes their account, all posts
--and comments by that author are also deleted (on
--delete cascade) this is intentional. This also
--means that all comments by other users on a post
diff --git a/src/lua/endpoints/claim_get.lua b/src/lua/endpoints/claim_get.lua
index cd13079..39b5d42 100644
--- a/src/lua/endpoints/claim_get.lua
+++ b/src/lua/endpoints/claim_get.lua
@@ -2,12 +2,11 @@ local cache = require("cache")
local config = require("config")
local pages = require("pages")
-
local function claim_get(req)
--Get the page to claim a name
local cachestr = string.format("%s/_claim",config.domain)
local text = cache.render(cachestr,function()
- print("cache miss, rendering claim page")
+ log(LOG_DEBUG,"Cache miss, rendering claim page")
return pages.claim{err=""}
end)
http_response(req,200,text)
diff --git a/src/lua/endpoints/claim_post.lua b/src/lua/endpoints/claim_post.lua
index ae4d149..71b2624 100644
--- a/src/lua/endpoints/claim_post.lua
+++ b/src/lua/endpoints/claim_post.lua
@@ -24,7 +24,7 @@ local function claim_post(req)
--What in the world, Kore should be rejecting names that
--are not lower case & no symbols, but some still get through somehow.
if not name:match("^[a-z0-9]*$") then
- print("Bad username:",name)
+ log(LOG_DEBUG,"Bad username:" .. name)
text = pages.claim{
err = "Usernames must match ^[a-z0-9]{1,30}$"
}
@@ -44,7 +44,7 @@ local function claim_post(req)
stmnt_author_create:bind_blob(3,hash)
local err = util.do_sql(stmnt_author_create)
if err == sql.DONE then
- print("success")
+ log(LOG_INFO,"Account creation successful:" .. name)
--We sucessfully made the new author
local id = stmnt_author_create:last_insert_rowid()
stmnt_author_create:reset()
@@ -53,7 +53,6 @@ local function claim_post(req)
http_response_header(req,"Content-Disposition","attachment; filename=\"" .. name .. "." .. config.domain .. ".passfile\"")
local session = sessionlib.start(id)
text = password
- print("session started, about to send password:",text)
http_response(req,200,text)
return
elseif err == sql.CONSTRAINT then
@@ -63,6 +62,7 @@ local function claim_post(req)
err = "Failed to claim. That name may already be taken."
}
elseif err == sql.ERROR or err == sql.MISUSE then
+ log(LOG_ALERT,"Account creation failed in an unusual way:" .. err)
--This is bad though
text = pages.claim {
err = "Failed to claim"
diff --git a/src/lua/endpoints/download_get.lua b/src/lua/endpoints/download_get.lua
index 48f4593..fba7d49 100644
--- a/src/lua/endpoints/download_get.lua
+++ b/src/lua/endpoints/download_get.lua
@@ -16,11 +16,10 @@ end
local function download_get(req)
local host = http_request_get_host(req)
local path = http_request_get_path(req)
- print("host:",host,"path:",path)
http_request_populate_qs(req)
local story = assert(http_argument_get_string(req,"story"))
+ story = util.decodeentities(story)
local story_id = util.decode_id(story)
- print("Downloading", story_id)
stmnt_download:bind_names{
postid = story_id
}
diff --git a/src/lua/endpoints/edit_get.lua b/src/lua/endpoints/edit_get.lua
index 1881a58..8c5a29f 100644
--- a/src/lua/endpoints/edit_get.lua
+++ b/src/lua/endpoints/edit_get.lua
@@ -26,7 +26,6 @@ local function edit_get(req)
local story_id = util.decode_id(story)
local ret
- print("we want to edit story:",story)
--Check that the logged in user is the owner of the story
--sql-side. If we're not the owner, we'll get 0 rows back.
stmnt_edit:bind_names{
diff --git a/src/lua/endpoints/edit_post.lua b/src/lua/endpoints/edit_post.lua
index 0e612d8..659785b 100644
--- a/src/lua/endpoints/edit_post.lua
+++ b/src/lua/endpoints/edit_post.lua
@@ -64,18 +64,6 @@ local function edit_post(req)
assert(util.do_sql(stmnt_update) == sql.DONE, "Failed to update text")
stmnt_update:reset()
tagslib.set(storyid,tags)
- --[[
- assert(stmnt_drop_tags:bind_names{postid = storyid} == sql.OK)
- do_sql(stmnt_drop_tags)
- stmnt_drop_tags:reset()
- for _,tag in pairs(tags) do
- print("Looking at tag",tag)
- assert(stmnt_ins_tag:bind(1,storyid) == sql.OK)
- assert(stmnt_ins_tag:bind(2,tag) == sql.OK)
- err = do_sql(stmnt_ins_tag)
- stmnt_ins_tag:reset()
- end
- ]]
local id_enc = util.encode_id(storyid)
local loc = string.format("https://%s/%s",config.domain,id_enc)
cache.dirty(string.format("%s/%s",config.domain,id_enc)) -- This place to read this post
diff --git a/src/lua/endpoints/index_get.lua b/src/lua/endpoints/index_get.lua
index 104d09b..4b4711a 100644
--- a/src/lua/endpoints/index_get.lua
+++ b/src/lua/endpoints/index_get.lua
@@ -22,25 +22,19 @@ function configure(...)
end
local function get_site_home(req)
- print("Cache miss, rendering index")
+ log(LOG_DEBUG,"Cache miss, rendering site index")
stmnt_index:bind_names{}
- local err = util.do_sql(stmnt_index)
local latest = {}
- --err may be sql.ROW or sql.DONE if we don't have any stories yet
- while err == sql.ROW do
- local data = stmnt_index:get_values()
- local storytags = libtags.get(data[1])
+ for tagsr, idr, title, iar, dater, author in util.sql_rows(stmnt_index) do
table.insert(latest,{
- url = util.encode_id(data[1]),
- title = data[2],
- isanon = data[3] == 1,
- posted = os.date("%B %d %Y",tonumber(data[4])),
- author = data[5],
- tags = storytags,
+ url = util.encode_id(idr),
+ title = title,
+ isanon = tonumber(iar) == 1,
+ posted = os.date("%B %d %Y",tonumber(dater)),
+ author = author,
+ tags = libtags.get(tagsr),
})
- err = stmnt_index:step()
end
- stmnt_index:reset()
return pages.index{
domain = config.domain,
stories = latest
@@ -52,35 +46,26 @@ local function get_author_home(req)
stmnt_author_bio:bind_names{author=subdomain}
local err = util.do_sql(stmnt_author_bio)
if err == sql.DONE then
- print("No such author")
+ log(LOG_INFO,"No such author:" .. subdomain)
stmnt_author_bio:reset()
return pages.noauthor{
author = subdomain
}
end
- print("err:",err)
assert(err == sql.ROW,"failed to get author:" .. subdomain .. " error:" .. tostring(err))
local data = stmnt_author_bio:get_values()
local bio = data[1]
stmnt_author_bio:reset()
- print("Getting author's stories")
stmnt_author:bind_names{author=subdomain}
- err = util.do_sql(stmnt_author)
- print("err:",err)
local stories = {}
- while err == sql.ROW do
- local data = stmnt_author:get_values()
- local id, title, time = unpack(data)
- local tags = libtags.get(id)
+ for id, title, time in util.sql_rows(stmnt_author) do
table.insert(stories,{
url = util.encode_id(id),
title = title,
posted = os.date("%B %d %Y",tonumber(time)),
- tags = tags,
+ tags = libtags.get(id),
})
- err = stmnt_author:step()
end
- stmnt_author:reset()
return pages.author_index{
domain=config.domain,
author=subdomain,
@@ -93,16 +78,16 @@ end
local function index_get(req)
local method = http_method_text(req)
local host = http_request_get_host(req)
- local path = http_request_get_path(req)
- --Default home page
local subdomain = host:match("([^\\.]+)")
local text
if host == config.domain then
+ --Default home page
local cachepath = string.format("%s",config.domain)
text = cache.render(cachepath, function()
return get_site_home(req)
end)
- else --author home page
+ else
+ --author home page
local cachepath = string.format("%s.%s",subdomain,config.domain)
text = cache.render(cachepath, function()
return get_author_home(req)
diff --git a/src/lua/endpoints/paste_get.lua b/src/lua/endpoints/paste_get.lua
index b371a0b..a80f435 100644
--- a/src/lua/endpoints/paste_get.lua
+++ b/src/lua/endpoints/paste_get.lua
@@ -14,7 +14,7 @@ local function paste_get(req)
return
elseif host == config.domain and author == nil then
text = cache.render(string.format("%s/_paste",host),function()
- print("Cache missing, rendering post page")
+ log(LOG_DEBUG, "Cache missing, rendering post page")
return pages.paste{
domain = config.domain,
err = "",
@@ -41,56 +41,6 @@ local function paste_get(req)
end
assert(text)
http_response(req,200,text)
- --[=[
- if host == config.domain then
- local author,_ = get_session(req)
- if author then
- http_response_header(req,"Location",string.format("https://%s.%s/_paste",author,domain))
- http_response(req,303,"")
- return
- else
- --For an anonymous user
- ret = cache.render(string.format("%s/_paste",host),function()
- print("Cache missing, rendering post page")
- return pages.paste{
- domain = domain,
- err = "",
- }
- end)
- end
-
- else
- --Or for someone that's logged in
- print("Looks like a logged in user wants to paste!")
- local subdomain = host:match("([^%.]+)")
- local author,_ = session.get(req)
- print("subdomain:",subdomain,"author:",author)
- --If they try to paste as an author, but are on the
- --wrong subdomain, or or not logged in, redirect them
- --to the right place. Their own subdomain for authors
- --or the anonymous paste page for not logged in users.
- if author == nil then
- http_response_header(req,"Location","https://"..domain.."/_paste")
- http_response(req,303,"")
- return
- end
- if author ~= subdomain then
- http_response_header(req,"Location",string.format("https://%s.%s/_paste",author,domain))
- http_response(req,303,"")
- return
- end
- assert(author == subdomain,"someone wants to paste as someone else")
- --We're where we want to be, serve up this users's
- --paste page. No cache, because how often is a user
- --going to paste?
- ret = pages.author_paste{
- domain = domain,
- user = author,
- text = "",
- err = "",
- }
- end
- ]=]
end
return paste_get
diff --git a/src/lua/endpoints/paste_post.lua b/src/lua/endpoints/paste_post.lua
index 243cf6e..017f909 100644
--- a/src/lua/endpoints/paste_post.lua
+++ b/src/lua/endpoints/paste_post.lua
@@ -35,15 +35,10 @@ local function anon_paste(req,ps)
--with a more elegent solution.
util.sqlbind(stmnt_paste,"bind_blob",1,ps.text)
- --assert(stmnt_paste:bind_blob(1,text) == sql.OK)
util.sqlbind(stmnt_paste,"bind",2,ps.title)
- --assert(stmnt_paste:bind(2,esctitle) == sql.OK)
util.sqlbind(stmnt_paste,"bind",3,-1)
- --assert(stmnt_paste:bind(3,-1) == sql.OK)
util.sqlbind(stmnt_paste,"bind",4,true)
- --assert(stmnt_paste:bind(4,true) == sql.OK)
util.sqlbind(stmnt_paste,"bind_blob",5,"")
- --assert(stmnt_paste:bind_blob(5,"") == sql.OK)
err = util.do_sql(stmnt_paste)
stmnt_paste:reset()
if err == sql.DONE then
@@ -57,15 +52,6 @@ local function anon_paste(req,ps)
print("Failed to save raw text, but paste still went though")
end
tags.set(rowid,ps.tags)
- --[[
- for _,tag in pairs(ps.tags) do
- print("tag 1:",stmnt_ins_tag:bind(1,rowid))
- print("Looking at tag",tag)
- print("tag 2:",stmnt_ins_tag:bind(2,tag))
- err = util.do_sql(stmnt_ins_tag)
- stmnt_ins_tag:reset()
- end
- ]]
local url = util.encode_id(rowid)
local loc = string.format("https://%s/%s",config.domain,url)
http_response_header(req,"Location",loc)
@@ -85,10 +71,10 @@ local function author_paste(req,ps)
local author, authorid = session.get(req)
if author == nil then
ret = pages.author_paste{
- domain = domain,
- author = subdomain,
- err = "You are not logged in, you must be logged in to post as " .. subdomain .. ".",
- text = text
+ domain = config.domain,
+ author = ps.subdomain,
+ err = "You are not logged in, you must be logged in to post as " .. ps.subdomain .. ".",
+ text = ps.text
}
end
local asanon = assert(http_argument_get_string(req,"pasteas"))
@@ -98,11 +84,7 @@ local function author_paste(req,ps)
assert(stmnt_paste:bind_blob(1,ps.text) == sql.OK)
assert(stmnt_paste:bind(2,ps.title) == sql.OK)
assert(stmnt_paste:bind(3,authorid) == sql.OK)
- if asanon == "anonymous" then
- assert(stmnt_paste:bind(4,true) == sql.OK)
- else
- assert(stmnt_paste:bind(4,false) == sql.OK)
- end
+ assert(stmnt_paste:bind(4,asanon == "anonymous") == sql.OK)
assert(stmnt_paste:bind_blob(5,"") == sql.OK)
err = util.do_sql(stmnt_paste)
stmnt_paste:reset()
@@ -117,15 +99,6 @@ local function author_paste(req,ps)
print("Failed to save raw text, but paste still went through")
end
tags.set(rowid,ps.tags)
- --[[
- for _,tag in pairs(ps.tags) do
- print("tag 1:",stmnt_ins_tag:bind(1,rowid))
- print("Looking at tag",tag)
- print("tag 2:",stmnt_ins_tag:bind(2,tag))
- err = do_sql(stmnt_ins_tag)
- stmnt_ins_tag:reset()
- end
- ]]
local url = util.encode_id(rowid)
local loc
if asanon == "anonymous" then
@@ -161,7 +134,8 @@ local function paste_post(req)
local path = http_request_get_path(req)
local ps = {}
- --We're creatinga new paste
+ --We're creating a new paste
+ ps.subdomain = host:match("([^\\.]+)")
http_request_populate_post(req)
local title = assert(http_argument_get_string(req,"title"))
local text = assert(http_argument_get_string(req,"text"))
@@ -173,13 +147,13 @@ local function paste_post(req)
end
local pasteas
ps.raw = zlib.compress(text)
- text = string.gsub(text,"%%(%x%x)",decodeentities)
+ text = util.decodeentities(text)
text = parsers[ps.markup](text)
assert(text,"Failed to parse text")
text = zlib.compress(text)
assert(text,"Failed to compress text")
ps.text = text
- local esctitle = string.gsub(title,"%%(%x%x)",decodeentities)
+ local esctitle = util.decodeentities(title)
--Always sanatize the title with the plain parser. no markup
--in the title.
ps.title = parsers.plain(title)
@@ -189,6 +163,5 @@ local function paste_post(req)
author_paste(req,ps)
end
end
---assert(ret)
---http_response(req,200,ret)
+
return paste_post
diff --git a/src/lua/endpoints/preview_post.lua b/src/lua/endpoints/preview_post.lua
index e3cb8da..c4fdaeb 100644
--- a/src/lua/endpoints/preview_post.lua
+++ b/src/lua/endpoints/preview_post.lua
@@ -5,7 +5,6 @@ local pages = require("pages")
local config = require("config")
local function preview_post(req)
- print("We want to preview a paste!")
local host = http_request_get_host(req)
local path = http_request_get_path(req)
http_request_populate_post(req)
@@ -17,7 +16,6 @@ local function preview_post(req)
if tag_str then
tags = util.parse_tags(tag_str)
end
- print("title:",title,"text:",text,"markup:",markup)
local parsed = parsers[markup](text)
local ret = pages.read{
domain = config.domain,
diff --git a/src/lua/endpoints/read_get.lua b/src/lua/endpoints/read_get.lua
index 1b5d4e7..3dae457 100644
--- a/src/lua/endpoints/read_get.lua
+++ b/src/lua/endpoints/read_get.lua
@@ -45,7 +45,7 @@ local function populate_ps_story(req,ps)
if err == sql.DONE then
--We got no story
stmnt_read:reset()
- print("No story by this name",ps.storyid)
+ log(LOG_DEBUG,"No story with id:" .. ps.storyid)
return false
end
--If we've made it here, we have a story. Populate our settings
@@ -73,41 +73,17 @@ local function get_comments(req,ps)
stmnt_comments:bind_names{
id = ps.storyid
}
- err = util.do_sql(stmnt_comments)
local comments = {}
- while err ~= sql.DONE do
- local com_author, com_isanon, com_text = unpack(stmnt_comments:get_values())
+ for com_author, com_isanon, com_text in util.sql_rows(stmnt_comments) do
table.insert(comments,{
author = com_author,
isanon = com_isanon == 1, --int to boolean
text = com_text
})
- err = stmnt_comments:step()
end
- stmnt_comments:reset()
return comments
end
---[[
-The author is viewing their own story, give them an edit button
-]]
-local function read_get_author(req,storyid,author,authorid,comments)
-
-end
-
---[[
-An author is viewing a story, allow them to post comments as themselves
-]]
-local function read_get_loggedin(req,ps)
- if ps.tauthor == ps.authorid then
- --The story exists and we're logged in as the
- --owner, display the edit button
- return read_get_author(req,ps)
- end
- return pages.read(ps)
-end
-
-
local function read_get(req)
--Pages settings
local ps = {
@@ -116,7 +92,6 @@ local function read_get(req)
path = http_request_get_path(req),
method = http_method_text(req),
}
- print("reading", ps.path)
--Get our story id
assert(string.len(ps.path) > 0,"Tried to read 0-length story id")
@@ -142,13 +117,13 @@ local function read_get(req)
local text
--normal story display
if (not ps.loggedauthor) then
- print("not author")
local cachestr = string.format("%s%s%s",
ps.host,
ps.path,
ps.show_comments and "?comments=1" or ""
)
text = cache.render(cachestr,function()
+ log(LOG_DEBUG,"Cache miss, rendering story " .. cachestr)
if not populate_ps_story(req,ps) then
return pages.nostory(ps)
end
@@ -157,13 +132,12 @@ local function read_get(req)
return output
end)
else --we are logged in, don't cache
- print("is author")
if not populate_ps_story(req,ps) then
- return pages.nostory(ps)
+ text = pages.nostory(ps)
+ else
+ ps.owner = (ps.loggedauthorid == ps.tauthor)
+ text = pages.read(ps)
end
- print("tauthor was", ps.tauthor, "while author was:",ps.author)
- ps.owner = (ps.loggedauthorid == ps.tauthor)
- text = pages.read(ps)
end
assert(text)
http_response(req,200,text)
diff --git a/src/lua/init.lua b/src/lua/init.lua
index 22983dd..2a855bc 100644
--- a/src/lua/init.lua
+++ b/src/lua/init.lua
@@ -1,4 +1,9 @@
-
+--[[
+Contains the code entrypoint, this is the first (and only) file run from kore.
+It registers a bunch of global functions that get called from kore when users
+visit particular pages. See src/smr.c for the names of the public functions.
+See conf/smr.conf for the data that can be access in each function
+]]
print("Really fast print from init.lua")
--Luarocks libraries
@@ -6,7 +11,7 @@ local et = require("etlua")
local sql = require("lsqlite3")
local zlib = require("zlib")
---stubs for overloading
+--stub for detouring
function configure(...) end
--smr code
diff --git a/src/lua/pages.lua b/src/lua/pages.lua
index e492cad..856b5c7 100644
--- a/src/lua/pages.lua
+++ b/src/lua/pages.lua
@@ -1,3 +1,7 @@
+--[[
+Compiles all the pages under src/pages/ with etlua. See the etlua documentation
+for more info (https://github.com/leafo/etlua)
+]]
local et = require("etlua")
local pagenames = {
"index",
diff --git a/src/lua/parser_imageboard.lua b/src/lua/parser_imageboard.lua
index fc2cb0f..c7b0aa1 100644
--- a/src/lua/parser_imageboard.lua
+++ b/src/lua/parser_imageboard.lua
@@ -1,3 +1,20 @@
+--[[
+A parser that approximates 8chan's markup:
+
+Surround text with double single-quotes(') to make text italic
+Surround text with triple single-quotes to make text bold
+Surround text with underscores(_) to make it underlined
+Surround text with double asterisks(*) to make it spoilered
+Surround text with tildes(~) to make it strike through
+Begin a line with a greater-than followed by a a space to make it
+>greentext
+Begin a line with a less-than followed by a space to make it
+"
else
diff --git a/src/lua/parser_plain.lua b/src/lua/parser_plain.lua
index bf67f10..789d7ac 100644
--- a/src/lua/parser_plain.lua
+++ b/src/lua/parser_plain.lua
@@ -1,3 +1,6 @@
+--[[
+A plain parser that dosen't do much
+]]
--Characters to escape in the body text
local escapes = {
["&"] = "&",
@@ -6,7 +9,7 @@ local escapes = {
['"'] = """,
["'"] = "'",
--Kinda hacky
- ["\n"] = "",
+ ["\n"] = "
",
}
local esctbl = {}
for char,_ in pairs(escapes) do
diff --git a/src/lua/parser_search.lua b/src/lua/parser_search.lua
index 0644f70..18ad0f1 100644
--- a/src/lua/parser_search.lua
+++ b/src/lua/parser_search.lua
@@ -1,7 +1,7 @@
--Grammar
local function parser(str)
- str:gsub("
+ str:gsub("")
end
diff --git a/src/lua/session.lua b/src/lua/session.lua
index b6a5c4a..cacfbeb 100644
--- a/src/lua/session.lua
+++ b/src/lua/session.lua
@@ -31,7 +31,6 @@ function session.get(req)
if err ~= sql.ROW then
return nil, "No such session by logged in users"
end
- print("get session err:",err)
local data = stmnt_get_session:get_values()
stmnt_get_session:reset()
local author = data[1]
@@ -52,15 +51,12 @@ function session.start(who)
end
local session = table.concat(session_t)
rngf:close()
- print("sessionid:",session)
- print("authorid:",who)
stmnt_insert_session:bind_names{
sessionid = session,
authorid = who
}
local err = util.do_sql(stmnt_insert_session)
stmnt_insert_session:reset()
- print("Err:",err)
assert(err == sql.DONE)
return session
end
diff --git a/src/lua/tags.lua b/src/lua/tags.lua
index 9ee026b..b922579 100644
--- a/src/lua/tags.lua
+++ b/src/lua/tags.lua
@@ -45,14 +45,13 @@ function tags.set(storyid,tags)
stmnt_drop_tags:reset()
local err
for _,tag in pairs(tags) do
- print("Looking at tag",tag)
assert(stmnt_ins_tag:bind(1,storyid) == sql.OK)
assert(stmnt_ins_tag:bind(2,tag) == sql.OK)
err = util.do_sql(stmnt_ins_tag)
stmnt_ins_tag:reset()
end
if err ~= sql.DONE then
- print("Failed to save tags, but paste and raw still went through")
+ log(LOG_CRIT,"Failed to save tags on " .. storyid)
end
end
diff --git a/src/lua/util.lua b/src/lua/util.lua
index 32da51f..f1e89b2 100644
--- a/src/lua/util.lua
+++ b/src/lua/util.lua
@@ -24,7 +24,6 @@ function util.do_sql(stmnt)
local i = 0
repeat
err = stmnt:step()
- print("After stepping, err is", err)
if err == sql.BUSY then
i = i + 1
coroutine.yield()
@@ -34,6 +33,37 @@ function util.do_sql(stmnt)
return err
end
+--[[
+Provides an iterator that loops over results in an sql statement
+or throws an error, then resets the statement after the loop is done.
+]]
+function util.sql_rows(stmnt)
+ if not stmnt then error("No statement",2) end
+ local err
+ return function()
+ err = stmnt:step()
+ if err == sql.BUSY then
+ coroutine.yield()
+ elseif err == sql.ROW then
+ return unpack(stmnt:get_values())
+ elseif err == sql.DONE then
+ stmnt:reset()
+ return nil
+ else
+ stmnt:reset()
+ local msg = string.format(
+ "SQL Iteration failed: %s : %s\n%s",
+ tostring(err),
+ db.conn:errmsg(),
+ debug.traceback()
+ )
+ log(LOG_CRIT,msg)
+ error(msg)
+ end
+
+ end
+end
+
--[[
Binds an argument to as statement with nice error reporting on failure
stmnt :: sql.stmnt - the prepared sql statemnet
@@ -120,4 +150,17 @@ function util.parse_tags(str)
return tags
end
+local function decodeentity(capture)
+ local n = tonumber(capture,16)
+ local c = string.char(n)
+ if escapes[c] then
+ return escapes[c]
+ else
+ return c
+ end
+end
+function util.decodeentities(str)
+ return string.gsub(str,"%%(%x%x)",decodeentity)
+end
+
return util