From 44445734ba4a0f05564f808c2fd34a7f23c6fafb Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Wed, 20 May 2026 10:16:50 +0200 Subject: Let's do a rewrite! Created project structure and changed `build.zig` and added licence. --- src/ansi.zig | 94 ------------ src/api/root.zig | 8 + src/config.zig | 41 ----- src/context.zig | 17 --- src/db/root.zig | 9 ++ src/frontend/root.zig | 8 + src/http/root.zig | 7 + src/locked.zig | 13 -- src/log.zig | 56 ------- src/main.zig | 40 ++--- src/mime.zig | 88 ----------- src/prompt.zig | 44 ------ src/root.zig | 11 -- src/routes/access.zig | 6 - src/routes/api/auth/first-login.zig | 15 -- src/routes/api/auth/login.zig | 34 ----- src/routes/api/auth/root.zig | 4 - src/routes/api/image/list.zig | 42 ------ src/routes/api/image/load.zig | 15 -- src/routes/api/image/query.zig | 0 src/routes/api/image/remove.zig | 14 -- src/routes/api/image/root.zig | 6 - src/routes/api/image/upload.zig | 17 --- src/routes/api/profile/create.zig | 29 ---- src/routes/api/profile/image/load.zig | 17 --- src/routes/api/profile/image/root.zig | 5 - src/routes/api/profile/image/upload.zig | 19 --- src/routes/api/profile/list.zig | 17 --- src/routes/api/profile/root.zig | 8 - src/routes/api/profile/set.zig | 26 ---- src/routes/api/profile/update-password.zig | 37 ----- src/routes/api/root.zig | 4 - src/routes/api/session/current.zig | 27 ---- src/routes/api/session/drop.zig | 9 -- src/routes/api/session/is-online.zig | 15 -- src/routes/api/session/is-valid.zig | 21 --- src/routes/api/session/renew.zig | 9 -- src/routes/api/session/root.zig | 7 - src/routes/handler-info.zig | 225 --------------------------- src/routes/root.zig | 49 ------ src/routes/static.zig | 35 ----- src/server.zig | 73 --------- src/storage/image-manager/exif.zig | 57 ------- src/storage/image-manager/image.zig | 110 -------------- src/storage/image-manager/root.zig | 138 ----------------- src/storage/media-manager/root.zig | 0 src/storage/root.zig | 79 ---------- src/storage/session-manager/root.zig | 78 ---------- src/storage/session-manager/session.zig | 34 ----- src/storage/user.zig | 234 ----------------------------- src/stream/buffer.zig | 28 ---- src/stream/file.zig | 22 --- src/stream/root.zig | 33 ---- 53 files changed, 41 insertions(+), 1993 deletions(-) delete mode 100644 src/ansi.zig create mode 100644 src/api/root.zig delete mode 100644 src/config.zig delete mode 100644 src/context.zig create mode 100644 src/db/root.zig create mode 100644 src/frontend/root.zig create mode 100644 src/http/root.zig delete mode 100644 src/locked.zig delete mode 100644 src/log.zig delete mode 100644 src/mime.zig delete mode 100644 src/prompt.zig delete mode 100644 src/root.zig delete mode 100644 src/routes/access.zig delete mode 100644 src/routes/api/auth/first-login.zig delete mode 100644 src/routes/api/auth/login.zig delete mode 100644 src/routes/api/auth/root.zig delete mode 100644 src/routes/api/image/list.zig delete mode 100644 src/routes/api/image/load.zig delete mode 100644 src/routes/api/image/query.zig delete mode 100644 src/routes/api/image/remove.zig delete mode 100644 src/routes/api/image/root.zig delete mode 100644 src/routes/api/image/upload.zig delete mode 100644 src/routes/api/profile/create.zig delete mode 100644 src/routes/api/profile/image/load.zig delete mode 100644 src/routes/api/profile/image/root.zig delete mode 100644 src/routes/api/profile/image/upload.zig delete mode 100644 src/routes/api/profile/list.zig delete mode 100644 src/routes/api/profile/root.zig delete mode 100644 src/routes/api/profile/set.zig delete mode 100644 src/routes/api/profile/update-password.zig delete mode 100644 src/routes/api/root.zig delete mode 100644 src/routes/api/session/current.zig delete mode 100644 src/routes/api/session/drop.zig delete mode 100644 src/routes/api/session/is-online.zig delete mode 100644 src/routes/api/session/is-valid.zig delete mode 100644 src/routes/api/session/renew.zig delete mode 100644 src/routes/api/session/root.zig delete mode 100644 src/routes/handler-info.zig delete mode 100644 src/routes/root.zig delete mode 100644 src/routes/static.zig delete mode 100644 src/server.zig delete mode 100644 src/storage/image-manager/exif.zig delete mode 100644 src/storage/image-manager/image.zig delete mode 100644 src/storage/image-manager/root.zig delete mode 100644 src/storage/media-manager/root.zig delete mode 100644 src/storage/root.zig delete mode 100644 src/storage/session-manager/root.zig delete mode 100644 src/storage/session-manager/session.zig delete mode 100644 src/storage/user.zig delete mode 100644 src/stream/buffer.zig delete mode 100644 src/stream/file.zig delete mode 100644 src/stream/root.zig (limited to 'src') diff --git a/src/ansi.zig b/src/ansi.zig deleted file mode 100644 index 44f5de6..0000000 --- a/src/ansi.zig +++ /dev/null @@ -1,94 +0,0 @@ -const std = @import("std"); - -fn write_csi(writer: anytype, args: anytype, command: u8) !void { - try writer.writeAll("\x1b["); - - inline for (args, 0..) |code, index| { - try writer.print("{}", .{code}); - - if (index < args.len - 1) { - try writer.writeByte(';'); - } - } - - try writer.writeByte(command); -} - -pub const Color = enum(u8) { - const Self = @This(); - - black = 0, - red = 1, - green = 2, - yellow = 3, - blue = 4, - magenta = 5, - cyan = 6, - white = 7, - gray = 60, - bright_red = 61, - bright_green = 62, - bright_yellow = 63, - bright_blue = 64, - bright_magenta = 65, - bright_cyan = 66, - bright_white = 67, - - const foreground_offset = 30; - const background_offset = 40; - - pub fn to_fg(self: Self) u8 { - return @intFromEnum(self) + foreground_offset; - } - - pub fn to_bg(self: Self) u8 { - return @intFromEnum(self) + background_offset; - } -}; - -pub const Styled = struct { - const Self = @This(); - - text: []const u8, - fg: Color = .white, - bg: Color = .black, - bold: bool = false, - dim: bool = false, - italic: bool = false, - underline: bool = false, - - const Codes = struct { - const reset = 0; - const bold = 1; - const dim = 2; - const italic = 3; - const underline = 4; - }; - - pub fn format( - self: *const Self, - writer: *std.Io.Writer, - ) !void { - try write_csi(writer, .{self.fg.to_fg()}, 'm'); - try write_csi(writer, .{self.bg.to_bg()}, 'm'); - - if (self.bold) try write_csi(writer, .{Codes.bold}, 'm'); - if (self.dim) try write_csi(writer, .{Codes.dim}, 'm'); - if (self.italic) try write_csi(writer, .{Codes.italic}, 'm'); - if (self.underline) try write_csi(writer, .{Codes.underline}, 'm'); - - try writer.writeAll(self.text); - - try write_csi(writer, .{Codes.reset}, 'm'); - } -}; - -pub const ClearLine = struct { - pub fn format( - self: *const @This(), - writer: *std.Io.Writer, - ) !void { - _ = self; - try writer.writeAll("\x1b[2K\r"); - } -}; diff --git a/src/api/root.zig b/src/api/root.zig new file mode 100644 index 0000000..5128aa1 --- /dev/null +++ b/src/api/root.zig @@ -0,0 +1,8 @@ +//! There should not be any http specific stuff in here, +//! only the specific api endpoints. + +const std = @import("std"); + +test { + _ = std.testing.refAllDecls(@This()); +} diff --git a/src/config.zig b/src/config.zig deleted file mode 100644 index 02d3c8a..0000000 --- a/src/config.zig +++ /dev/null @@ -1,41 +0,0 @@ -const std = @import("std"); - -const Self = @This(); - -const Config = struct { - storage_path: []const u8, - session_expires_after: usize, -}; - -arena: *std.heap.ArenaAllocator, -storage_path: []const u8, -session_expires_after: usize, - -pub fn load(allocator: std.mem.Allocator) !Self { - const home_path = std.posix.getenv("HOME") orelse return error.MissingHome; - const home = try std.fs.cwd().openDirZ( - home_path, - .{}, - ); - const file = home.openFile( - ".config/memora/config.json", - .{} - ) catch return error.MissingConfig; - - const content = try file.readToEndAlloc(allocator, std.math.maxInt(usize)); - defer allocator.free(content); - - const parsed = try std.json.parseFromSlice(Config, allocator, content, .{ - .allocate = .alloc_always, - }); - return .{ - .arena = parsed.arena, - .storage_path = parsed.value.storage_path, - .session_expires_after = parsed.value.session_expires_after * std.time.ns_per_day, - }; -} - -pub fn deinit(self: *Self) void { - self.arena.deinit(); - self.* = undefined; -} diff --git a/src/context.zig b/src/context.zig deleted file mode 100644 index 6e73b5d..0000000 --- a/src/context.zig +++ /dev/null @@ -1,17 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Storage = memora.Storage; - -const Self = @This(); - -allocator: std.mem.Allocator, -request: *std.http.Server.Request, -storage: *Storage, -fingerprint: []const u8, -response: struct { - headers: struct { - content_type: []const u8 = "application/json", - fingerprint: ?[]const u8 = null, - } = .{}, -} = .{}, diff --git a/src/db/root.zig b/src/db/root.zig new file mode 100644 index 0000000..049a63b --- /dev/null +++ b/src/db/root.zig @@ -0,0 +1,9 @@ +//! Implements the layer between the sqlite +//! database and the interface for the api endpoints or +//! the cli. + +const std = @import("std"); + +test { + _ = std.testing.refAllDecls(@This()); +} diff --git a/src/frontend/root.zig b/src/frontend/root.zig new file mode 100644 index 0000000..f2cce4c --- /dev/null +++ b/src/frontend/root.zig @@ -0,0 +1,8 @@ +//! Implementation of the frontend contains mainly javascript files +//! which will be embedded right into the ELF file to improve deployment. + +const std = @import("std"); + +test { + _ = std.testing.refAllDecls(@This()); +} diff --git a/src/http/root.zig b/src/http/root.zig new file mode 100644 index 0000000..743e1c4 --- /dev/null +++ b/src/http/root.zig @@ -0,0 +1,7 @@ +//! All HTTP specific abstractions belong here. + +const std = @import("std"); + +test { + _ = std.testing.refAllDecls(@This()); +} diff --git a/src/locked.zig b/src/locked.zig deleted file mode 100644 index 6c2edfe..0000000 --- a/src/locked.zig +++ /dev/null @@ -1,13 +0,0 @@ -const std = @import("std"); - -pub fn Shared(T: type) type { - return struct { - value: T, - rw_lock: *std.Thread.RwLock, - - pub fn unlock(self: *@This()) void { - self.rw_lock.unlockShared(); - self.* = undefined; - } - }; -} diff --git a/src/log.zig b/src/log.zig deleted file mode 100644 index 9d2b444..0000000 --- a/src/log.zig +++ /dev/null @@ -1,56 +0,0 @@ -const std = @import("std"); - -const ansi = @import("ansi.zig"); - -var log_buffer: [1024]u8 = undefined; -var writer_stderr = std.fs.File.stderr().writer(&log_buffer); -const stderr = &writer_stderr.interface; -var log_lock = std.Thread.Mutex{}; - -pub fn handler( - comptime message_level: std.log.Level, - comptime scope: @TypeOf(.enum_literal), - comptime format: []const u8, - args: anytype, -) void { - log_lock.lock(); - defer log_lock.unlock(); - defer stderr.flush() catch unreachable; - - const color = switch (message_level) { - .err => .red, - .warn => .yellow, - .info => .blue, - .debug => .magenta, - }; - - stderr.print( - "{f}{f}", - .{ - ansi.ClearLine {}, - ansi.Styled { - .text = " " ++ (comptime message_level.asText()) ++ " ", - .bg = color, - .bold = true, - }, - }, - ) catch unreachable; - - if (scope != .default) { - stderr.print( - "{f}", - .{ - ansi.Styled { - .text = " " ++ @tagName(scope) ++ " ", - .bg = .gray, - .fg = .black, - .italic = true, - }, - }, - ) catch unreachable; - } - - stderr.writeByte(' ') catch unreachable; - stderr.print(format, args) catch unreachable; - stderr.writeAll("\n") catch unreachable; -} diff --git a/src/main.zig b/src/main.zig index 4ea4954..1a66b63 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,36 +1,14 @@ -const std = @import("std"); -const memora = @import("memora"); - -pub const std_options = std.Options { - .logFn = memora.log.handler, -}; - -fn signal_handler(signo: i32) callconv(.c) void { - if (signo == std.os.linux.SIG.INT) { - server.deinit(); - std.process.exit(0); - } -} +//! This is the main executable file. +//! Here we will add all cli interfaces +//! to interact with the state of the application +//! but also the actual running of the server / webapp. -fn register_sigaction() void { - var sa = std.os.linux.Sigaction{ - .handler = .{ .handler = signal_handler }, - .mask = std.mem.zeroes(std.os.linux.sigset_t), - .flags = 0, - }; +const std = @import("std"); - _ = std.os.linux.sigaction(std.os.linux.SIG.INT, &sa, null); +pub fn main(init: std.process.Init) !void { + _ = init; } -var server = memora.Server{}; - -pub fn main() !void { - var gpa = std.heap.GeneralPurposeAllocator(.{}){}; - defer std.debug.assert(gpa.deinit() == .ok); - const allocator = gpa.allocator(); - - const address = try std.net.Address.parseIpAndPort("0.0.0.0:8080"); - try server.init(address, allocator); - register_sigaction(); - server.run(allocator); +test { + _ = std.testing.refAllDecls(@This()); } diff --git a/src/mime.zig b/src/mime.zig deleted file mode 100644 index c60ab74..0000000 --- a/src/mime.zig +++ /dev/null @@ -1,88 +0,0 @@ -const std = @import("std"); - -pub fn get_type(file_name: []const u8) []const u8 { - const suffix_pos = std.mem.lastIndexOfScalar(u8, file_name, '.') orelse file_name.len; - const suffix = file_name[suffix_pos..]; - return content_types.get(suffix) orelse "text/plain"; -} - -pub const content_types = std.StaticStringMap([]const u8).initComptime(.{ - .{ ".aac", "audio/aac" }, - .{ ".abw", "application/x-abiword" }, - .{ ".apng", "image/apng" }, - .{ ".arc", "application/x-freearc" }, - .{ ".avif", "image/avif" }, - .{ ".avi", "video/x-msvideo" }, - .{ ".azw", "application/vnd.amazon.ebook" }, - .{ ".bin", "application/octet-stream" }, - .{ ".bmp", "image/bmp" }, - .{ ".bz", "application/x-bzip" }, - .{ ".bz2", "application/x-bzip2" }, - .{ ".cda", "application/x-cdf" }, - .{ ".csh", "application/x-csh" }, - .{ ".css", "text/css" }, - .{ ".csv", "text/csv" }, - .{ ".doc", "application/msword" }, - .{ ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document" }, - .{ ".eot", "application/vnd.ms-fontobject" }, - .{ ".epub", "application/epub+zip" }, - .{ ".gz", "application/gzip." }, - .{ ".gif", "image/gif" }, - .{ ".htm", "text/html" }, - .{ ".html", "text/html" }, - .{ ".ico", "image/vnd.microsoft.icon" }, - .{ ".ics", "text/calendar" }, - .{ ".jar", "application/java-archive" }, - .{ ".jpeg", "image/jpeg" }, - .{ ".jpg", "image/jpeg" }, - .{ ".js", "text/javascript" }, - .{ ".json", "application/json" }, - .{ ".jsonld", "application/ld+json" }, - .{ ".md", "text/markdown" }, - .{ ".mid, .midi", "audio/midi," }, - .{ ".mjs", "text/javascript" }, - .{ ".mp3", "audio/mpeg" }, - .{ ".mp4", "video/mp4" }, - .{ ".mpeg", "video/mpeg" }, - .{ ".mpkg", "application/vnd.apple.installer+xml" }, - .{ ".odp", "application/vnd.oasis.opendocument.presentation" }, - .{ ".ods", "application/vnd.oasis.opendocument.spreadsheet" }, - .{ ".odt", "application/vnd.oasis.opendocument.text" }, - .{ ".oga", "audio/ogg" }, - .{ ".ogv", "video/ogg" }, - .{ ".ogx", "application/ogg" }, - .{ ".opus", "audio/ogg" }, - .{ ".otf", "font/otf" }, - .{ ".png", "image/png" }, - .{ ".pdf", "application/pdf" }, - .{ ".php", "application/x-httpd-php" }, - .{ ".ppt", "application/vnd.ms-powerpoint" }, - .{ ".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation" }, - .{ ".rar", "application/vnd.rar" }, - .{ ".rtf", "application/rtf" }, - .{ ".sh", "application/x-sh" }, - .{ ".svg", "image/svg+xml" }, - .{ ".tar", "application/x-tar" }, - .{ ".tif, .tiff", "image/tiff" }, - .{ ".ts", "video/mp2t" }, - .{ ".ttf", "font/ttf" }, - .{ ".txt", "text/plain" }, - .{ ".vsd", "application/vnd.visio" }, - .{ ".wav", "audio/wav" }, - .{ ".weba", "audio/webm" }, - .{ ".webm", "video/webm" }, - .{ ".webmanifest", "application/manifest+json" }, - .{ ".webp", "image/webp" }, - .{ ".woff", "font/woff" }, - .{ ".woff2", "font/woff2" }, - .{ ".xhtml", "application/xhtml+xml" }, - .{ ".xls", "application/vnd.ms-excel" }, - .{ ".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }, - .{ ".xml", "application/xml" }, - .{ ".xul", "application/vnd.mozilla.xul+xml" }, - .{ ".zip", "application/zip." }, - .{ ".3gp", "video/3gpp;" }, - .{ ".3g2", "video/3gpp2;" }, - .{ ".7z", "application/x-7z-compressed" }, -}); - diff --git a/src/prompt.zig b/src/prompt.zig deleted file mode 100644 index 9fa9a9a..0000000 --- a/src/prompt.zig +++ /dev/null @@ -1,44 +0,0 @@ -const std = @import("std"); -const ansi = @import("ansi.zig"); - -var output_buffer: [1024]u8 = undefined; -var writer_stderr = std.fs.File.stderr().writer(&output_buffer); -const stderr = &writer_stderr.interface; - -var input_buffer: [1024]u8 = undefined; -var reader_stdin = std.fs.File.stdin().reader(&input_buffer); -const stdin = &reader_stdin.interface; - -pub fn read( - prompt: []const u8, - allocator: std.mem.Allocator, -) ![]u8 { - try stderr.print( - "{f}{f}{f} ", - .{ - ansi.Styled { - .text = " ", - .bg = .blue, - .bold = true, - }, - ansi.Styled { - .text = prompt, - .bg = .blue, - .bold = true, - }, - ansi.Styled { - .text = ": ", - .bg = .blue, - .bold = true, - }, - }, - ); - - try stderr.flush(); - - var output = std.Io.Writer.Allocating.init(allocator); - errdefer output.deinit(); - _ = try stdin.streamDelimiter(&output.writer, '\n'); - stdin.toss(1); - return output.toOwnedSlice(); -} diff --git a/src/root.zig b/src/root.zig deleted file mode 100644 index ab7a62b..0000000 --- a/src/root.zig +++ /dev/null @@ -1,11 +0,0 @@ -const std = @import("std"); - -pub const log = @import("log.zig"); - -pub const routes = @import("routes/root.zig"); - -pub const Server = @import("server.zig"); -pub const Storage = @import("storage/root.zig"); -pub const Context = @import("context.zig"); -pub const Stream = @import("stream/root.zig").Stream; -pub const locked = @import("locked.zig"); diff --git a/src/routes/access.zig b/src/routes/access.zig deleted file mode 100644 index 39872b8..0000000 --- a/src/routes/access.zig +++ /dev/null @@ -1,6 +0,0 @@ - -pub const Access = enum { - everyone, - users, - admins, -}; diff --git a/src/routes/api/auth/first-login.zig b/src/routes/api/auth/first-login.zig deleted file mode 100644 index 523fdf4..0000000 --- a/src/routes/api/auth/first-login.zig +++ /dev/null @@ -1,15 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; - -pub const access = .everyone; - -const Result = struct { - is_first: bool, -}; - -pub fn post(ctx: *Context) anyerror!Result { - _ = ctx; - return .{ .is_first = false }; -} diff --git a/src/routes/api/auth/login.zig b/src/routes/api/auth/login.zig deleted file mode 100644 index 8a33082..0000000 --- a/src/routes/api/auth/login.zig +++ /dev/null @@ -1,34 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; - -const Body = struct { - user: []const u8, - password: []const u8, -}; - -const Result = struct { - success: bool, -}; - -pub const access = .everyone; - -pub fn post(ctx: *Context, body: Body) anyerror!Result { - var user = Storage.User.open(ctx.storage, body.user) catch return .{ - .success = false - }; - defer user.deinit(); - - const result = Result { - .success = user.check_password(body.password) - }; - - if (result.success) { - const session = try ctx.storage.sessions.add(ctx.storage, user.info); - ctx.response.headers.fingerprint = session.fingerprint; - } - - return result; -} diff --git a/src/routes/api/auth/root.zig b/src/routes/api/auth/root.zig deleted file mode 100644 index 5f45891..0000000 --- a/src/routes/api/auth/root.zig +++ /dev/null @@ -1,4 +0,0 @@ -const HandlerInfo = @import("../../handler-info.zig"); - -pub const login: HandlerInfo = .from_type(@import("login.zig")); -pub const @"first-login": HandlerInfo = .from_type(@import("first-login.zig")); diff --git a/src/routes/api/image/list.zig b/src/routes/api/image/list.zig deleted file mode 100644 index 5d2eace..0000000 --- a/src/routes/api/image/list.zig +++ /dev/null @@ -1,42 +0,0 @@ -const std = @import("std"); -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; - -pub const access = .users; - -const ImageInfo = struct { - id: []const u8, - timestamp: ?i64, -}; - -const Result = struct { - images: []ImageInfo, -}; - -pub fn get(ctx: *Context) !Result { - var images: std.ArrayList(ImageInfo) = .empty; - - var images_list = ctx.storage.images.list(); - defer images_list.unlock(); - - var locked = ctx.storage.images.first_by_timestamp(); - defer locked.unlock(); - - var current = locked.value; - - while (current) |c| { - const image = ctx.storage.images.items.items[c.index]; - - try images.append(ctx.allocator, .{ - .id = try ctx.allocator.dupe(u8, image.id), - .timestamp = image.timestamp, - }); - - current = c.next(); - } - - return .{ - .images = try images.toOwnedSlice(ctx.allocator), - }; -} diff --git a/src/routes/api/image/load.zig b/src/routes/api/image/load.zig deleted file mode 100644 index 3ef25d6..0000000 --- a/src/routes/api/image/load.zig +++ /dev/null @@ -1,15 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; -const mime = @import("../../../mime.zig"); - -pub const access = .users; - -pub fn get(ctx: *Context) !memora.Stream { - const id = ctx.request.head.target["/api/image/load/".len..]; - var image = Storage.Image { .id = id, .timestamp = null }; - ctx.response.headers.content_type = comptime mime.content_types.get(".jpeg") orelse unreachable; - return .from_file(try image.file(ctx.storage)); -} diff --git a/src/routes/api/image/query.zig b/src/routes/api/image/query.zig deleted file mode 100644 index e69de29..0000000 diff --git a/src/routes/api/image/remove.zig b/src/routes/api/image/remove.zig deleted file mode 100644 index d99cbb4..0000000 --- a/src/routes/api/image/remove.zig +++ /dev/null @@ -1,14 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; - -pub const access = .users; - -const Body = struct { - id: []const u8, -}; - -pub fn post(ctx: *Context, body: Body) anyerror!void { - return ctx.storage.images.delete(ctx.storage, body.id); -} diff --git a/src/routes/api/image/root.zig b/src/routes/api/image/root.zig deleted file mode 100644 index 931bb06..0000000 --- a/src/routes/api/image/root.zig +++ /dev/null @@ -1,6 +0,0 @@ -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")); -pub const remove: HandlerInfo = .from_type(@import("remove.zig")); diff --git a/src/routes/api/image/upload.zig b/src/routes/api/image/upload.zig deleted file mode 100644 index 72c8a2d..0000000 --- a/src/routes/api/image/upload.zig +++ /dev/null @@ -1,17 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; - -const log = std.log.scoped(.image_upload); - -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 ctx.storage.images.save(ctx.storage, reader, length); - } -} diff --git a/src/routes/api/profile/create.zig b/src/routes/api/profile/create.zig deleted file mode 100644 index 68f32ec..0000000 --- a/src/routes/api/profile/create.zig +++ /dev/null @@ -1,29 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; - -pub const access = .admins; - -const Body = struct { - name: []const u8, - full_name: []const u8, - birthday: []const u8, - password: []const u8, -}; - -pub fn post(ctx: *Context, body: Body) !void { - var user = try Storage.User.new( - ctx.storage, - body.name, - body.full_name, - body.birthday, - body.password, - true, - ctx.storage.allocator, - ); - defer user.deinit(); - - try user.sync(); -} diff --git a/src/routes/api/profile/image/load.zig b/src/routes/api/profile/image/load.zig deleted file mode 100644 index 4b696ce..0000000 --- a/src/routes/api/profile/image/load.zig +++ /dev/null @@ -1,17 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; - -pub const access = .users; - -pub fn get(ctx: *Context) !memora.Stream { - const name = ctx.request.head.target["/api/profile/image/load/".len..]; - if (Storage.User.image(ctx.storage, name)) |file| { - ctx.response.headers.content_type = "image/jpeg"; - return .from_file(file); - } - - return error.NotFound; -} diff --git a/src/routes/api/profile/image/root.zig b/src/routes/api/profile/image/root.zig deleted file mode 100644 index d6b77f2..0000000 --- a/src/routes/api/profile/image/root.zig +++ /dev/null @@ -1,5 +0,0 @@ -const memora = @import("memora"); -const HandlerInfo = memora.routes.HandlerInfo; - -pub const upload: HandlerInfo = .from_type(@import("upload.zig")); -pub const load: HandlerInfo = .from_type(@import("load.zig")); diff --git a/src/routes/api/profile/image/upload.zig b/src/routes/api/profile/image/upload.zig deleted file mode 100644 index db140d4..0000000 --- a/src/routes/api/profile/image/upload.zig +++ /dev/null @@ -1,19 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; - -pub const access = .users; - -pub fn post(ctx: *Context) !void { - const name = ctx.request.head.target["/api/profile/image/upload/".len..]; - if (ctx.request.head.content_length) |length| { - var buffer: [1024]u8 = undefined; - const reader = try ctx.request.readerExpectContinue(&buffer); - - try Storage.User.set_image(ctx.storage, name, reader, length); - - ctx.response.headers.content_type = "image/jpeg"; - } -} diff --git a/src/routes/api/profile/list.zig b/src/routes/api/profile/list.zig deleted file mode 100644 index 59d4684..0000000 --- a/src/routes/api/profile/list.zig +++ /dev/null @@ -1,17 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; - -pub const access = .admins; - -const Response = struct { - users: [][]const u8, -}; - -pub fn get(ctx: *Context) !Response { - return .{ - .users = try Storage.User.list(ctx.storage, ctx.allocator) - }; -} diff --git a/src/routes/api/profile/root.zig b/src/routes/api/profile/root.zig deleted file mode 100644 index 45dec8e..0000000 --- a/src/routes/api/profile/root.zig +++ /dev/null @@ -1,8 +0,0 @@ -const memora = @import("memora"); -const HandlerInfo = memora.routes.HandlerInfo; - -pub const image = @import("image/root.zig"); -pub const set: HandlerInfo = .from_type(@import("set.zig")); -pub const @"update-password": HandlerInfo = .from_type(@import("update-password.zig")); -pub const create: HandlerInfo = .from_type(@import("create.zig")); -pub const list: HandlerInfo = .from_type(@import("list.zig")); diff --git a/src/routes/api/profile/set.zig b/src/routes/api/profile/set.zig deleted file mode 100644 index a007b23..0000000 --- a/src/routes/api/profile/set.zig +++ /dev/null @@ -1,26 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; - -pub const access = .users; - -const Body = struct { - full_name: []const u8, - birthday: []const u8, -}; - -pub fn post(ctx: *Context, body: Body) !void { - if (ctx.storage.sessions.get(ctx.storage, ctx.fingerprint)) |session| { - var user = try Storage.User.open(ctx.storage, session.info.name); - defer user.deinit(); - - user.info.full_name = body.full_name; - user.info.birthday = body.birthday; - - try user.sync(); - } else { - return error.UnknownSession; - } -} diff --git a/src/routes/api/profile/update-password.zig b/src/routes/api/profile/update-password.zig deleted file mode 100644 index ac6ceed..0000000 --- a/src/routes/api/profile/update-password.zig +++ /dev/null @@ -1,37 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; - -pub const access = .users; - -const Body = struct { - current_password: []const u8, - new_password: []const u8, -}; - -const Response = struct { - success: bool, -}; - -pub fn post(ctx: *Context, body: Body) !Response { - if (ctx.storage.sessions.get(ctx.storage, ctx.fingerprint)) |session| { - var user = try Storage.User.open(ctx.storage, session.info.name); - defer user.deinit(); - - const result = Response { - .success = user.check_password(body.current_password) - }; - - if (result.success) { - try user.set_password(body.new_password); - try user.sync(); - } - - return result; - - } else { - return error.UnknownSession; - } -} diff --git a/src/routes/api/root.zig b/src/routes/api/root.zig deleted file mode 100644 index 5f731c3..0000000 --- a/src/routes/api/root.zig +++ /dev/null @@ -1,4 +0,0 @@ -pub const auth = @import("auth/root.zig"); -pub const session = @import("session/root.zig"); -pub const image = @import("image/root.zig"); -pub const profile = @import("profile/root.zig"); diff --git a/src/routes/api/session/current.zig b/src/routes/api/session/current.zig deleted file mode 100644 index 897d01c..0000000 --- a/src/routes/api/session/current.zig +++ /dev/null @@ -1,27 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; - -pub const access = .users; - -const Result = struct { - name: []const u8, - full_name: []const u8, - birthday: []const u8, - is_admin: bool, -}; - -pub fn get(ctx: *Context) !Result { - const session = ctx.storage.sessions.get( - ctx.storage, - ctx.fingerprint, - ) orelse return error.UserDoesNotExist; - - return .{ - .name = session.info.name, - .full_name = session.info.full_name, - .birthday = session.info.birthday, - .is_admin = session.info.is_admin, - }; -} diff --git a/src/routes/api/session/drop.zig b/src/routes/api/session/drop.zig deleted file mode 100644 index 4b193e0..0000000 --- a/src/routes/api/session/drop.zig +++ /dev/null @@ -1,9 +0,0 @@ -const memora = @import("memora"); -const Context = memora.Context; - -pub const access = .users; - -pub fn get(ctx: *Context) !void { - ctx.storage.sessions.remove(ctx.storage, ctx.fingerprint); - ctx.response.headers.fingerprint = ""; -} diff --git a/src/routes/api/session/is-online.zig b/src/routes/api/session/is-online.zig deleted file mode 100644 index f5ebaee..0000000 --- a/src/routes/api/session/is-online.zig +++ /dev/null @@ -1,15 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; - -pub const access = .everyone; - -const Result = struct { - is_online: bool, -}; - -pub fn get(ctx: *Context) !Result { - _ = ctx; - return .{ .is_online = true }; -} diff --git a/src/routes/api/session/is-valid.zig b/src/routes/api/session/is-valid.zig deleted file mode 100644 index 8cf6794..0000000 --- a/src/routes/api/session/is-valid.zig +++ /dev/null @@ -1,21 +0,0 @@ -const std = @import("std"); -const config = @import("config"); - -const memora = @import("memora"); -const Context = memora.Context; - -pub const access = .everyone; - -const Result = struct { - is_valid: bool -}; - -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/api/session/renew.zig b/src/routes/api/session/renew.zig deleted file mode 100644 index c13e27e..0000000 --- a/src/routes/api/session/renew.zig +++ /dev/null @@ -1,9 +0,0 @@ -const memora = @import("memora"); -const Context = memora.Context; - -pub const access = .users; - -pub fn get(ctx: *Context) !void { - const new = try ctx.storage.sessions.renew(ctx.storage, ctx.fingerprint); - ctx.response.headers.fingerprint = new.fingerprint; -} diff --git a/src/routes/api/session/root.zig b/src/routes/api/session/root.zig deleted file mode 100644 index a889869..0000000 --- a/src/routes/api/session/root.zig +++ /dev/null @@ -1,7 +0,0 @@ -const HandlerInfo = @import("../../handler-info.zig"); - -pub const current: HandlerInfo = .from_type(@import("current.zig")); -pub const drop: HandlerInfo = .from_type(@import("drop.zig")); -pub const renew: HandlerInfo = .from_type(@import("renew.zig")); -pub const @"is-valid": HandlerInfo = .from_type(@import("is-valid.zig")); -pub const @"is-online": HandlerInfo = .from_type(@import("is-online.zig")); diff --git a/src/routes/handler-info.zig b/src/routes/handler-info.zig deleted file mode 100644 index ca4babd..0000000 --- a/src/routes/handler-info.zig +++ /dev/null @@ -1,225 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Context = memora.Context; -const Storage = memora.Storage; - -const config = @import("config"); - -const Access = @import("access.zig").Access; - -const log = std.log.scoped(.handler_info); - -const Self = @This(); - -const Handler = *const fn (*Context) anyerror!memora.Stream; - -get: ?Handler, -head: ?Handler, -post: ?Handler, -put: ?Handler, -delete: ?Handler, -connect: ?Handler, -options: ?Handler, -trace: ?Handler, -patch: ?Handler, -access: Access, - -inline fn handler_from_method(self: *const Self, method: std.http.Method) ?Handler { - return switch (method) { - .GET => self.get, - .HEAD => self.head, - .POST => self.post, - .PUT => self.put, - .DELETE => self.delete, - .CONNECT => self.connect, - .OPTIONS => self.options, - .TRACE => self.trace, - .PATCH => self.patch, - }; -} - -inline fn get_fingerprint(cookie: []const u8) []const u8 { - const start = std.mem.indexOf(u8, cookie, "fingerprint=") orelse return ""; - const end = std.mem.indexOf(u8, cookie[start + 12..], " ") orelse return cookie[start + 12..]; - return cookie[start..end + 1]; -} - -pub fn handle( - self: *const Self, - request: *std.http.Server.Request, - storage: *Storage, - allocator: std.mem.Allocator, -) !void { - const target = try allocator.dupe(u8, request.head.target); - defer allocator.free(target); - - const handler = self.handler_from_method(request.head.method) orelse return request.respond( - "{ \"error\": \"Bad Request\" }", - .{ .status = .bad_request } - ); - - const cookie = cookie: { - var iterator = request.iterateHeaders(); - while (iterator.next()) |header| { - if (std.ascii.eqlIgnoreCase(header.name, "cookie")) { - break :cookie header.value; - } - } - break :cookie ""; - }; - - var arena = std.heap.ArenaAllocator.init(allocator); - defer arena.deinit(); - var context: Context = .{ - .request = request, - .storage = storage, - .allocator = arena.allocator(), - .fingerprint = get_fingerprint(cookie), - }; - - 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 } - ); - } - } - - var stream = handler(&context) catch |err| { - const response, const status_code: std.http.Status = switch (err) { - error.BadRequest => .{ "{ \"error\": \"Bad Request\" }", .bad_request }, - error.Unauthorized => .{ "{ \"error\": \"Unauthorized\" }", .unauthorized }, - error.Forbidden => .{ "{ \"error\": \"Forbidden\" }", .forbidden }, - error.NotFound => .{ "{ \"error\": \"Not Found\" }", .not_found }, - else => blk: { - log.err("handler for '{s}' returned {}", .{target, err}); - break :blk .{ "{ \"error\": \"Internal Server Error\" }", .internal_server_error }; - }, - }; - - return request.respond(response, .{ .status = status_code }); - }; - defer stream.close(); - - var headers: std.ArrayList(std.http.Header) = .empty; - defer headers.deinit(allocator); - - try headers.append(allocator, .{ - .name = "Content-Type", - .value = context.response.headers.content_type - }); - - try headers.append(allocator, .{ - .name = "Service-Worker-Allowed", - .value = "/", - }); - - if (context.response.headers.fingerprint) |auth_token| { - var value = std.Io.Writer.Allocating.init(arena.allocator()); - - try value.writer.print("fingerprint={s}; Secure; Path=/; Max-Age={}", .{ - auth_token, - storage.config.session_expires_after / std.time.ns_per_s, - }); - - try headers.append(allocator, .{ - .name = "Set-Cookie", - .value = value.written(), - }); - } - - var read_buffer: [1024]u8 = undefined; - var reader = stream.reader(&read_buffer); - - var write_buffer: [1024]u8 = undefined; - var body_writer = try request.respondStreaming(&write_buffer, .{ - .respond_options = .{ - .extra_headers = headers.items, - .transfer_encoding = .chunked, - }, - }); - - _ = try reader.streamRemaining(&body_writer.writer); - try body_writer.end(); -} - -fn HandlerWrapper(T: type, name: []const u8) type { - const info = @typeInfo(@TypeOf(@field(T, name))); - const return_type = info.@"fn".return_type orelse void; - const payload_type = @typeInfo(return_type).error_union.payload; - - return struct { - pub fn call(ctx: *Context) anyerror!memora.Stream { - const args = args: { - const tuple = std.meta.fields(std.meta.ArgsTuple(@TypeOf(@field(T, name)))); - - if (tuple.len == 1) { - break :args .{ ctx }; - } else if (tuple.len == 2) { - const Body = tuple[1].@"type"; - - var writer = std.Io.Writer.Allocating.init(ctx.allocator); - const interface = &writer.writer; - - var buffer: [1024]u8 = undefined; - const reader = try ctx.request.readerExpectContinue(&buffer); - - try reader.streamExact64(interface, ctx.request.head.content_length orelse 0); - - const body = std.json.parseFromSliceLeaky( - Body, - ctx.allocator, - writer.written(), - .{}, - ) catch |err| { - log.warn("failed to parse JSON {}", .{err}); - return error.BadRequest; - }; - break :args .{ ctx, body }; - } else { - @compileError("invalid amount of arguments for request function"); - } - }; - - if (payload_type == memora.Stream) { - return @call(.auto, @field(T, name), args); - } else if (payload_type == void) { - try @call(.auto, @field(T, name), args); - return memora.Stream.from_buffer("{}"); - } else { - var writer = std.Io.Writer.Allocating.init(ctx.allocator); - var stringify = std.json.Stringify { .writer = &writer.writer }; - try stringify.write(try @call(.auto, @field(T, name), args)); - return memora.Stream.from_buffer(writer.written()); - } - } - }; -} - -pub fn from_type(T: type) @This() { - return Self { - .get = if (@hasDecl(T, "get")) HandlerWrapper(T, "get").call else null, - .head = if (@hasDecl(T, "head")) HandlerWrapper(T, "head").call else null, - .post = if (@hasDecl(T, "post")) HandlerWrapper(T, "post").call else null, - .put = if (@hasDecl(T, "put")) HandlerWrapper(T, "put").call else null, - .delete = if (@hasDecl(T, "delete")) HandlerWrapper(T, "delete").call else null, - .connect = if (@hasDecl(T, "connect")) HandlerWrapper(T, "connect").call else null, - .options = if (@hasDecl(T, "options")) HandlerWrapper(T, "options").call else null, - .trace = if (@hasDecl(T, "trace")) HandlerWrapper(T, "trace").call else null, - .patch = if (@hasDecl(T, "patch")) HandlerWrapper(T, "patch").call else null, - .access = T.access, - }; -} diff --git a/src/routes/root.zig b/src/routes/root.zig deleted file mode 100644 index c438893..0000000 --- a/src/routes/root.zig +++ /dev/null @@ -1,49 +0,0 @@ -const std = @import("std"); - -pub const HandlerInfo = @import("handler-info.zig"); - -pub const api = @import("api/root.zig"); -pub const static: HandlerInfo = .from_type(@import("static.zig")); - -const routes = (Routes {}) - .with("", static) - .with_module("/api", api); - -pub const handlers = std.StaticStringMap(HandlerInfo).initComptime(routes.items); - -pub fn get(path: []const u8) HandlerInfo { - return (handlers.getLongestPrefix(std.mem.trimEnd(u8, path, "/")) orelse unreachable).value; -} - -const Routes = struct { - const Self = @This(); - - const Route = struct{ []const u8, HandlerInfo }; - - items: []const Route = &[0]Route{}, - - pub fn with(self: Self, comptime route: []const u8, handler: HandlerInfo) Self { - var next = self; - const tail: []const Route = &[1]Route { .{ route, handler } }; - next.items = self.items ++ tail; - return next; - } - - pub fn with_module(self: Self, comptime prefix: []const u8, module: type) Self { - var next = self; - - if (@typeInfo(module) != .@"struct") return self; - - inline for (@typeInfo(module).@"struct".decls) |decl| { - const field = @field(module, decl.name); - const route = prefix ++ "/" ++ decl.name; - switch (@TypeOf(field)) { - type => next = next.with_module(route, field), - HandlerInfo => next = next.with(route, field), - else => {}, - } - } - - return next; - } -}; diff --git a/src/routes/static.zig b/src/routes/static.zig deleted file mode 100644 index f8f7a6c..0000000 --- a/src/routes/static.zig +++ /dev/null @@ -1,35 +0,0 @@ -const std = @import("std"); -const mime = @import("../mime.zig"); -const config = @import("config"); - -const memora = @import("memora"); -const Context = memora.Context; - -const log = std.log.scoped(.fallback); - -pub const access = .everyone; - -pub fn get(ctx: *Context) anyerror!memora.Stream { - var static = try std.fs.cwd().openDir(config.static_path, .{}); - defer static.close(); - - if (static.openFile(ctx.request.head.target[1..], .{})) |file| { - const mime_type = mime.get_type(ctx.request.head.target); - ctx.response.headers.content_type = mime_type; - return .from_file(file); - } else |_| { - var subdir = if (ctx.request.head.target.len == 1) static - else (static.openDir(ctx.request.head.target[1..], .{}) catch { - return error.NotFound; - }); - defer if (ctx.request.head.target.len > 1) subdir.close(); - - if (subdir.openFile("index.html", .{})) |file| { - ctx.response.headers.content_type = "text/html"; - return .from_file(file); - } else |_| { - log.warn("File '{s}' Not Found", .{ ctx.request.head.target }); - return error.NotFound; - } - } -} diff --git a/src/server.zig b/src/server.zig deleted file mode 100644 index 5a9be74..0000000 --- a/src/server.zig +++ /dev/null @@ -1,73 +0,0 @@ -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); - - while (true) { - var request = http_server.receiveHead() catch return; - log.info("{s} {s}", .{ - std.enums.tagName(std.http.Method, request.head.method) orelse "", - 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/exif.zig b/src/storage/image-manager/exif.zig deleted file mode 100644 index 88e9b48..0000000 --- a/src/storage/image-manager/exif.zig +++ /dev/null @@ -1,57 +0,0 @@ -const std = @import("std"); -const exif = @cImport(@cInclude("libexif/exif-data.h")); -const cstd = @cImport(@cInclude("time.h")); - -const tags = [_]c_uint { - exif.EXIF_TAG_DATE_TIME, - exif.EXIF_TAG_DATE_TIME_ORIGINAL, - exif.EXIF_TAG_DATE_TIME_DIGITIZED, -}; - -pub fn get_date_time(path: [*:0]const u8) ?i64 { - const exif_data = exif.exif_data_new_from_file(path); - defer exif.exif_data_unref(exif_data); - - if (exif_data == 0) { - return null; - } - - var entry: ?[*c]exif.struct__ExifEntry = null; - for (0..exif.EXIF_IFD_COUNT) |index| { - for (tags) |tag| { - entry = exif.exif_content_get_entry((exif_data.*).ifd[index], tag); - - if (entry) |_| { break; } - } - - if (entry) |_| { break; } - } - - if (entry == 0) { - return null; - } - - if (entry) |e| { - const c_data = (e.*).data; - return parse_date(c_data); - } - - return null; -} - -extern fn strptime( - s: [*c]const u8, - format: [*c]const u8, - tm: *cstd.tm, -) ?*const u8; - -extern fn mktime(tm: *cstd.tm) i64; - -fn parse_date(date: [*:0]const u8) ?i64 { - var tm: cstd.tm = std.mem.zeroes(cstd.tm); - if (strptime(date, "%Y:%m:%d %H:%M:%S", &tm)) |_| { - return mktime(&tm); - } - - return null; -} diff --git a/src/storage/image-manager/image.zig b/src/storage/image-manager/image.zig deleted file mode 100644 index bdac5c7..0000000 --- a/src/storage/image-manager/image.zig +++ /dev/null @@ -1,110 +0,0 @@ -const std = @import("std"); -const Storage = @import("../root.zig"); - -const exif = @import("exif.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, -timestamp: ?i64, - -pub fn new( - storage: *Storage, - reader: *std.Io.Reader, - size: usize, -) !Self { - var dir = try storage.dir.openDir("image", .{}); - defer dir.close(); - - var self: Self = undefined; - - self.id = try storage.allocator.dupe(u8, &new_id()); - - var file_name: [id_size + 4]u8 = undefined; - @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 }); - - self.timestamp = try load_timestamp(storage, self.id); - - return self; -} - -pub fn delete(self: *Self, storage: *Storage) !void { - var dir = 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"); - - try dir.deleteFile(&file_name); -} - -pub fn init(storage: *Storage, id: []const u8) !Self { - return .{ - .id = try storage.allocator.dupe(u8, id), - .timestamp = try load_timestamp(storage, 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); -} - -fn load_timestamp(storage: *Storage, id: []const u8) !?i64 { - 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], id); - @memcpy(file_name[id_size..], ".jpg"); - - var path_buffer: [std.fs.max_path_bytes:0]u8 = std.mem.zeroes([std.fs.max_path_bytes:0]u8); - const path = try dir.realpath(&file_name, &path_buffer); - - return exif.get_date_time(@ptrCast(path)); -} diff --git a/src/storage/image-manager/root.zig b/src/storage/image-manager/root.zig deleted file mode 100644 index efc216f..0000000 --- a/src/storage/image-manager/root.zig +++ /dev/null @@ -1,138 +0,0 @@ -const std = @import("std"); - -const memora = @import("memora"); -const Storage = memora.Storage; -pub const Image = @import("image.zig"); - -const Self = @This(); - -pub const empty: Self = .{}; - -const Timestamp = struct { - index: usize, - node: std.DoublyLinkedList.Node, - - pub fn next(self: *Timestamp) ?*Timestamp { - return @fieldParentPtr("node", self.node.next orelse return null); - } - - pub fn prev(self: *Timestamp) ?*Timestamp { - return @fieldParentPtr("node", self.node.prev orelse return null); - } -}; - -items: std.ArrayList(Image) = .empty, -rw_lock: std.Thread.RwLock = .{}, -timestamp_order: std.DoublyLinkedList = .{}, - -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.add( - storage.allocator, - try .init(storage, entry.name[0..entry.name.len - 4]) - ); - } - } -} - -pub fn add(self: *Self, allocator: std.mem.Allocator, image: Image) !void { - self.rw_lock.lock(); - defer self.rw_lock.unlock(); - - try self.items.append( - allocator, - image, - ); - - var current = self.timestamp_order.first; - - while (current) |c| { - const index = @as(*Timestamp, @fieldParentPtr("node", c)).index; - if (image.timestamp orelse 0 > self.items.items[index].timestamp orelse 0) { - const timestamp = try allocator.create(Timestamp); - timestamp.index = self.items.items.len - 1; - self.timestamp_order.insertBefore(c, ×tamp.node); - return; - } - - current = c.next; - } - - const timestamp = try allocator.create(Timestamp); - timestamp.index = self.items.items.len - 1; - self.timestamp_order.append(×tamp.node); - return; -} - -pub fn save( - self: *Self, - storage: *Storage, - reader: *std.Io.Reader, - size: usize, -) !void { - return self.add(storage.allocator, try Image.new(storage, reader, size)); -} - -pub fn list(self: *Self) memora.locked.Shared([]Image) { - self.rw_lock.lockShared(); - return .{ - .value = self.items.items, - .rw_lock = &self.rw_lock, - }; -} - -pub fn first_by_timestamp(self: *Self) memora.locked.Shared(?*Timestamp) { - self.rw_lock.lockShared(); - return .{ - .value = if (self.timestamp_order.first) |first| @fieldParentPtr("node", first) - else null, - .rw_lock = &self.rw_lock, - }; -} - -pub fn delete(self: *Self, storage: *Storage, id: []const u8) !void { - self.rw_lock.lock(); - defer self.rw_lock.unlock(); - - const index = index: { - for (self.items.items, 0..) |image, index| { - if (std.mem.eql(u8, image.id, id)) { - break :index index; - } - } - break :index null; - }; - - if (index) |idx| { - try self.items.items[idx].delete(storage); - const old_index = self.items.items.len - 1; - _ = self.items.swapRemove(idx); - - var current: ?*Timestamp = if (self.timestamp_order.first) |c| @fieldParentPtr("node", c) else null; - - while (current) |c| { - if (c.index == idx) { - self.timestamp_order.remove(&c.node); - storage.allocator.destroy(c); - } else if (c.index == old_index) { - c.index = idx; - } - - current = c.next(); - } - } -} diff --git a/src/storage/media-manager/root.zig b/src/storage/media-manager/root.zig deleted file mode 100644 index e69de29..0000000 diff --git a/src/storage/root.zig b/src/storage/root.zig deleted file mode 100644 index f11798b..0000000 --- a/src/storage/root.zig +++ /dev/null @@ -1,79 +0,0 @@ -const std = @import("std"); -const prompt = @import("../prompt.zig"); -const Config = @import("../config.zig"); - -pub const User = @import("user.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; - -const Self = @This(); - -dir: std.fs.Dir, -sessions: SessionManager = .empty, -images: ImageManager = .empty, -config: Config, -allocator: std.mem.Allocator, - -pub fn init( - allocator: std.mem.Allocator, -) !Self { - var config = try Config.load(allocator); - errdefer config.deinit(); - - const dir = std.fs.cwd().openDir(config.storage_path, .{}) catch blk: { - try std.fs.cwd().makeDir(config.storage_path); - break :blk try std.fs.cwd().openDir(config.storage_path, .{}); - }; - - var self = Self { - .config = config, - .dir = dir, - .allocator = allocator, - }; - - dir.access("user", .{}) catch |err| switch (err) { - error.FileNotFound => { - const name = try prompt.read("Username", allocator); - defer allocator.free(name); - - const full_name = try prompt.read("Full Name", allocator); - defer allocator.free(full_name); - - const birthday = try prompt.read("Birthday", allocator); - defer allocator.free(birthday); - - const password = try prompt.read("Password", allocator); - defer allocator.free(password); - - try self.dir.makeDir("user"); - - var user: User = try .new( - &self, - name, - full_name, - birthday, - password, - true, - allocator, - ); - defer user.deinit(); - - try user.sync(); - }, - else => return err, - }; - - try self.images.init(&self); - - return self; -} - -pub fn deinit(self: *Self) void { - self.dir.close(); - self.config.deinit(); - self.* = undefined; -} diff --git a/src/storage/session-manager/root.zig b/src/storage/session-manager/root.zig deleted file mode 100644 index db95629..0000000 --- a/src/storage/session-manager/root.zig +++ /dev/null @@ -1,78 +0,0 @@ -const std = @import("std"); -const config = @import("../../config.zig"); -const Storage = @import("../root.zig"); - -pub const Session = @import("session.zig"); - -const Self = @This(); - -pub const empty: Self = .{ - .cache = .empty, -}; - -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); - return self.cache.getPtr(session.fingerprint) orelse unreachable; -} - -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(); - - try self.cache.put(storage.allocator, session.fingerprint, 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.contains(fingerprint)) { - self.rw_lock.unlockShared(); - self.rw_lock.lock(); - defer self.rw_lock.unlock(); - - const kv = self.cache.fetchRemove(fingerprint) orelse return; - kv.value.deinit(storage.allocator); - } 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 > storage.config.session_expires_after) { - session.deinit(storage.allocator); - _ = self.cache.remove(fingerprint); - return null; - } - - return session; - } - - return null; -} diff --git a/src/storage/session-manager/session.zig b/src/storage/session-manager/session.zig deleted file mode 100644 index 943334b..0000000 --- a/src/storage/session-manager/session.zig +++ /dev/null @@ -1,34 +0,0 @@ -const std = @import("std"); -const User = @import("../user.zig"); - -const Self = @This(); - -const fingerprint_size = 512; - -age: std.time.Instant, -info: User.Info, -fingerprint: []u8, - -pub fn init(allocator: std.mem.Allocator, info: User.Info) !Self { - var self: Self = undefined; - self.info = try info.clone(allocator); - self.fingerprint = try allocator.alloc(u8, fingerprint_size); - try self.reset(); - - return self; -} - -pub fn reset(self: *Self) !void { - var raw_buffer: [fingerprint_size / 2]u8 = undefined; - std.crypto.random.bytes(&raw_buffer); - - var writer = std.Io.Writer.fixed(self.fingerprint); - writer.print("{x}", .{raw_buffer}) catch unreachable; - - self.age = try std.time.Instant.now(); -} - -pub fn deinit(self: *const Self, allocator: std.mem.Allocator) void { - self.info.deinit(allocator); - allocator.free(self.fingerprint); -} diff --git a/src/storage/user.zig b/src/storage/user.zig deleted file mode 100644 index c2cc82a..0000000 --- a/src/storage/user.zig +++ /dev/null @@ -1,234 +0,0 @@ -const std = @import("std"); -const Storage = @import("root.zig"); - -const log = std.log.scoped(.user); - -const Self = @This(); - -pub const Info = struct { - name: []const u8, - full_name: []const u8, - birthday: []const u8, - hash: []const u8, - is_admin: bool, - - pub fn clone(self: *const @This(), allocator: std.mem.Allocator) !@This() { - var clone_self: @This() = undefined; - var i: usize = 0; - - inline for (std.meta.fields(@This())) |field_info| { - if (field_info.type == []const u8) { - @field(clone_self, field_info.name) = try allocator.dupe( - u8, - @field(self, field_info.name), - ); - errdefer allocator.free(@field(clone_self, field_info.name)); - } else { - @field(clone_self, field_info.name) = @field(self, field_info.name); - } - i += 1; - } - - return clone_self; - } - - pub fn deinit(self: *const @This(), allocator: std.mem.Allocator) void { - inline for (std.meta.fields(@This())) |field_info| { - if (field_info.type == []const u8) { - allocator.free(@field(self, field_info.name)); - } - } - } -}; - -dir: std.fs.Dir, -info: Info, -arena: std.heap.ArenaAllocator, - -pub fn open( - storage: *Storage, - name: []const u8, -) !Self { - var arena: std.heap.ArenaAllocator = .init(storage.allocator); - errdefer arena.deinit(); - const allocator = arena.allocator(); - - var user_dir = try storage.dir.openDir("user", .{}); - defer user_dir.close(); - - var dir = try user_dir.openDir(name, .{}); - errdefer dir.close(); - - const file = try dir.openFile("info.json", .{ .lock = .shared }); - defer file.close(); - const content = try file.readToEndAlloc(allocator, std.math.maxInt(usize)); - - const info = try std.json.parseFromSliceLeaky(Info, allocator, content, .{}); - - return .{ - .dir = dir, - .arena = arena, - .info = info, - }; -} - -pub fn new( - storage: *Storage, - name: []const u8, - full_name: []const u8, - birthday: []const u8, - password: []const u8, - is_admin: bool, - inner_allocator: std.mem.Allocator -) !Self { - var arena: std.heap.ArenaAllocator = .init(inner_allocator); - const allocator = arena.allocator(); - errdefer arena.deinit(); - - var user_dir = try storage.dir.openDir("user", .{}); - defer user_dir.close(); - - try user_dir.makeDir(name); - var dir = try user_dir.openDir(name, .{}); - errdefer dir.close(); - - var file = try dir.createFile("info.json", .{ .lock = .exclusive }); - file.close(); - - const hash_buf = try allocator.alloc(u8, 256); - const hash = try std.crypto.pwhash.bcrypt.strHash( - password, - .{ - .params = .{ - .rounds_log = 3, - .silently_truncate_password = false, - }, - .encoding = .phc, - }, - hash_buf - ); - - const info: Info = .{ - .name = name, - .full_name = full_name, - .birthday = birthday, - .hash = hash, - .is_admin = is_admin, - }; - - - return .{ - .dir = dir, - .arena = arena, - .info = info, - }; -} - -pub fn set_password(self: *Self, password: []const u8) !void { - const allocator = self.arena.allocator(); - const hash_buf = try allocator.alloc(u8, 256); - const hash = try std.crypto.pwhash.bcrypt.strHash( - password, - .{ - .params = .{ - .rounds_log = 3, - .silently_truncate_password = false, - }, - .encoding = .phc, - }, - hash_buf - ); - - self.info.hash = hash; -} - -pub fn sync(self: *Self) !void { - const file = try self.dir.createFile("info.json", .{ - .lock = .exclusive, - }); - defer file.close(); - - var buffer: [1024]u8 = undefined; - var writer = file.writer(&buffer); - - var stringify = std.json.Stringify { - .writer = &writer.interface, - .options = .{ .whitespace = .indent_2 } - }; - - try stringify.write(self.info); - try writer.interface.flush(); -} - -pub fn check_password(self: *Self, password: []const u8) bool { - std.crypto.pwhash.bcrypt.strVerify(self.info.hash, password, .{ - .silently_truncate_password = false, - }) catch return false; - return true; -} - -pub fn deinit(self: *Self) void { - self.dir.close(); - self.arena.deinit(); - self.* = undefined; -} - -pub fn exists(storage: *Storage, name: []const u8) bool { - var user = storage.dir.openDir("user", .{}) catch return false; - defer user.close(); - - user.access(name, .{}) catch return false; - return true; -} - -pub fn image(storage: *Storage, name: []const u8) ?std.fs.File { - var user = storage.dir.openDir("user", .{}) catch return null; - defer user.close(); - - var profile = user.openDir(name, .{}) catch return null; - defer profile.close(); - return profile.openFile("image.jpg", .{ .lock = .shared }) catch null; -} - -pub fn set_image( - storage: *Storage, - name: []const u8, - reader: *std.Io.Reader, - size: usize, -) !void { - var user = try storage.dir.openDir("user", .{}); - defer user.close(); - - var profile = try user.openDir(name, .{}); - defer profile.close(); - - var image_file = try profile.createFile("image.jpg", .{ .lock = .exclusive }); - defer image_file.close(); - - var buffer: [1024]u8 = undefined; - var file_writer = image_file.writer(&buffer); - - log.info("uploaded to profile {s} [{} bytes]", .{ name, size }); - - try reader.streamExact(&file_writer.interface, size); - - try file_writer.interface.flush(); -} - -pub fn list( - storage: *Storage, - allocator: std.mem.Allocator, -) ![][]const u8 { - var user = try storage.dir.openDir("user", .{ .iterate = true }); - defer user.close(); - - var ids: std.ArrayList([]const u8) = .empty; - - var iterator = user.iterate(); - - while (try iterator.next()) |entry| { - try ids.append(allocator, try allocator.dupe(u8, entry.name)); - } - - return ids.toOwnedSlice(allocator); -} diff --git a/src/stream/buffer.zig b/src/stream/buffer.zig deleted file mode 100644 index fca1deb..0000000 --- a/src/stream/buffer.zig +++ /dev/null @@ -1,28 +0,0 @@ -const std = @import("std"); - -const Self = @This(); - -buffer: []const u8, -buffer_reader: ?std.Io.Reader, - -pub fn init(buffer: []const u8) Self { - return .{ - .buffer = buffer, - .buffer_reader = null, - }; -} - -pub fn reader(self: *Self, buffer: []u8) *std.Io.Reader { - _ = buffer; - - if (self.buffer_reader) |*r| { - return r; - } - - self.buffer_reader = std.Io.Reader.fixed(self.buffer); - return &self.buffer_reader.?; -} - -pub fn close(self: *Self) void { - _ = self; -} diff --git a/src/stream/file.zig b/src/stream/file.zig deleted file mode 100644 index bb6407b..0000000 --- a/src/stream/file.zig +++ /dev/null @@ -1,22 +0,0 @@ -const std = @import("std"); - -const Self = @This(); - -file: std.fs.File, -file_reader: ?std.fs.File.Reader, - -pub fn init(file: std.fs.File) Self { - return .{ - .file = file, - .file_reader = null, - }; -} - -pub fn reader(self: *Self, buffer: []u8) *std.Io.Reader { - self.file_reader = self.file.reader(buffer); - return &self.file_reader.?.interface; -} - -pub fn close(self: *Self) void { - self.file.close(); -} diff --git a/src/stream/root.zig b/src/stream/root.zig deleted file mode 100644 index 11580ac..0000000 --- a/src/stream/root.zig +++ /dev/null @@ -1,33 +0,0 @@ -const std = @import("std"); - -pub const Stream = union(enum) { - const Self = @This(); - - pub const File = @import("file.zig"); - pub const Buffer = @import("buffer.zig"); - - file: File, - buffer: Buffer, - - pub fn from_file(file: std.fs.File) Self { - return .{ .file = File.init(file) }; - } - - pub fn from_buffer(buffer: []const u8) Self { - return .{ .buffer = Buffer.init(buffer) }; - } - - pub fn reader(self: *Self, buffer: []u8) *std.Io.Reader { - return switch(self.*) { - .file => |*f| f.reader(buffer), - .buffer => |*b| b.reader(buffer), - }; - } - - pub fn close(self: *Self) void { - return switch(self.*) { - .file => |*f| f.close(), - .buffer => |*b| b.close(), - }; - } -}; -- cgit v1.2.3-70-g09d2