X-Git-Url: https://gitweb.ps.run/chirp/blobdiff_plain/0b2f4de9c1db5ec1059f6cd9b8c44e07f3af0b51..7d44a5163fd261dcb08282e15da9666e00a4f4b0:/src/main.zig?ds=sidebyside
diff --git a/src/main.zig b/src/main.zig
index 1871dcc..6647619 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,138 +1,57 @@
const std = @import("std");
const lmdb = @import("lmdb");
+const http = @import("http.zig");
// db {{{
-const Db = struct {
- const Self = @This();
-
- env: ?*lmdb.MDB_env = undefined,
- txn: ?*lmdb.MDB_txn = undefined,
- dbi: lmdb.MDB_dbi = undefined,
- prng: std.Random.DefaultPrng = std.Random.DefaultPrng.init(0),
+const Prng = struct {
+ var prng: std.Random.DefaultPrng = std.Random.DefaultPrng.init(0);
- pub fn gen_id(self: *Self) Id {
- var id = self.prng.next();
+ pub fn gen_id(dbi: anytype) Id {
+ var id = Prng.prng.next();
- while (self.has(id)) {
- id = self.prng.next();
+ while (dbi.has(id)) {
+ id = Prng.prng.next();
}
return id;
}
- pub fn open(self: *Self, name: [*c]const u8) void {
- _ = lmdb.mdb_env_create(&self.env);
- _ = lmdb.mdb_env_set_maxdbs(self.env, 10);
- _ = lmdb.mdb_env_set_mapsize(self.env, 1024 * 1024 * 1);
- _ = lmdb.mdb_env_open(self.env, name, lmdb.MDB_WRITEMAP, 0o664);
- // _ = lmdb.mdb_env_open(self.env, name, lmdb.MDB_NOSYNC | lmdb.MDB_WRITEMAP, 0o664);
- }
-
- pub fn close(self: *Self) void {
- lmdb.mdb_env_close(self.env);
- }
-
- pub fn begin(self: *Self, name: [*c]const u8) void {
- switch (lmdb.mdb_txn_begin(self.env, null, 0, &self.txn)) {
- 0 => {},
- else => |err| {
- std.debug.print("txn err: {}\n", .{err});
- },
- }
-
- // TODO: lmdb.MDB_INTEGERKEY?
- _ = lmdb.mdb_dbi_open(self.txn, name, lmdb.MDB_CREATE, &self.dbi);
- }
-
- pub fn commit(self: *Self) void {
- switch (lmdb.mdb_txn_commit(self.txn)) {
- 0 => {},
- lmdb.MDB_MAP_FULL => {
- std.debug.print("resize\n", .{});
- _ = lmdb.mdb_env_set_mapsize(self.env, 0);
- },
- else => |err| {
- std.debug.print("commit err: {}\n", .{err});
- },
+ pub fn gen_str(dbi: anytype, comptime len: usize) [len]u8 {
+ var buf: [len / 2]u8 = undefined;
+ var res: [len]u8 = undefined;
+ Prng.prng.fill(&buf);
+ for (0..len / 2) |i| {
+ res[i * 2 + 0] = 'a' + (buf[i] % 16);
+ res[i * 2 + 1] = 'a' + (buf[i] >> 4 % 16);
}
- // TODO: necessary?
- lmdb.mdb_dbi_close(self.env, self.dbi);
- }
-
- pub fn sync(self: *Self) void {
- switch (lmdb.mdb_env_sync(self.env, 1)) {
- 0 => {},
- else => |err| {
- std.debug.print("sync err: {}\n", .{err});
- },
+ while (dbi.has(res)) {
+ Prng.prng.fill(&buf);
+ for (0..len / 2) |i| {
+ res[i * 2 + 0] = 'a' + (buf[i] % 16);
+ res[i * 2 + 1] = 'a' + (buf[i] >> 4 % 16);
+ }
}
- }
- pub fn put(self: *Self, key: anytype, value: anytype) void {
- lmdb.put(self.txn, self.dbi, key, value);
+ return res;
}
+};
- pub fn get(self: *Self, key: anytype, comptime T: type) ?T {
- return lmdb.get(self.txn, self.dbi, key, T);
+const Db = struct {
+ fn users(txn: *const lmdb.Txn) !lmdb.Dbi(Id, User) {
+ return try txn.dbi("users", Id, User);
}
-
- pub fn del(self: *Self, key: anytype) void {
- lmdb.del(self.txn, self.dbi, key);
+ fn user_ids(txn: *const lmdb.Txn) !lmdb.Dbi(Username, Id) {
+ return try txn.dbi("user_ids", Username, Id);
}
-
- pub fn has(self: *Self, key: anytype) bool {
- return lmdb.has(self.txn, self.dbi, key);
+ fn sessions(txn: *const lmdb.Txn) !lmdb.Dbi(SessionToken, Id) {
+ return try txn.dbi("sessions", SessionToken, Id);
}
};
// }}}
-// http stuff {{{
-
-pub fn redirect(req: *std.http.Server.Request, location: []const u8) !void {
- try req.respond("", .{ .status = .see_other, .extra_headers = &.{.{ .name = "Location", .value = location }} });
-}
-
-pub fn get_body(req: *std.http.Server.Request) []const u8 {
- return req.server.read_buffer[req.head_end .. req.head_end + (req.head.content_length orelse 0)];
-}
-
-pub fn get_value(req: *std.http.Server.Request, name: []const u8) ?[]const u8 {
- const body = get_body(req);
- if (std.mem.indexOf(u8, body, name)) |name_index| {
- if (std.mem.indexOfScalarPos(u8, body, name_index, '=')) |eql_index| {
- if (std.mem.indexOfScalarPos(u8, body, name_index, '&')) |amp_index| {
- return body[eql_index + 1 .. amp_index];
- }
-
- return body[eql_index + 1 .. body.len];
- }
- }
- return null;
-}
-
-pub fn get_cookie(req: *std.http.Server.Request, name: []const u8) ?CookieValue {
- var header_it = req.iterateHeaders();
- while (header_it.next()) |header| {
- if (std.mem.eql(u8, header.name, "Cookie")) {
- if (std.mem.indexOf(u8, header.value, name)) |name_index| {
- if (std.mem.indexOfScalarPos(u8, header.value, name_index, '=')) |eql_index| {
- if (std.mem.indexOfPos(u8, header.value, name_index, "; ")) |semi_index| {
- return CookieValue.fromSlice(header.value[eql_index + 1 .. semi_index]) catch null;
- }
-
- return CookieValue.fromSlice(header.value[eql_index + 1 .. header.value.len]) catch null;
- }
- }
- }
- }
- return null;
-}
-
-// }}}
-
// content {{{
const User = struct {
@@ -141,10 +60,12 @@ const User = struct {
password_hash: PasswordHash,
};
+const SessionTokenLen = 16;
+
const Id = u64;
const Username = std.BoundedArray(u8, 16);
const PasswordHash = std.BoundedArray(u8, 128);
-const SessionToken = u64;
+const SessionToken = [SessionTokenLen]u8;
const CookieValue = std.BoundedArray(u8, 128);
pub fn hash_password(password: []const u8) !PasswordHash {
@@ -180,235 +101,311 @@ pub fn verify_password(password: []const u8, hash: PasswordHash) bool {
}
}
-pub fn register_user(db: *Db, username: []const u8, password: []const u8) !void {
+pub fn register_user(env: *lmdb.Env, username: []const u8, password: []const u8) !bool {
const username_array = try Username.fromSlice(username);
- db.begin("users");
- const user_id = db.gen_id();
- db.put(user_id, User{
- .username = username_array,
- .password_hash = try hash_password(password),
- });
- db.commit();
-
- db.begin("ids");
- db.put(username_array.buffer, user_id);
- db.commit();
+ const txn = try env.txn();
+ defer {
+ txn.commit();
+ env.sync();
+ }
- std.debug.print("id: {}\n", .{user_id});
+ const users = try Db.users(&txn);
+ const user_ids = try Db.user_ids(&txn);
- db.sync();
-}
+ if (user_ids.has(username_array)) {
+ return false;
+ } else {
+ const user_id = Prng.gen_id(users);
+ users.put(user_id, User{
+ .username = username_array,
+ .password_hash = try hash_password(password),
+ });
-pub fn login_user(db: *Db, username: []const u8, password: []const u8) ?SessionToken {
- const username_array = Username.fromSlice(username) catch return null;
+ user_ids.put(username_array, user_id);
- db.begin("ids");
- const user_id = db.get(username_array.buffer, Id) orelse return null;
- std.debug.print("id: {}\n", .{user_id});
- // TODO: maybe no commit?
- db.commit();
+ return true;
+ }
+}
- db.begin("users");
- const user = db.get(user_id, User) orelse return null;
- db.commit();
+pub fn login_user(env: *lmdb.Env, username: []const u8, password: []const u8) !SessionToken {
+ const username_array = try Username.fromSlice(username);
- if (verify_password(password, user.password_hash)) {
- db.begin("sessions");
- const session_token = db.gen_id();
- db.put(session_token, user_id);
- db.commit();
+ const txn = try env.txn();
+ defer {
+ txn.commit();
+ env.sync();
+ }
- db.sync();
+ const user_ids = try Db.user_ids(&txn);
+ const user_id = user_ids.get(username_array) orelse return error.UnknownUsername;
+ std.debug.print("id: {}\n", .{user_id});
- return session_token;
+ const users = try Db.users(&txn);
+ if (users.get(user_id)) |user| {
+ if (verify_password(password, user.password_hash)) {
+ const sessions = try Db.sessions(&txn);
+ const session_token = Prng.gen_str(sessions, SessionTokenLen);
+ sessions.put(session_token, user_id);
+ return session_token;
+ } else {
+ return error.IncorrectPassword;
+ }
} else {
- return null;
+ return error.UserNotFound;
}
}
-fn logout_user(db: *Db, session_token: SessionToken) void {
- db.begin("sessions");
- db.del(session_token);
- db.commit();
+fn logout_user(env: *lmdb.Env, session_token: SessionToken) !void {
+ const txn = try env.txn();
+ defer {
+ txn.commit();
+ env.sync();
+ }
+
+ const sessions = try Db.sessions(&txn);
+ sessions.del(session_token);
}
-fn get_session_user(db: *Db, session_token: SessionToken) ?User {
- db.begin("sessions");
- const user_id = db.get(session_token, Id) orelse return null;
- db.commit();
+fn get_session_user(env: *lmdb.Env, session_token: SessionToken) !User {
+ const txn = try env.txn();
+ defer txn.abort();
- db.begin("users");
- const user = db.get(user_id, User) orelse return null;
- db.commit();
+ const sessions = try Db.sessions(&txn);
+ const users = try Db.users(&txn);
- return user;
+ if (sessions.get(session_token)) |user_id| {
+ return users.get(user_id) orelse error.UnknownUser;
+ } else {
+ return error.SessionNotFound;
+ }
}
// }}}
-fn list_users(db: *Db) void {
- _ = lmdb.mdb_txn_begin(db.env, null, 0, &db.txn);
+fn list_users(env: *lmdb.Env) !void {
+ const txn = try env.txn();
+ defer txn.abort();
- _ = lmdb.mdb_dbi_open(db.txn, "users", lmdb.MDB_CREATE, &db.dbi);
+ // const users = try Db.users(&txn);
+ const users = try txn.dbi("users", Id, User);
+ var cursor = try users.cursor();
- var cursor: ?*lmdb.MDB_cursor = undefined;
- _ = lmdb.mdb_cursor_open(db.txn, db.dbi, &cursor);
+ var key: Id = undefined;
+ var user_maybe = cursor.get(&key, .First);
- var key: lmdb.MDB_val = undefined;
- var val: lmdb.MDB_val = undefined;
- var result = lmdb.mdb_cursor_get(cursor, &key, &val, lmdb.MDB_FIRST);
+ while (user_maybe) |*user| {
+ std.debug.print("[{}] {s}\n", .{ key, user.username.constSlice() });
- while (result != lmdb.MDB_NOTFOUND) {
- const user_id = @as(*align(1) Id, @ptrCast(key.mv_data.?)).*;
- const user = @as(*align(1) User, @ptrCast(val.mv_data.?)).*;
+ user_maybe = cursor.get(&key, .Next);
+ }
+}
+fn list_user_ids(env: *lmdb.Env) !void {
+ const txn = try env.txn();
+ defer txn.abort();
- std.debug.print("[{}] {s}\n", .{ user_id, user.username.constSlice() });
+ const user_ids = try Db.user_ids(&txn);
+ var cursor = try user_ids.cursor();
- result = lmdb.mdb_cursor_get(cursor, &key, &val, lmdb.MDB_NEXT);
+ var key: Username = undefined;
+ var user_id_maybe = cursor.get(&key, .First);
+
+ while (user_id_maybe) |user_id| {
+ std.debug.print("[{s}] {}\n", .{ key.constSlice(), user_id });
+
+ user_id_maybe = cursor.get(&key, .Next);
}
+}
+
+fn list_sessions(env: *lmdb.Env) !void {
+ const txn = try env.txn();
+ defer txn.abort();
+
+ const sessions = try Db.sessions(&txn);
+ var cursor = try sessions.cursor();
- _ = lmdb.mdb_cursor_close(cursor);
+ var key: SessionToken = undefined;
+ var user_id_maybe = cursor.get(&key, .First);
- _ = lmdb.mdb_dbi_close(db.env, db.dbi);
+ while (user_id_maybe) |user_id| {
+ std.debug.print("[{s}] {}\n", .{ key, user_id });
- _ = lmdb.mdb_txn_commit(db.txn);
+ user_id_maybe = cursor.get(&key, .Next);
+ }
}
+const ReqBufferSize = 4096;
+const ResHeadBufferSize = 4096;
+const ResBodyBufferSize = 4096;
+
pub fn main() !void {
// server
- const address = try std.net.Address.resolveIp("::", 8080);
-
- var server = try address.listen(.{
- .reuse_address = true,
- });
+ var server = try http.Server.init("::", 8080);
defer server.deinit();
// lmdb
- var db = Db{};
- db.open("./db");
- defer db.close();
+ var env = lmdb.Env.open("db", 1024 * 100);
+ defer env.close();
+
+ std.debug.print("Users:\n", .{});
+ try list_users(&env);
+ std.debug.print("User IDs:\n", .{});
+ try list_user_ids(&env);
+ std.debug.print("Sessions:\n", .{});
+ try list_sessions(&env);
+
+ try handle_connection(&server, &env);
+ // const ThreadCount = 1;
+ // var ts: [ThreadCount]std.Thread = undefined;
+
+ // for (0..ThreadCount) |i| {
+ // ts[i] = try std.Thread.spawn(.{}, handle_connection, .{ &server, &env });
+ // }
+ // for (0..ThreadCount) |i| {
+ // ts[i].join();
+ // }
+
+ std.debug.print("done\n", .{});
+}
- list_users(&db);
+fn handle_connection(server: *http.Server, env: *lmdb.Env) !void {
+ // TODO: static?
+ var req_buffer: [ReqBufferSize]u8 = undefined;
+ var res_head_buffer: [ResHeadBufferSize]u8 = undefined;
+ var res_body_buffer: [ResBodyBufferSize]u8 = undefined;
accept: while (true) {
- const conn = try server.accept();
-
- std.debug.print("new connection: {}\n", .{conn});
+ server.wait();
- var read_buffer: [1024]u8 = undefined;
- var http_server = std.http.Server.init(conn, &read_buffer);
+ while (try server.next_request(&req_buffer)) |req| {
+ // std.debug.print("[{}]: {s}\n", .{ req.method, req.target });
- while (http_server.state == .ready) {
- var req = http_server.receiveHead() catch continue;
-
- std.debug.print("[{}]: {s}\n", .{ req.head.method, req.head.target });
+ // reponse
+ var res = http.Response.init(req.fd, &res_head_buffer, &res_body_buffer);
+ // check session token
var logged_in: ?struct {
user: User,
session_token: SessionToken,
} = null;
- if (get_cookie(&req, "session_token")) |session_token_str| {
- const session_token = try std.fmt.parseUnsigned(SessionToken, session_token_str.constSlice(), 10);
- if (get_session_user(&db, session_token)) |user| {
+ if (req.get_cookie("session_token")) |session_token_str| {
+ var session_token: SessionToken = undefined;
+ std.mem.copyForwards(u8, &session_token, session_token_str);
+ // const session_token = try std.fmt.parseUnsigned(SessionToken, session_token_str, 10);
+ // const session_token = std.mem.bytesToValue(SessionToken, session_token_str);
+ if (get_session_user(env, session_token)) |user| {
logged_in = .{
.user = user,
.session_token = session_token,
};
+ } else |err| {
+ std.debug.print("get_session_user err: {}\n", .{err});
+
+ try res.add_header(
+ "Set-Cookie",
+ .{"session_token=deleted; Expires=Thu, 01 Jan 1970 00:00:00 GMT"},
+ );
}
- // TODO: delete session token
- // TODO: add changeable headers (set, delete cookies)
}
// html
- if (req.head.method == .GET) {
- if (std.mem.eql(u8, req.head.target, "/register")) {
- try req.respond(
+ if (req.method == .GET) {
+ if (std.mem.eql(u8, req.target, "/register")) {
+ try res.write(
\\
, .{});
- } else if (std.mem.eql(u8, req.head.target, "/login")) {
- try req.respond(
+ try res.send();
+ } else if (std.mem.eql(u8, req.target, "/login")) {
+ try res.write(
\\
, .{});
+ try res.send();
} else {
if (logged_in) |login| {
- var response_buffer = try std.BoundedArray(u8, 1024).init(0);
- try std.fmt.format(response_buffer.writer(),
+ try res.write(
\\Home
\\
\\
, .{login.user.username.constSlice()});
- try req.respond(response_buffer.constSlice(), .{});
+ try res.send();
} else {
- try req.respond(
+ try res.write(
\\Register
\\Login
\\
, .{});
+ try res.send();
}
}
}
// api
else {
- if (std.mem.eql(u8, req.head.target, "/register")) {
+ if (std.mem.eql(u8, req.target, "/register")) {
// TODO: handle args not supplied
- const username = get_value(&req, "username").?;
- const password = get_value(&req, "password").?;
+ const username = req.get_value("username").?;
+ const password = req.get_value("password").?;
std.debug.print("New user: {s} {s}\n", .{ username, password });
- try register_user(&db, username, password);
-
- try redirect(&req, "/login");
- } else if (std.mem.eql(u8, req.head.target, "/login")) {
+ if (try register_user(env, username, password)) {
+ try res.redirect("/login");
+ } else {
+ try res.redirect("/register");
+ }
+ try res.send();
+ } else if (std.mem.eql(u8, req.target, "/login")) {
// TODO: handle args not supplied
- const username = get_value(&req, "username").?;
- const password = get_value(&req, "password").?;
+ const username = req.get_value("username").?;
+ const password = req.get_value("password").?;
std.debug.print("New login: {s} {s}\n", .{ username, password });
- if (login_user(&db, username, password)) |session_token| {
- var redirect_buffer = try std.BoundedArray(u8, 128).init(0);
- try std.fmt.format(redirect_buffer.writer(), "/user/{s}", .{username});
-
- var cookie_buffer = try std.BoundedArray(u8, 128).init(0);
- try std.fmt.format(cookie_buffer.writer(), "session_token={}; Secure; HttpOnly", .{session_token});
-
- try req.respond("", .{
- .status = .see_other,
- .extra_headers = &.{
- .{ .name = "Location", .value = redirect_buffer.constSlice() },
- .{ .name = "Set-Cookie", .value = cookie_buffer.constSlice() },
- },
- });
- } else {
- try redirect(&req, "/login");
+ if (login_user(env, username, password)) |session_token| {
+ res.status = .see_other;
+ try res.add_header(
+ "Location",
+ .{ "/user/{s}", .{username} },
+ );
+ try res.add_header(
+ "Set-Cookie",
+ .{ "session_token={s}; Secure; HttpOnly", .{session_token} },
+ );
+
+ try res.send();
+ } else |err| {
+ std.debug.print("login_user err: {}\n", .{err});
+ try res.redirect("/login");
+ try res.send();
}
- } else if (std.mem.eql(u8, req.head.target, "/logout")) {
+ } else if (std.mem.eql(u8, req.target, "/logout")) {
if (logged_in) |login| {
- logout_user(&db, login.session_token);
- try req.respond("", .{
- .status = .see_other,
- .extra_headers = &.{
- .{ .name = "Location", .value = "/" },
- .{ .name = "Set-Cookie", .value = "session_token=deleted; Expires=Thu, 01 Jan 1970 00:00:00 GMT" },
- },
- });
+ try logout_user(env, login.session_token);
+
+ try res.add_header(
+ "Set-Cookie",
+ .{"session_token=deleted; Expires=Thu, 01 Jan 1970 00:00:00 GMT"},
+ );
+
+ try res.redirect("/");
+ try res.send();
}
- } else if (std.mem.eql(u8, req.head.target, "/quit")) {
- try redirect(&req, "/");
+ } else if (std.mem.eql(u8, req.target, "/quit")) {
+ try res.redirect("/");
+ try res.send();
break :accept;
} else {
- try req.respond(
- \\POST
- , .{});
+ // try req.respond(
+ // \\POST
+ // , .{});
+ try res.write("{s}
", .{req.target});
+ try res.send();
}
}
}