X-Git-Url: https://gitweb.ps.run/chirp/blobdiff_plain/8ce4f0b76cab1963cd0a8ad55bf5b30b9eae917f..7d44a5163fd261dcb08282e15da9666e00a4f4b0:/src/main.zig
diff --git a/src/main.zig b/src/main.zig
index b016e1b..6647619 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1,5 +1,6 @@
const std = @import("std");
const lmdb = @import("lmdb");
+const http = @import("http.zig");
// db {{{
@@ -15,51 +16,39 @@ const Prng = struct {
return 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 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);
+ }
-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];
+ 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);
}
-
- 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 res;
+ }
+};
- return CookieValue.fromSlice(header.value[eql_index + 1 .. header.value.len]) catch null;
- }
- }
- }
+const Db = struct {
+ fn users(txn: *const lmdb.Txn) !lmdb.Dbi(Id, User) {
+ return try txn.dbi("users", Id, User);
}
- return null;
-}
+ fn user_ids(txn: *const lmdb.Txn) !lmdb.Dbi(Username, Id) {
+ return try txn.dbi("user_ids", Username, Id);
+ }
+ fn sessions(txn: *const lmdb.Txn) !lmdb.Dbi(SessionToken, Id) {
+ return try txn.dbi("sessions", SessionToken, Id);
+ }
+};
// }}}
@@ -71,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 {
@@ -110,7 +101,7 @@ pub fn verify_password(password: []const u8, hash: PasswordHash) bool {
}
}
-pub fn register_user(env: *lmdb.Env, 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);
const txn = try env.txn();
@@ -119,15 +110,22 @@ pub fn register_user(env: *lmdb.Env, username: []const u8, password: []const u8)
env.sync();
}
- const users = try txn.dbi("users", Id, User);
- const user_id = Prng.gen_id(users);
- users.put(user_id, User{
- .username = username_array,
- .password_hash = try hash_password(password),
- });
-
- const user_ids = try txn.dbi("user_ids", Username, Id);
- user_ids.put(username_array, user_id);
+ const users = try Db.users(&txn);
+ const user_ids = try Db.user_ids(&txn);
+
+ 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),
+ });
+
+ user_ids.put(username_array, user_id);
+
+ return true;
+ }
}
pub fn login_user(env: *lmdb.Env, username: []const u8, password: []const u8) !SessionToken {
@@ -139,15 +137,15 @@ pub fn login_user(env: *lmdb.Env, username: []const u8, password: []const u8) !S
env.sync();
}
- const user_ids = try txn.dbi("user_ids", Username, Id);
+ 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});
- const users = try txn.dbi("users", Id, User);
+ const users = try Db.users(&txn);
if (users.get(user_id)) |user| {
if (verify_password(password, user.password_hash)) {
- const sessions = try txn.dbi("sessions", Id, Id);
- const session_token = Prng.gen_id(sessions);
+ const sessions = try Db.sessions(&txn);
+ const session_token = Prng.gen_str(sessions, SessionTokenLen);
sessions.put(session_token, user_id);
return session_token;
} else {
@@ -165,7 +163,7 @@ fn logout_user(env: *lmdb.Env, session_token: SessionToken) !void {
env.sync();
}
- const sessions = try txn.dbi("sessions", Id, Id);
+ const sessions = try Db.sessions(&txn);
sessions.del(session_token);
}
@@ -173,8 +171,8 @@ fn get_session_user(env: *lmdb.Env, session_token: SessionToken) !User {
const txn = try env.txn();
defer txn.abort();
- const sessions = try txn.dbi("sessions", Id, Id);
- const users = try txn.dbi("users", Id, User);
+ const sessions = try Db.sessions(&txn);
+ const users = try Db.users(&txn);
if (sessions.get(session_token)) |user_id| {
return users.get(user_id) orelse error.UnknownUser;
@@ -189,13 +187,14 @@ fn list_users(env: *lmdb.Env) !void {
const txn = try env.txn();
defer txn.abort();
+ // const users = try Db.users(&txn);
const users = try txn.dbi("users", Id, User);
var cursor = try users.cursor();
var key: Id = undefined;
var user_maybe = cursor.get(&key, .First);
- while (user_maybe) |user| {
+ while (user_maybe) |*user| {
std.debug.print("[{}] {s}\n", .{ key, user.username.constSlice() });
user_maybe = cursor.get(&key, .Next);
@@ -205,7 +204,7 @@ fn list_user_ids(env: *lmdb.Env) !void {
const txn = try env.txn();
defer txn.abort();
- const user_ids = try txn.dbi("user_ids", Username, Id);
+ const user_ids = try Db.user_ids(&txn);
var cursor = try user_ids.cursor();
var key: Username = undefined;
@@ -222,26 +221,26 @@ fn list_sessions(env: *lmdb.Env) !void {
const txn = try env.txn();
defer txn.abort();
- const sessions = try txn.dbi("sessions", SessionToken, Id);
+ const sessions = try Db.sessions(&txn);
var cursor = try sessions.cursor();
var key: SessionToken = undefined;
var user_id_maybe = cursor.get(&key, .First);
while (user_id_maybe) |user_id| {
- std.debug.print("[{}] {}\n", .{ key, user_id });
+ std.debug.print("[{s}] {}\n", .{ key, user_id });
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
@@ -255,127 +254,158 @@ pub fn main() !void {
std.debug.print("Sessions:\n", .{});
try list_sessions(&env);
- accept: while (true) {
- const conn = try server.accept();
+ try handle_connection(&server, &env);
+ // const ThreadCount = 1;
+ // var ts: [ThreadCount]std.Thread = undefined;
- std.debug.print("new connection: {}\n", .{conn});
+ // for (0..ThreadCount) |i| {
+ // ts[i] = try std.Thread.spawn(.{}, handle_connection, .{ &server, &env });
+ // }
+ // for (0..ThreadCount) |i| {
+ // ts[i].join();
+ // }
- var read_buffer: [1024]u8 = undefined;
- var http_server = std.http.Server.init(conn, &read_buffer);
+ std.debug.print("done\n", .{});
+}
+
+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) {
+ server.wait();
- while (http_server.state == .ready) {
- var req = http_server.receiveHead() catch continue;
+ while (try server.next_request(&req_buffer)) |req| {
+ // std.debug.print("[{}]: {s}\n", .{ req.method, req.target });
- 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(&env, 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(&env, 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(&env, 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() },
- },
- });
+ 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 redirect(&req, "/login");
+ 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| {
- try logout_user(&env, 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();
}
}
}