// db {{{
const Db = struct {
+ fn users(txn: lmdb.Txn) !UserList {
+ return try db.Db(UserId, User).init(txn, "users");
+ }
+ fn user_ids(txn: lmdb.Txn) !UsernameList {
+ return try db.Db(Username, UserId).init(txn, "user_ids");
+ }
+ fn sessions(txn: lmdb.Txn) !SessionList {
+ return try db.Db(SessionToken, UserId).init(txn, "sessions");
+ }
+ fn posts(txn: lmdb.Txn) !PostList {
+ return try db.Db(PostId, Post).init(txn, "posts");
+ }
fn users(txn: lmdb.Txn) !db.Db(UserId, User) {
return try db.Db(UserId, User).init(txn, "users");
}
id: UserId,
name: Username,
display_name: DisplayName,
+ description: UserDescription,
password_hash: PasswordHash,
- posts: PostList,
- following: UserList,
- followers: UserList,
+
+ posts: PostSet,
+
+ following: UserSet,
+ followers: UserSet,
post_lists: PostListList,
feeds: UserListList,
upvotes: u64 = 0,
downvotes: u64 = 0,
votes: VoteList,
- comments: PostList,
- quotes: PostList,
+ comments: PostSet,
+ quotes: PostSet,
text: PostText,
};
const SavedPostList = struct {
name: Name,
- list: PostList,
+ list: PostSet,
};
const SavedUserList = struct {
name: Name,
- list: UserList,
+ list: UserSet,
};
const Vote = struct {
const Timestamp = i64;
const Username = std.BoundedArray(u8, 32);
const DisplayName = std.BoundedArray(u8, 64);
+const UserDescription = std.BoundedArray(u8, 1024);
const PasswordHash = std.BoundedArray(u8, 128);
const SessionToken = u64;
const CookieValue = std.BoundedArray(u8, 128);
const PostText = std.BoundedArray(u8, 1024);
-const PostList = db.Set(PostId);
-const UserList = db.Set(UserId);
+const PostSet = db.Set(PostId);
+const UserSet = db.Set(UserId);
+const PostList = db.SetList(PostId, Post);
+const UserList = db.SetList(UserId, User);
+const UsernameList = db.SetList(Username, UserId);
const VoteList = db.SetList(UserId, Vote);
const PostListList = db.List(SavedPostList);
const UserListList = db.List(SavedUserList);
fn parse_enum(comptime E: type, buf: []const u8, base: u8) !E {
- return @enumFromInt(try std.fmt.parseUnsigned(@typeInfo(E).Enum.tag_type, buf, base));
+ return @enumFromInt(try std.fmt.parseUnsigned(@typeInfo(E).@"enum".tag_type, buf, base));
}
// https://developer.mozilla.org/en-US/docs/Glossary/Percent-encoding
-fn reencode(text: []const u8) !PostText {
- var result = try PostText.init(0);
+fn reencode(comptime T: type, text: []const u8) !T {
+ var result = try T.init(0);
const len = @min(text.len, 1024); // TODO: PostText length
const c = text[idx];
if (c == '+') {
try result.append(' ');
- } else if (c == '%') {
- // special case of &#...
- // assume only &#, no &#x
- if (idx + 6 < text.len and std.mem.eql(u8, text[idx .. idx + 6], "%26%23")) {
- const num_start = idx + 6;
- var num_end = num_start;
- while (num_end < text.len and std.ascii.isDigit(text[num_end])) {
- num_end += 1;
- }
+ } else if (c == '%' and idx + 2 < text.len) {
+ const allow = &[_]u8{ 0x26, 0x23, 0x3b, 0x0a };
- if (num_end + 2 < text.len and
- text[num_end] == '%' and
- text[num_end + 1] == '3' and
- std.ascii.toLower(text[num_end + 2]) == 'b')
- {
- try std.fmt.format(result.writer(), "&#{s};", .{text[num_start..num_end]});
- idx = num_end + 2;
- continue;
- }
+ const escaped_value = std.fmt.parseUnsigned(u8, text[idx + 1 .. idx + 3], 16) catch continue;
+
+ if (escaped_value == 0x0d) {
+ try std.fmt.format(result.writer(), "<br />", .{});
+ } else if (std.mem.indexOfScalar(u8, allow, escaped_value) != null) {
+ try std.fmt.format(result.writer(), "{c}", .{escaped_value});
+ } else {
+ try std.fmt.format(result.writer(), "&#x{x};", .{escaped_value});
}
- try std.fmt.format(result.writer(), "&#x{s};", .{text[idx + 1 .. idx + 3]});
idx += 2;
} else {
try result.append(c);
const Chirp = struct {
const PostsPerPage = 10;
const UsersPerPage = 10;
+ var HashBuffer = std.mem.zeroes([1024 * 1024 * 50]u8);
pub fn hash_password(password: []const u8) !PasswordHash {
var hash_buffer = try PasswordHash.init(128);
// TODO: choose buffer size
- // TODO: dont allocate on stack, maybe zero memory?
- var buffer: [1024 * 10]u8 = undefined;
- var alloc = std.heap.FixedBufferAllocator.init(&buffer);
+ var alloc = std.heap.FixedBufferAllocator.init(&HashBuffer);
// TODO: choose limits
const result = try std.crypto.pwhash.argon2.strHash(password, .{
.allocator = alloc.allocator(),
- .params = std.crypto.pwhash.argon2.Params.fromLimits(1000, 1024),
+ .params = std.crypto.pwhash.argon2.Params.owasp_2id,
}, hash_buffer.slice());
try hash_buffer.resize(result.len);
}
pub fn verify_password(password: []const u8, hash: PasswordHash) bool {
- var buffer: [1024 * 10]u8 = undefined;
- var alloc = std.heap.FixedBufferAllocator.init(&buffer);
+ var alloc = std.heap.FixedBufferAllocator.init(&HashBuffer);
if (std.crypto.pwhash.argon2.strVerify(hash.constSlice(), password, .{
.allocator = alloc.allocator(),
.id = user_id,
.name = username_array,
.display_name = display_name,
+ .description = try UserDescription.init(0),
.password_hash = try hash_password(password),
- .posts = try PostList.init(txn),
- .following = try UserList.init(txn),
- .followers = try UserList.init(txn),
+ .posts = try PostSet.init(txn),
+ .following = try UserSet.init(txn),
+ .followers = try UserSet.init(txn),
.post_lists = try PostListList.init(txn),
.feeds = try UserListList.init(txn),
});
try sessions.del(session_token);
}
- fn append_post(env: lmdb.Env, user_id: UserId, post_list: PostList, parent_id: ?PostId, quote_id: ?PostId, text: []const u8) !PostId {
+ fn append_post(env: lmdb.Env, user_id: UserId, post_list: PostSet, parent_id: ?PostId, quote_id: ?PostId, text: []const u8) !PostId {
var post_id: PostId = undefined;
// TODO: do this in one commit
const posts = try Db.posts(txn);
post_id = try db.Prng.gen(posts.dbi, PostId);
- const decoded_text = try reencode(text);
+ const decoded_text = try reencode(PostText, text);
try posts.put(post_id, Post{
.id = post_id,
.parent_id = parent_id,
.user_id = user_id,
.time = std.time.timestamp(),
.votes = try VoteList.init(txn),
- .comments = try PostList.init(txn),
- .quotes = try PostList.init(txn),
+ .comments = try PostSet.init(txn),
+ .quotes = try PostSet.init(txn),
.text = decoded_text,
});
}
return struct {
const Self = @This();
- const IterateResult = @typeInfo(@TypeOf(T.View.Iterator.next)).Fn.return_type.?;
+ const IterateResult = T.Base.View.Iterator.Result;
res: *http.Response,
view: T.View,
per_page: u64,
- it: T.View.Iterator,
- starting_idx: ?T.Key,
+ it: T.Base.View.Iterator,
+ starting_idx: ?T.Base.Key,
count: u64 = 0,
pub fn init(res: *http.Response, view: T.View, per_page: u64) !Self {
var it = view.reverse_iterator();
if (res.req.get_param("starting_at")) |starting_at_str| {
- it.idx = try parse_enum(T.Key, starting_at_str, 16);
- }
-
- if (it.idx == null) {
- return error.InvalidIterator;
+ it.idx = try parse_enum(T.Base.Key, starting_at_str, 16);
}
return .{
.view = view,
.per_page = per_page,
.it = it,
- .starting_idx = it.idx.?,
+ .starting_idx = it.idx,
};
}
- pub fn next(self: *Self) IterateResult {
+ pub fn next(self: *Self) ?IterateResult {
if (self.it.next()) |kv| {
if (self.count < self.per_page) {
self.count += 1;
pub fn write_navigation(self: *Self) !void {
const next_idx = self.it.next();
- if (self.view.head.last != self.starting_idx) {
+ if (self.view.base.head.last != self.starting_idx) {
var prev_it = self.view.iterator();
prev_it.idx = self.starting_idx.?;
var oldest_idx = self.starting_idx.?;
inline for (inputs) |input| {
switch (@typeInfo(@TypeOf(input))) {
- .Struct => {
- try res.write("<input ", .{});
- try res.write(input[0], input[1]);
- try res.write(" />", .{});
+ .@"struct" => |s| {
+ if (s.fields.len == 3) {
+ try res.write("<{s} ", .{input[0]});
+ try res.write(input[1], input[2]);
+ try res.write("></{s}>", .{input[0]});
+ } else {
+ try res.write("<input ", .{});
+ try res.write(input[0], input[1]);
+ try res.write(" />", .{});
+ }
},
else => {
try res.write("<input ", .{});
\\ form {
\\ display: inline-block;
\\ }
+ \\ body {
+ \\ margin:40px auto;max-width:650px;line-height:1.6;font-size:18px;color:#444;padding:0 10px;
+ \\ }
+ \\ h1,h2,h3{line-height:1.2}
\\</style>
\\</head>
\\<body>
// TODO: mark lists that already contain post
while (it.next()) |kv| {
const name = kv.val.name;
- const id = kv.val.list.idx.?;
+ const id = kv.val.list.base.idx.?;
const list_view = try kv.val.list.open(txn);
try res.write("<option value=\"{x}\">{s}{s}</option>", .{ id, name.constSlice(), if (list_view.has(post_id) catch false) " *" else "" });
}
try res.write("</select>", .{});
- try res.write("<input type=\"hidden\" name=\"post_id\" value=\"{x}\"></input>", .{@intFromEnum(post_id)});
- try res.write("<input type=\"submit\" value=\"Save\"></input>", .{});
+ try res.write("<input type=\"hidden\" name=\"post_id\" value=\"{x}\" />", .{@intFromEnum(post_id)});
+ try res.write("<input type=\"submit\" value=\"Save\" />", .{});
try res.write("</form>", .{});
}
try res.write("<br /><br />", .{});
try html_form(res, "/comment", .{
.{ "type=\"hidden\" value=\"{x}\" name=\"post_id\"", .{@intFromEnum(post.id)} },
- "type=\"text\" name=\"text\" placeholder=\"Text\"",
+ .{ "textarea", "type=\"text\" name=\"text\" placeholder=\"Text\"", .{} },
"type=\"submit\" value=\"Comment\"",
});
try res.write("<br />", .{});
var it = feeds_view.iterator();
while (it.next()) |kv| {
const name = kv.val.name;
- const id = kv.val.list.idx.?;
+ const id = kv.val.list.base.idx.?;
const list_view = try kv.val.list.open(txn);
try res.write("<option value=\"{x}\">{s}{s}</option>", .{ id, name.constSlice(), if (list_view.has(user.id) catch false) " *" else "" });
}
try res.write("</select>", .{});
- try res.write("<input type=\"hidden\" name=\"user_id\" value=\"{x}\"></input>", .{@intFromEnum(user.id)});
- try res.write("<input type=\"submit\" value=\"Add to feed\"></input>", .{});
+ try res.write("<input type=\"hidden\" name=\"user_id\" value=\"{x}\" />", .{@intFromEnum(user.id)});
+ try res.write("<input type=\"submit\" value=\"Add to feed\" />", .{});
try res.write("</form>", .{});
}
try res.write(
, .{});
}
+ if (user.description.len > 0) {
+ try res.write(
+ \\<div style="padding-left: 5px; border-left: 1px solid grey;">
+ // \\« {s} »
+ \\<i>{s}</i>
+ \\</div>
+ , .{user.description.constSlice()});
+ }
+
try res.write("<br />", .{});
}
-fn write_posts(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_list: PostList, options: struct {
+fn write_posts(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, post_list: PostSet, options: struct {
show_posts: bool,
show_quotes: bool,
show_comments: bool,
}) !void {
const posts_view = try post_list.open(txn);
- var paginate = try Paginate(PostList).init(res, posts_view, Chirp.PostsPerPage);
+ var paginate = try Paginate(PostSet).init(res, posts_view, Chirp.PostsPerPage);
while (paginate.next()) |post_id| {
const posts = try Db.posts(txn);
try paginate.write_navigation();
}
-fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_list: UserList) !void {
+fn write_timeline(res: *http.Response, txn: lmdb.Txn, logged_in: ?Login, user_list: UserSet) !void {
+ // TODO: paginate
const users = try Db.users(txn);
const posts = try Db.posts(txn);
var prev_newest_post: ?Post = null;
const following = try user_list.open(txn);
+ if (following.len() == 0) {
+ try res.write("Empty timeline (no users)", .{});
+ return;
+ }
while (true) {
var newest_post: ?Post = null;
try res.write("<br />", .{});
}
}
+fn write_frontpage(res: *http.Response, txn: lmdb.Txn) !void {
+ const posts = try Db.posts(txn);
+ var counter: u64 = 0;
+ var it = try posts.reverse_iterator();
+ while (it.next()) |p| {
+ if (p.val.parent_id == null and p.val.quote_id == null) {
+ try write_post(res, txn, null, p.key, .{ .recurse = 1 });
+ counter += 1;
+ }
+
+ if (counter >= 10) break;
+ }
+}
fn write_user(res: *http.Response, txn: lmdb.Txn, user_id: UserId) !void {
const users = try Db.users(txn);
const user = try users.get(user_id);
fn handle(self: Self) !bool {
const ti = @typeInfo(Self);
- inline for (ti.Struct.decls) |f_decl| {
+ inline for (ti.@"struct".decls) |f_decl| {
const has_arg = f_decl.name.len > 1 and f_decl.name[f_decl.name.len - 1] == '/';
const match = if (has_arg) std.mem.startsWith(u8, self.req.target, f_decl.name) else std.mem.eql(u8, self.req.target, f_decl.name);
if (match) {
const f = @field(Self, f_decl.name);
const fi = @typeInfo(@TypeOf(f));
- if (fi.Fn.params.len == 1) {
+ if (fi.@"fn".params.len == 1) {
try @call(.auto, f, .{self});
} else {
- const arg_type = fi.Fn.params[1].type.?;
+ const arg_type = fi.@"fn".params[1].type.?;
const arg_info = @typeInfo(arg_type);
var arg: arg_type = undefined;
- const field = arg_info.Struct.fields[0];
+ const field = arg_info.@"struct".fields[0];
if (self.req.target.len <= f_decl.name.len) {
return error.NoArgProvided;
}
const field_ti = @typeInfo(field.type);
switch (field_ti) {
// TODO: maybe handle BoundedArray?
- .Int => {
+ .int => {
@field(arg, field.name) = try std.fmt.parseUnsigned(field.type, str, 16);
},
- .Enum => {
+ .@"enum" => {
@field(arg, field.name) = try parse_enum(field.type, str, 16);
},
else => {
const following_view = try user.following.open(self.txn);
- var paginate = try Paginate(UserList).init(self.res, following_view, Chirp.UsersPerPage);
+ var paginate = try Paginate(UserSet).init(self.res, following_view, Chirp.UsersPerPage);
try self.res.write(
\\<h2><a href="/user/{s}">{s}</a> follows:</h2>
const user = try users.get(user_id);
const followers_view = try user.followers.open(self.txn);
- var paginate = try Paginate(UserList).init(self.res, followers_view, Chirp.UsersPerPage);
+ var paginate = try Paginate(UserSet).init(self.res, followers_view, Chirp.UsersPerPage);
try self.res.write(
\\<h2><a href="/user/{s}">{s}</a> followers:</h2>
try html_form(self.res, "/quote", .{
.{ "type=\"hidden\" name=\"referer\" value=\"{s}\"", .{referer} },
.{ "type=\"hidden\" name=\"post_id\" value=\"{x}\"", .{@intFromEnum(post.id)} },
- "type=\"text\" name=\"text\" placeholder=\"Text\" autofocus",
+ .{ "textarea", "type=\"text\" name=\"text\" placeholder=\"Text\" autofocus", .{} },
"type=\"submit\" value=\"Quote\"",
});
try self.res.write("<br />", .{});
.show_comments = false,
});
}
- pub fn @"/list/"(self: Self, args: struct { list_id: PostList.Index }) !void {
- try write_posts(self.res, self.txn, self.logged_in, PostList{ .idx = args.list_id }, .{
+ pub fn @"/list/"(self: Self, args: struct { list_id: PostSet.Base.Index }) !void {
+ try write_posts(self.res, self.txn, self.logged_in, PostSet{ .base = .{ .idx = args.list_id } }, .{
.show_posts = true,
.show_quotes = true,
.show_comments = true,
const post_list = kv.val.list;
try self.res.write(
\\<a href="/list/{x}">{s}</a>
- , .{ post_list.idx.?, name.constSlice() });
+ , .{ post_list.base.idx.?, name.constSlice() });
try html_form(self.res, "/delete_list", .{
.{ "type=\"hidden\" name=\"list_id\" value=\"{x}\"", .{kv.key} },
"type=\"submit\" value=\"Delete\"",
try self.res.write("not logged in", .{});
}
}
- pub fn @"/feed/"(self: Self, args: struct { feed_id: UserList.Index }) !void {
- try write_timeline(self.res, self.txn, self.logged_in, UserList{ .idx = args.feed_id });
+ pub fn @"/feed/"(self: Self, args: struct { feed_id: UserSet.Base.Index }) !void {
+ try write_timeline(self.res, self.txn, self.logged_in, UserSet{ .base = .{ .idx = args.feed_id } });
}
pub fn @"/feeds"(self: Self) !void {
if (self.logged_in) |login| {
const user_list = kv.val.list;
try self.res.write(
\\<a href="/feed/{x}">{s}</a>
- , .{ user_list.idx.?, name.constSlice() });
+ , .{ user_list.base.idx.?, name.constSlice() });
try html_form(self.res, "/delete_feed", .{
.{ "type=\"hidden\" name=\"list_id\" value=\"{x}\"", .{kv.key} },
"type=\"submit\" value=\"Delete\"",
try html_form(self.res, "/post", .{
.{ "type=\"hidden\" name=\"referer\" value=\"{s}\"", .{referer} },
- "type=\"text\" name=\"text\" placeholder=\"Text\" autofocus",
+ .{ "textarea", "type=\"text\" name=\"text\" placeholder=\"Text\" autofocus", .{} },
"type=\"submit\" value=\"Post\"",
});
} else {
.{ "type=\"text\" name=\"display_name\" placeholder=\"{s}\"", .{login.user.display_name.constSlice()} },
"type=\"submit\" value=\"Change\"",
});
+ try self.res.write("<br />Description: ", .{});
+ try html_form(self.res, "/set_description", .{
+ .{ "textarea", "type=\"text\" name=\"description\" placeholder=\"{s}\"", .{login.user.description.constSlice()} },
+ "type=\"submit\" value=\"Change\"",
+ });
try self.res.write("<br />Password: ", .{});
try html_form(self.res, "/set_password", .{
"type=\"text\" name=\"password\"",
} else {
// TODO: generic home
try self.res.write("Homepage", .{});
+ // try write_frontpage(self.res, self.txn);
}
}
};
pub fn handle(self: Self) !bool {
const ti = @typeInfo(Self);
- inline for (ti.Struct.decls) |f_decl| {
+ inline for (ti.@"struct".decls) |f_decl| {
if (std.mem.eql(u8, f_decl.name, self.req.target)) {
const f = @field(Self, f_decl.name);
const fi = @typeInfo(@TypeOf(f));
- if (fi.Fn.params.len == 1) {
+ if (fi.@"fn".params.len == 1) {
_ = try @call(.auto, f, .{self});
} else {
- const args_type = fi.Fn.params[fi.Fn.params.len - 1].type.?;
+ const args_type = fi.@"fn".params[fi.@"fn".params.len - 1].type.?;
const argsi = @typeInfo(args_type);
var args: args_type = undefined;
- inline for (argsi.Struct.fields) |field| {
+ inline for (argsi.@"struct".fields) |field| {
const str = self.req.get_value(field.name) orelse return error.ArgNotFound;
const field_ti = @typeInfo(field.type);
switch (field_ti) {
- .Int => {
+ .int => {
@field(args, field.name) = try std.fmt.parseUnsigned(field.type, str, 16);
},
- .Enum => {
+ .@"enum" => {
@field(args, field.name) = try parse_enum(field.type, str, 16);
},
else => {
user.display_name = display_name;
try users.put(login.user.id, user);
}
+ pub fn @"/set_description"(self: Self, args: struct { description: []const u8 }) !void {
+ const login = self.logged_in orelse return error.NotLoggedIn;
+ const description = try reencode(UserDescription, args.description);
+
+ const txn = try self.env.txn();
+ defer txn.commit() catch {};
+
+ const users = try Db.users(txn);
+ var user = login.user;
+ user.description = description;
+ try users.put(login.user.id, user);
+ }
pub fn @"/set_password"(self: Self, args: struct { password: []const u8 }) !void {
const login = self.logged_in orelse return error.NotLoggedIn;
// TODO: decode name
var txn = try self.env.txn();
- const postlist = try PostList.init(txn);
+ const postlist = try PostSet.init(txn);
try txn.commit();
txn = try self.env.txn();
try txn.commit();
}
}
- pub fn @"/delete_list"(self: Self, args: struct { list_id: PostList.Index }) !void {
+ pub fn @"/delete_list"(self: Self, args: struct { list_id: PostSet.Base.Index }) !void {
if (self.logged_in) |login| {
- var post_list: ?PostList = null;
+ var post_list: ?PostSet = null;
{
const txn = try self.env.txn();
defer txn.commit() catch {};
}
}
}
- pub fn @"/list_add"(self: Self, args: struct { list_id: PostList.Index, post_id: PostId }) !void {
+ pub fn @"/list_add"(self: Self, args: struct { list_id: PostSet.Base.Index, post_id: PostId }) !void {
if (self.logged_in) |login| {
_ = login;
const txn = try self.env.txn();
defer txn.commit() catch {};
- const post_list = PostList{ .idx = args.list_id };
+ const post_list = PostSet{ .base = .{ .idx = args.list_id } };
var post_list_view = try post_list.open(txn);
if (try post_list_view.has(args.post_id)) {
try post_list_view.del(args.post_id);
const name = try Name.fromSlice(name_str);
var txn = try self.env.txn();
- const userlist = try UserList.init(txn);
+ const userlist = try UserSet.init(txn);
try txn.commit();
txn = try self.env.txn();
try txn.commit();
}
}
- pub fn @"/delete_feed"(self: Self, args: struct { list_id: UserList.Index }) !void {
+ pub fn @"/delete_feed"(self: Self, args: struct { list_id: UserSet.Base.Index }) !void {
if (self.logged_in) |login| {
- var user_list: ?UserList = null;
+ var user_list: ?UserSet = null;
{
const txn = try self.env.txn();
}
}
}
- pub fn @"/feed_add"(self: Self, args: struct { feed_id: UserList.Index, user_id: UserId }) !void {
+ pub fn @"/feed_add"(self: Self, args: struct { feed_id: UserSet.Base.Index, user_id: UserId }) !void {
if (self.logged_in) |login| {
_ = login;
const txn = try self.env.txn();
defer txn.commit() catch {};
- const user_list = UserList{ .idx = args.feed_id };
+ const user_list = UserSet{ .base = .{ .idx = args.feed_id } };
var user_list_view = try user_list.open(txn);
if (try user_list_view.has(args.user_id)) {
try user_list_view.del(args.user_id);
server.wait();
while (true) {
const req = (server.next_request(&req_buffer) catch break) orelse break;
- handle_request(env, req) catch {
- try handle_error(env, req);
- };
+ // handle_request(env, req) catch {
+ // try handle_error(env, req);
+ // };
+ try handle_request(env, req);
}
}
// const ThreadCount = 1;
projects / chirp / blobdiff