diff options
author | Martin Ashby <martin@ashbysoft.com> | 2023-09-27 20:23:30 +0100 |
---|---|---|
committer | Martin Ashby <martin@ashbysoft.com> | 2023-09-27 20:23:30 +0100 |
commit | 08472c27c77d27ea084e3458842540351c5a5c28 (patch) | |
tree | 67029d8f6779b107ec8d0cf370981045ccea1e30 /src/conn | |
parent | 4c5101d5f3a60c58190809166f1aa1eac2e7875f (diff) | |
download | pgz-08472c27c77d27ea084e3458842540351c5a5c28.tar.gz pgz-08472c27c77d27ea084e3458842540351c5a5c28.tar.bz2 pgz-08472c27c77d27ea084e3458842540351c5a5c28.tar.xz pgz-08472c27c77d27ea084e3458842540351c5a5c28.zip |
Add cleartext password handling.
Fix segfault on error response read.
Add test for tcp connection and incorrect password
Diffstat (limited to 'src/conn')
-rw-r--r-- | src/conn/config.zig | 4 | ||||
-rw-r--r-- | src/conn/conn.zig | 42 |
2 files changed, 41 insertions, 5 deletions
diff --git a/src/conn/config.zig b/src/conn/config.zig index b4e7cff..3f577d1 100644 --- a/src/conn/config.zig +++ b/src/conn/config.zig @@ -4,9 +4,9 @@ const SSHashMap = std.StringHashMap([]const u8); const Config = @This(); allocator: std.mem.Allocator, -address: union(enum){ +address: union(enum) { net: std.net.Address, - unix: []const u8, + unix: []const u8, // std.net.Address looks like it handles unix sockets but it doesn't really. }, database: ?[]const u8 = null, user: []const u8, diff --git a/src/conn/conn.zig b/src/conn/conn.zig index 1b2bf2d..4d62f57 100644 --- a/src/conn/conn.zig +++ b/src/conn/conn.zig @@ -6,6 +6,7 @@ const Proto = @import("../proto/proto.zig"); const read_message = @import("../main.zig").read_message; const ProtocolError = @import("../main.zig").ProtocolError; const ServerError = @import("../main.zig").ServerError; +const ClientError = @import("../main.zig").ClientError; const diagnosticReader = @import("../main.zig").diagnosticReader; const Conn = @This(); @@ -57,6 +58,17 @@ pub fn connect(config: Config) !Conn { var ar = try read_message(Proto.AuthenticationRequest, allocator, reader); defer ar.deinit(allocator); // TODO handle the authentication request + switch (ar.inner_type) { + .AuthRequestTypeOk => {}, // fine do nothing! + .AuthRequestTypeCleartextPassword => { + if (config.password) |password| { + const pm = Proto.PasswordMessage{ .password = password }; + try pm.write(allocator, writer); + } else { + return ClientError.NoPasswordSupplied; + } + }, + } log.info("authentication request", .{}); }, Proto.ReadyForQuery.Tag => { @@ -94,9 +106,7 @@ fn deinit(self: *Conn) void { self.stream.close(); } -//pub fn exec(self: *Conn) - -test "connect" { +test "connect unix" { // must have a local postgres runnning // TODO maybe use docker to start one? const allocator = std.testing.allocator; @@ -109,3 +119,29 @@ test "connect" { var conn = try Conn.connect(cfg); defer conn.deinit(); } + +test "connect tcp with password" { + const allocator = std.testing.allocator; + const cfg = Config{ + .allocator = allocator, + .address = .{ .net = std.net.Address{ .in = std.net.Ip4Address.init([4]u8{ 127, 0, 0, 1 }, 5432) } }, + .database = "martin", + .user = "martin", + .password = "martin", + }; + var conn = try Conn.connect(cfg); + defer conn.deinit(); +} + +test "connect tcp with wrong password" { + // TODO how to disable failing tests on error log + // const allocator = std.testing.allocator; + // const cfg = Config{ + // .allocator = allocator, + // .address = .{ .net = std.net.Address{ .in = std.net.Ip4Address.init([4]u8{ 127, 0, 0, 1 }, 5432) } }, + // .database = "martin", + // .user = "martin", + // .password = "foobar", + // }; + // try std.testing.expectError(ServerError.ErrorResponse, Conn.connect(cfg)); +} |