mirror of
https://github.com/sbrow/envr.git
synced 2026-06-27 18:48:33 -04:00
feat(age): accept multiple recipients.
This commit is contained in:
@@ -35,7 +35,7 @@ pub fn open(
|
|||||||
defer gpa.free(tmp_db_path);
|
defer gpa.free(tmp_db_path);
|
||||||
|
|
||||||
// TODO: Pass key(s) from Config
|
// TODO: Pass key(s) from Config
|
||||||
try age.decrypt(io, gpa, "~/.ssh/id_ed25519", db_path, tmp_db_path);
|
try age.decrypt(io, gpa, &.{"~/.ssh/id_ed25519"}, db_path, tmp_db_path);
|
||||||
|
|
||||||
try db.restore(tmp_db_path);
|
try db.restore(tmp_db_path);
|
||||||
try std.Io.Dir.cwd().deleteFile(io, tmp_db_path);
|
try std.Io.Dir.cwd().deleteFile(io, tmp_db_path);
|
||||||
@@ -127,7 +127,7 @@ pub fn close(
|
|||||||
defer gpa.free(db_path);
|
defer gpa.free(db_path);
|
||||||
|
|
||||||
// FIXME: Use real key
|
// FIXME: Use real key
|
||||||
try age.encrypt(io, gpa, "~/.ssh/id_ed25519.pub", tmp_db_path, db_path);
|
try age.encrypt(io, gpa, &.{"~/.ssh/id_ed25519.pub"}, tmp_db_path, db_path);
|
||||||
|
|
||||||
self.changed = false;
|
self.changed = false;
|
||||||
}
|
}
|
||||||
@@ -177,7 +177,7 @@ test "encrypted database can be opened" {
|
|||||||
try age.decrypt(
|
try age.decrypt(
|
||||||
io,
|
io,
|
||||||
gpa,
|
gpa,
|
||||||
"./fixtures/insecure-test-key",
|
&.{"./fixtures/insecure-test-key"},
|
||||||
"./fixtures/encrypted-example.db.age",
|
"./fixtures/encrypted-example.db.age",
|
||||||
decrypted_path,
|
decrypted_path,
|
||||||
);
|
);
|
||||||
|
|||||||
68
src/age.zig
68
src/age.zig
@@ -1,24 +1,32 @@
|
|||||||
const std = @import("std");
|
const std = @import("std");
|
||||||
|
|
||||||
/// Returns the decrypted contents of the file.
|
/// Decrypts the file into output path
|
||||||
/// Caller is responsible for freeing the memory.
|
|
||||||
pub fn decrypt(
|
pub fn decrypt(
|
||||||
io: std.Io,
|
io: std.Io,
|
||||||
gpa: std.mem.Allocator,
|
gpa: std.mem.Allocator,
|
||||||
private_key: []const u8,
|
private_keys: []const []const u8,
|
||||||
input_path: []const u8,
|
input_path: []const u8,
|
||||||
output_path: []const u8,
|
output_path: []const u8,
|
||||||
) !void {
|
) !void {
|
||||||
|
// TODO: use raw array?
|
||||||
|
var argv: std.ArrayList([]const u8) = try .initCapacity(gpa, 2 + (2 * private_keys.len) + 3);
|
||||||
|
defer argv.deinit(gpa);
|
||||||
|
|
||||||
|
argv.appendAssumeCapacity("age");
|
||||||
|
argv.appendAssumeCapacity("-d");
|
||||||
|
|
||||||
|
for (private_keys) |key| {
|
||||||
|
argv.appendAssumeCapacity("-i");
|
||||||
|
argv.appendAssumeCapacity(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
argv.appendAssumeCapacity("-o");
|
||||||
|
argv.appendAssumeCapacity(output_path);
|
||||||
|
|
||||||
|
argv.appendAssumeCapacity(input_path);
|
||||||
|
|
||||||
const result = try std.process.run(gpa, io, .{
|
const result = try std.process.run(gpa, io, .{
|
||||||
.argv = &.{
|
.argv = argv.items,
|
||||||
"age",
|
|
||||||
"-d",
|
|
||||||
"-i",
|
|
||||||
private_key,
|
|
||||||
"-o",
|
|
||||||
output_path,
|
|
||||||
input_path,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
defer gpa.free(result.stderr);
|
defer gpa.free(result.stderr);
|
||||||
defer gpa.free(result.stdout);
|
defer gpa.free(result.stdout);
|
||||||
@@ -34,25 +42,33 @@ pub fn decrypt(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns the encrypted contents of the file.
|
/// Encrypts the file into output path
|
||||||
/// Caller is responsible for freeing the memory.
|
|
||||||
pub fn encrypt(
|
pub fn encrypt(
|
||||||
io: std.Io,
|
io: std.Io,
|
||||||
gpa: std.mem.Allocator,
|
gpa: std.mem.Allocator,
|
||||||
public_key: []const u8,
|
// TODO: Accept multiple keys
|
||||||
|
public_keys: []const []const u8,
|
||||||
input_path: []const u8,
|
input_path: []const u8,
|
||||||
output_path: []const u8,
|
output_path: []const u8,
|
||||||
) !void {
|
) !void {
|
||||||
|
var argv: std.ArrayList([]const u8) = try .initCapacity(gpa, 2 + (2 * public_keys.len) + 3);
|
||||||
|
defer argv.deinit(gpa);
|
||||||
|
|
||||||
|
argv.appendAssumeCapacity("age");
|
||||||
|
argv.appendAssumeCapacity("-e");
|
||||||
|
|
||||||
|
for (public_keys) |key| {
|
||||||
|
argv.appendAssumeCapacity("-R");
|
||||||
|
argv.appendAssumeCapacity(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
argv.appendAssumeCapacity("-o");
|
||||||
|
argv.appendAssumeCapacity(output_path);
|
||||||
|
|
||||||
|
argv.appendAssumeCapacity(input_path);
|
||||||
|
|
||||||
const result = try std.process.run(gpa, io, .{
|
const result = try std.process.run(gpa, io, .{
|
||||||
.argv = &.{
|
.argv = argv.items,
|
||||||
"age",
|
|
||||||
"-e",
|
|
||||||
"-R",
|
|
||||||
public_key,
|
|
||||||
"-o",
|
|
||||||
output_path,
|
|
||||||
input_path,
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
defer gpa.free(result.stderr);
|
defer gpa.free(result.stderr);
|
||||||
defer gpa.free(result.stdout);
|
defer gpa.free(result.stdout);
|
||||||
@@ -84,7 +100,7 @@ test "sample file can be decrypted" {
|
|||||||
try decrypt(
|
try decrypt(
|
||||||
io,
|
io,
|
||||||
gpa,
|
gpa,
|
||||||
"./fixtures/insecure-test-key",
|
&.{"./fixtures/insecure-test-key"},
|
||||||
"./fixtures/hello-world.age",
|
"./fixtures/hello-world.age",
|
||||||
output_path,
|
output_path,
|
||||||
);
|
);
|
||||||
@@ -111,7 +127,7 @@ test "sample file can be encrypted" {
|
|||||||
try encrypt(
|
try encrypt(
|
||||||
io,
|
io,
|
||||||
gpa,
|
gpa,
|
||||||
"./fixtures/insecure-test-key.pub",
|
&.{"./fixtures/insecure-test-key.pub"},
|
||||||
"./fixtures/hello-world.txt",
|
"./fixtures/hello-world.txt",
|
||||||
output_path,
|
output_path,
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user