aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.zig43
-rw-r--r--src/root.zig6
-rw-r--r--src/routes/api/image/list.zig30
-rw-r--r--src/routes/api/image/load.zig14
-rw-r--r--src/routes/api/image/root.zig2
-rw-r--r--src/routes/api/image/upload.zig4
-rw-r--r--src/routes/api/session/is-valid.zig5
-rw-r--r--src/routes/handler-info.zig34
-rw-r--r--src/server.zig71
-rw-r--r--src/storage/image-manager/image.zig73
-rw-r--r--src/storage/image-manager/root.zig66
-rw-r--r--src/storage/image.zig39
-rw-r--r--src/storage/root.zig8
-rw-r--r--src/storage/session-manager/root.zig21
-rw-r--r--src/storage/user.zig9
15 files changed, 324 insertions, 101 deletions
diff --git a/src/main.zig b/src/main.zig
index 6b6838c..4ea4954 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -5,15 +5,9 @@ pub const std_options = std.Options {
.logFn = memora.log.handler,
};
-const log = std.log.scoped(.main);
-
-var net_server: std.net.Server = undefined;
-var storage: memora.Storage = undefined;
-
fn signal_handler(signo: i32) callconv(.c) void {
if (signo == std.os.linux.SIG.INT) {
- log.info("shutdown", .{});
- net_server.deinit();
+ server.deinit();
std.process.exit(0);
}
}
@@ -28,42 +22,15 @@ fn register_sigaction() void {
_ = std.os.linux.sigaction(std.os.linux.SIG.INT, &sa, null);
}
+var server = memora.Server{};
+
pub fn main() !void {
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
defer std.debug.assert(gpa.deinit() == .ok);
const allocator = gpa.allocator();
- storage = try .init(allocator);
-
const address = try std.net.Address.parseIpAndPort("0.0.0.0:8080");
- net_server = try address.listen(.{ .reuse_address = true });
- defer net_server.deinit();
-
+ try server.init(address, allocator);
register_sigaction();
-
- log.info("listening on {f}", .{address});
-
- while (true) {
- const connection = net_server.accept() catch |err| {
- log.err("error: {}", .{err});
- continue;
- };
- defer connection.stream.close();
-
- var read_buf: [1024 * 8]u8 = undefined;
- var write_buf: [1024 * 8]u8 = undefined;
- var reader = connection.stream.reader(&read_buf);
- var writer = connection.stream.writer(&write_buf);
- var http_server = std.http.Server.init(reader.interface(), &writer.interface);
-
- var request = http_server.receiveHead() catch continue;
- log.info("{s} {s}", .{std.enums.tagName(std.http.Method, request.head.method) orelse "<unknown>", request.head.target});
-
- const handler_info = memora.routes.get(request.head.target);
- try handler_info.handle(
- &request,
- &storage,
- allocator
- );
- }
+ server.run(allocator);
}
diff --git a/src/root.zig b/src/root.zig
index 301664e..c5ea36e 100644
--- a/src/root.zig
+++ b/src/root.zig
@@ -1,6 +1,8 @@
-//! By convention, root.zig is the root source file when making a library.
const std = @import("std");
+
pub const log = @import("log.zig");
+
pub const routes = @import("routes/root.zig");
-pub const Storage = @import("storage/root.zig");
+pub const Server = @import("server.zig");
+pub const Storage = @import("storage/root.zig");
diff --git a/src/routes/api/image/list.zig b/src/routes/api/image/list.zig
new file mode 100644
index 0000000..ee7a648
--- /dev/null
+++ b/src/routes/api/image/list.zig
@@ -0,0 +1,30 @@
+const std = @import("std");
+const Context = @import("../../context.zig");
+const Storage = @import("../../../storage/root.zig");
+
+pub const access = .users;
+
+const ImageInfo = struct {
+ id: []const u8,
+};
+
+const Result = struct {
+ images: []ImageInfo,
+};
+
+pub fn get(ctx: *Context) !Result {
+ var images: std.ArrayList(ImageInfo) = .empty;
+
+ const images_list = ctx.storage.images.list();
+ defer images_list.deinit();
+
+ for (images_list.images) |*image| {
+ try images.append(ctx.allocator, .{
+ .id = image.id
+ });
+ }
+
+ return .{
+ .images = try images.toOwnedSlice(ctx.allocator),
+ };
+}
diff --git a/src/routes/api/image/load.zig b/src/routes/api/image/load.zig
new file mode 100644
index 0000000..1bafb11
--- /dev/null
+++ b/src/routes/api/image/load.zig
@@ -0,0 +1,14 @@
+const std = @import("std");
+const Context = @import("../../context.zig");
+const Storage = @import("../../../storage/root.zig");
+
+pub const access = .users;
+
+pub fn get(ctx: *Context) ![]const u8 {
+ const id = ctx.request.head.target["/api/image/load/".len..];
+ var image = Storage.Image { .id = id };
+ var file = try image.file(ctx.storage);
+ defer file.close();
+
+ return try file.readToEndAlloc(ctx.allocator, std.math.maxInt(usize));
+}
diff --git a/src/routes/api/image/root.zig b/src/routes/api/image/root.zig
index 0ad1960..dafa090 100644
--- a/src/routes/api/image/root.zig
+++ b/src/routes/api/image/root.zig
@@ -1,3 +1,5 @@
const HandlerInfo = @import("../../handler-info.zig");
pub const upload: HandlerInfo = .from_type(@import("upload.zig"));
+pub const list: HandlerInfo = .from_type(@import("list.zig"));
+pub const load: HandlerInfo = .from_type(@import("load.zig"));
diff --git a/src/routes/api/image/upload.zig b/src/routes/api/image/upload.zig
index 7cd5cf1..3aa2ea6 100644
--- a/src/routes/api/image/upload.zig
+++ b/src/routes/api/image/upload.zig
@@ -4,12 +4,12 @@ const Storage = @import("../../../storage/root.zig");
const log = std.log.scoped(.image_upload);
-pub const access = .everyone;
+pub const access = .users;
pub fn post(ctx: *Context) !void {
if (ctx.request.head.content_length) |length| {
var buffer: [1024]u8 = undefined;
const reader = try ctx.request.readerExpectContinue(&buffer);
- try Storage.Image.new(ctx.storage, reader, length);
+ try ctx.storage.images.add(ctx.storage, reader, length);
}
}
diff --git a/src/routes/api/session/is-valid.zig b/src/routes/api/session/is-valid.zig
index 0c26040..4ea4f1a 100644
--- a/src/routes/api/session/is-valid.zig
+++ b/src/routes/api/session/is-valid.zig
@@ -1,4 +1,5 @@
const std = @import("std");
+const config = @import("config");
const Context = @import("../../context.zig");
pub const access = .everyone;
@@ -8,6 +9,10 @@ const Result = struct {
};
pub fn get(ctx: *Context) !Result {
+ if (comptime config.disable_auth) {
+ return .{ .is_valid = true };
+ }
+
return .{
.is_valid = ctx.storage.sessions.get(ctx.storage, ctx.fingerprint) != null
};
diff --git a/src/routes/handler-info.zig b/src/routes/handler-info.zig
index 7b744d2..94d0491 100644
--- a/src/routes/handler-info.zig
+++ b/src/routes/handler-info.zig
@@ -2,6 +2,8 @@ const std = @import("std");
const Context = @import("context.zig");
const Storage = @import("../storage/root.zig");
+const config = @import("config");
+
const Access = @import("access.zig").Access;
const log = std.log.scoped(.handler_info);
@@ -71,22 +73,24 @@ pub fn handle(
.fingerprint = get_fingerprint(cookie),
};
- const allowed = switch (self.access) {
- .everyone => true,
- .users => storage.sessions.get(storage, context.fingerprint) != null,
- .admins => admin: {
- if (storage.sessions.get(storage, context.fingerprint)) |session| {
- break :admin session.info.is_admin;
- }
- break :admin false;
- },
- };
+ if (!comptime config.disable_auth) {
+ const allowed = switch (self.access) {
+ .everyone => true,
+ .users => storage.sessions.get(storage, context.fingerprint) != null,
+ .admins => admin: {
+ if (storage.sessions.get(storage, context.fingerprint)) |session| {
+ break :admin session.info.is_admin;
+ }
+ break :admin false;
+ },
+ };
- if (!allowed) {
- return request.respond(
- "{ \"error\": \"Forbidden\" }",
- .{ .status = .forbidden }
- );
+ if (!allowed) {
+ return request.respond(
+ "{ \"error\": \"Forbidden\" }",
+ .{ .status = .forbidden }
+ );
+ }
}
const response = handler(&context) catch |err| {
diff --git a/src/server.zig b/src/server.zig
new file mode 100644
index 0000000..184af92
--- /dev/null
+++ b/src/server.zig
@@ -0,0 +1,71 @@
+const std = @import("std");
+const log = std.log.scoped(.server);
+
+const routes = @import("routes/root.zig");
+const Storage = @import("storage/root.zig");
+const config = @import("config");
+
+const Self = @This();
+
+storage: Storage = undefined,
+net_server: std.net.Server = undefined,
+pool: std.Thread.Pool = undefined,
+
+pub fn init(
+ self: *Self,
+ address: std.net.Address,
+ allocator: std.mem.Allocator,
+) !void {
+ self.storage = try .init(allocator);
+ self.net_server = try address.listen(.{ .reuse_address = true });
+ try self.pool.init(.{ .allocator = allocator });
+ log.info("listing on {f}", .{address});
+
+ if (comptime config.disable_auth) {
+ log.warn("authentication is disabled", .{});
+ }
+}
+
+pub fn run(self: *Self, allocator: std.mem.Allocator) void {
+ while (true) {
+ const connection = self.net_server.accept() catch |err| {
+ log.err("error: {}", .{err});
+ continue;
+ };
+
+ self.pool.spawn(handle_connection, .{self, allocator, connection}) catch |err| {
+ std.log.err("failed to spawn thread: {}", .{err});
+ };
+ }
+}
+
+fn handle_connection(
+ self: *Self,
+ allocator: std.mem.Allocator,
+ connection: std.net.Server.Connection,
+) void {
+ defer connection.stream.close();
+
+ var read_buf: [1024 * 8]u8 = undefined;
+ var write_buf: [1024 * 8]u8 = undefined;
+ var reader = connection.stream.reader(&read_buf);
+ var writer = connection.stream.writer(&write_buf);
+ var http_server = std.http.Server.init(reader.interface(), &writer.interface);
+
+ var request = http_server.receiveHead() catch return;
+ log.info("{s} {s}", .{
+ std.enums.tagName(std.http.Method, request.head.method) orelse "<unknown>",
+ request.head.target,
+ });
+
+ const handler_info = routes.get(request.head.target);
+ handler_info.handle(&request, &self.storage, allocator) catch |err| {
+ std.log.err("{}", .{err});
+ };
+}
+
+pub fn deinit(self: *Self) void {
+ log.info("shutdown", .{});
+ self.net_server.deinit();
+ self.storage.deinit();
+}
diff --git a/src/storage/image-manager/image.zig b/src/storage/image-manager/image.zig
new file mode 100644
index 0000000..91a094e
--- /dev/null
+++ b/src/storage/image-manager/image.zig
@@ -0,0 +1,73 @@
+const std = @import("std");
+const Storage = @import("../root.zig");
+
+const id_size = 32;
+
+const log = std.log.scoped(.image);
+
+fn new_id() [id_size]u8 {
+ var buffer: [id_size]u8 = undefined;
+ var raw_buffer: [id_size / 2]u8 = undefined;
+ std.crypto.random.bytes(&raw_buffer);
+
+ var writer = std.Io.Writer.fixed(buffer[0..]);
+ writer.print("{x}", .{raw_buffer}) catch unreachable;
+
+ return buffer[0..].*;
+}
+
+const Self = @This();
+
+id: []const u8,
+
+pub fn new(
+ storage: *Storage,
+ reader: *std.Io.Reader,
+ size: usize,
+) !Self {
+ var dir = try storage.dir.openDir("image", .{});
+ defer dir.close();
+
+ var file_name: [id_size+4]u8 = undefined;
+ const self: Self = .{ .id = &new_id() };
+ @memcpy(file_name[0..id_size], self.id);
+ @memcpy(file_name[id_size..], ".jpg");
+
+ var image_file = try dir.createFile(&file_name, .{});
+ defer image_file.close();
+
+ var buffer: [1024]u8 = undefined;
+ var file_writer = image_file.writer(&buffer);
+
+ try reader.streamExact(&file_writer.interface, size);
+
+ try file_writer.interface.flush();
+
+ log.info("uploaded {s} [{} bytes]", .{self.id, size});
+
+ return self;
+}
+
+pub fn init(allocator: std.mem.Allocator, id: []const u8) !Self {
+ return .{
+ .id = try allocator.dupe(u8, id),
+ };
+}
+
+pub fn file(self: *Self, storage: *Storage) !std.fs.File {
+ var dir = storage.dir.openDir("image", .{}) catch blk: {
+ try storage.dir.makeDir("image");
+ break :blk try storage.dir.openDir("image", .{});
+ };
+ defer dir.close();
+
+ var file_name: [id_size+4]u8 = undefined;
+ @memcpy(file_name[0..id_size], self.id);
+ @memcpy(file_name[id_size..], ".jpg");
+
+ return dir.openFile(&file_name, .{});
+}
+
+pub fn deinit(self: *Self, allocator: std.mem.Allocator) void {
+ allocator.free(self.id);
+}
diff --git a/src/storage/image-manager/root.zig b/src/storage/image-manager/root.zig
new file mode 100644
index 0000000..7742df2
--- /dev/null
+++ b/src/storage/image-manager/root.zig
@@ -0,0 +1,66 @@
+const std = @import("std");
+
+const Storage = @import("../root.zig");
+pub const Image = @import("image.zig");
+
+const Self = @This();
+
+pub const empty: Self = .{};
+
+items: std.ArrayList(Image) = .empty,
+rw_lock: std.Thread.RwLock = .{},
+
+pub const LockedImages = struct {
+ images: []Image,
+ rw_lock: *std.Thread.RwLock,
+
+ pub fn deinit(self: *const @This()) void {
+ self.rw_lock.unlockShared();
+ }
+};
+
+pub fn init(
+ self: *Self,
+ storage: *Storage,
+) !void {
+ var dir = storage.dir.openDir("image", .{ .iterate = true }) catch blk: {
+ try storage.dir.makeDir("image");
+ break :blk try storage.dir.openDir("image", .{ .iterate = true });
+ };
+ defer dir.close();
+
+ var iterator = dir.iterate();
+
+ errdefer self.items.deinit(storage.allocator);
+
+ while (try iterator.next()) |entry| {
+ if (entry.kind == .file and std.mem.endsWith(u8, entry.name, ".jpg")) {
+ try self.items.append(
+ storage.allocator,
+ try .init(storage.allocator, entry.name[0..entry.name.len - 4])
+ );
+ }
+ }
+}
+
+pub fn add(
+ self: *Self,
+ storage: *Storage,
+ reader: *std.Io.Reader,
+ size: usize,
+) !void {
+ self.rw_lock.lock();
+ defer self.rw_lock.unlock();
+
+ try self.items.append(
+ storage.allocator,
+ try Image.new(storage, reader, size),
+ );
+}
+
+pub fn list(self: *Self) LockedImages {
+ return .{
+ .images = self.items.items,
+ .rw_lock = &self.rw_lock,
+ };
+}
diff --git a/src/storage/image.zig b/src/storage/image.zig
deleted file mode 100644
index 73bca84..0000000
--- a/src/storage/image.zig
+++ /dev/null
@@ -1,39 +0,0 @@
-const std = @import("std");
-const Storage = @import("root.zig");
-
-const id_size = 32;
-
-fn new_id() [id_size]u8 {
- var buffer: [id_size]u8 = undefined;
- var raw_buffer: [id_size / 2]u8 = undefined;
- std.crypto.random.bytes(&raw_buffer);
-
- var writer = std.Io.Writer.fixed(buffer[0..]);
- writer.print("{x}", .{raw_buffer}) catch unreachable;
-
- return buffer[0..].*;
-}
-
-pub fn new(
- storage: *Storage,
- reader: *std.Io.Reader,
- size: usize,
-) !void {
- var dir = storage.dir.openDir("image", .{}) catch blk: {
- try storage.dir.makeDir("image");
- break :blk try storage.dir.openDir("image", .{});
- };
- defer dir.close();
-
- var file_name: [id_size+4]u8 = undefined;
- @memcpy(file_name[0..id_size], &new_id());
- @memcpy(file_name[id_size..], ".jpg");
-
- var file = try dir.createFile(&file_name, .{});
- defer file.close();
-
- var buffer: [1024]u8 = undefined;
- var file_writer = file.writer(&buffer);
-
- try reader.streamExact(&file_writer.interface, size);
-}
diff --git a/src/storage/root.zig b/src/storage/root.zig
index c121ca9..381dc45 100644
--- a/src/storage/root.zig
+++ b/src/storage/root.zig
@@ -3,7 +3,10 @@ const config = @import("../config.zig");
const prompt = @import("../prompt.zig");
pub const User = @import("user.zig");
-pub const Image = @import("image.zig");
+
+pub const ImageManager = @import("image-manager/root.zig");
+pub const Image = ImageManager.Image;
+
pub const SessionManager = @import("session-manager/root.zig");
pub const Session = SessionManager.Session;
@@ -11,6 +14,7 @@ const Self = @This();
dir: std.fs.Dir,
sessions: SessionManager = .empty,
+images: ImageManager = .empty,
allocator: std.mem.Allocator,
pub fn init(allocator: std.mem.Allocator) !Self {
@@ -56,6 +60,8 @@ pub fn init(allocator: std.mem.Allocator) !Self {
else => return err,
};
+ try self.images.init(&self);
+
return self;
}
diff --git a/src/storage/session-manager/root.zig b/src/storage/session-manager/root.zig
index 7f44bf0..d0e1441 100644
--- a/src/storage/session-manager/root.zig
+++ b/src/storage/session-manager/root.zig
@@ -11,8 +11,12 @@ pub const empty: Self = .{
};
cache: std.StringHashMapUnmanaged(Session),
+rw_lock: std.Thread.RwLock = .{},
pub fn add(self: *Self, storage: *Storage, info: Storage.User.Info) !*Session {
+ self.rw_lock.lock();
+ defer self.rw_lock.unlock();
+
const session = try Session.init(storage.allocator, info);
errdefer session.deinit(storage.allocator);
try self.cache.put(storage.allocator, session.fingerprint, session);
@@ -20,7 +24,12 @@ pub fn add(self: *Self, storage: *Storage, info: Storage.User.Info) !*Session {
}
pub fn renew(self: *Self, storage: *Storage, fingerprint: []const u8) !*Session {
+ self.rw_lock.lockShared();
if (self.cache.get(fingerprint)) |s| {
+ self.rw_lock.unlockShared();
+ self.rw_lock.lock();
+ defer self.rw_lock.unlock();
+
var session = s;
try session.reset();
@@ -29,24 +38,34 @@ pub fn renew(self: *Self, storage: *Storage, fingerprint: []const u8) !*Session
_ = self.cache.remove(fingerprint);
return self.cache.getPtr(session.fingerprint) orelse unreachable;
+ } else {
+ self.rw_lock.unlockShared();
}
return error.SessionNotFound;
}
pub fn remove(self: *Self, storage: *Storage, fingerprint: []const u8) void {
+ self.rw_lock.lockShared();
if (self.cache.getPtr(fingerprint)) |session| {
+ self.rw_lock.unlockShared();
+ self.rw_lock.lock();
+ defer self.rw_lock.unlock();
+
session.deinit(storage.allocator);
_ = self.cache.remove(fingerprint);
+ } else {
+ self.rw_lock.unlockShared();
}
}
pub fn get(self: *Self, storage: *Storage, fingerprint: []const u8) ?*Session {
+ self.rw_lock.lockShared();
+ defer self.rw_lock.unlockShared();
if (self.cache.getPtr(fingerprint)) |session| {
const now = std.time.Instant.now() catch return null;
const since = now.since(session.age);
if (since > config.session_expires_after) {
- std.debug.print("here\n", .{});
session.deinit(storage.allocator);
_ = self.cache.remove(fingerprint);
return null;
diff --git a/src/storage/user.zig b/src/storage/user.zig
index 4170fd1..d5260fe 100644
--- a/src/storage/user.zig
+++ b/src/storage/user.zig
@@ -58,7 +58,7 @@ pub fn open(
var dir = try user_dir.openDir(name, .{});
errdefer dir.close();
- const file = try dir.openFile("info.json", .{});
+ const file = try dir.openFile("info.json", .{ .lock = .shared });
defer file.close();
const content = try file.readToEndAlloc(allocator, std.math.maxInt(usize));
@@ -91,7 +91,7 @@ pub fn new(
var dir = try user_dir.openDir(name, .{});
errdefer dir.close();
- var file = try dir.createFile("info.json", .{});
+ var file = try dir.createFile("info.json", .{ .lock = .exclusive });
file.close();
const hash_buf = try allocator.alloc(u8, 256);
@@ -124,7 +124,10 @@ pub fn new(
}
pub fn sync(self: *Self) !void {
- const file = try self.dir.openFile("info.json", .{ .mode = .write_only });
+ const file = try self.dir.openFile("info.json", .{
+ .mode = .write_only,
+ .lock = .exclusive,
+ });
defer file.close();
var buffer: [1024]u8 = undefined;
generated by cgit v1.2.3-70-g09d2 (git 2.53.0) at 2026-05-12 16:00:36 +0000