op public repos

Blame

Date:: Fri Feb 16 19:56:54 2024 UTC
Message:: remove `got add' workaround earlier version of got would fail when trying to `got add' a file that was already added (or committed.) Since the error message was potentially scary, got_add tries to be smart and issue a `got info file' first to see whether the file can be added, and only then eventually issues `got add'. This whole dance is now moot. got doesn't warn for files already added. (also, this code could have been simpler from the beginning.) Noticed since the pipe trick in the got sub was failing on linux. Issue reported by Christoph Cremer, thanks!
Actions:: History | Blob | Raw File
  1 5cdf5adc 2022-05-08 op #!/usr/bin/env perl
  2 5cdf5adc 2022-05-08 op #
  3 71c704e3 2023-01-16 op # Copyright (c) 2022, 2023 Omar Polo <op@omarpolo.com>
  4 5cdf5adc 2022-05-08 op #
  5 5cdf5adc 2022-05-08 op # Permission to use, copy, modify, and distribute this software for any
  6 5cdf5adc 2022-05-08 op # purpose with or without fee is hereby granted, provided that the above
  7 5cdf5adc 2022-05-08 op # copyright notice and this permission notice appear in all copies.
  8 5cdf5adc 2022-05-08 op #
  9 5cdf5adc 2022-05-08 op # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 10 5cdf5adc 2022-05-08 op # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 11 5cdf5adc 2022-05-08 op # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 12 5cdf5adc 2022-05-08 op # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 13 5cdf5adc 2022-05-08 op # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 14 5cdf5adc 2022-05-08 op # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 15 5cdf5adc 2022-05-08 op # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 16 5cdf5adc 2022-05-08 op 
 17 5cdf5adc 2022-05-08 op use strict;
 18 5cdf5adc 2022-05-08 op use warnings;
 19 5cdf5adc 2022-05-08 op use v5.32;
 20 5cdf5adc 2022-05-08 op 
 21 5cdf5adc 2022-05-08 op use open ":std", ":encoding(UTF-8)";
 22 5cdf5adc 2022-05-08 op 
 23 42215f91 2023-10-17 op use Encode::Locale;
 24 cb8467de 2023-10-17 op use Encode qw(decode);
 25 cb8467de 2023-10-17 op 
 26 5cdf5adc 2022-05-08 op use Getopt::Long qw(:config bundling require_order);
 27 5cdf5adc 2022-05-08 op use File::Basename;
 28 5cdf5adc 2022-05-08 op use File::Find;
 29 6fd928d3 2023-06-17 op use File::Path qw(make_path);
 30 8ce01796 2023-01-11 op use File::Temp qw(tempfile);
 31 cb8467de 2023-10-17 op 
 32 50c751f3 2022-06-29 op my $store = $ENV{'PLASS_STORE'} // $ENV{'HOME'}.'/.password-store';
 33 5cdf5adc 2022-05-08 op 
 34 d16aedaf 2022-09-09 op my $gpg = $ENV{'PLASS_GPG'} // 'gpg';
 35 12ad62fd 2022-06-29 op my @gpg_flags = qw(--quiet --compress-algo=none --no-encrypt-to --use-agent);
 36 5cdf5adc 2022-05-08 op 
 37 8dc394df 2022-06-29 op my %subcmd = (
 38 8dc394df 2022-06-29 op 	cat	=> [\&cmd_cat,		"entries..."],
 39 8ce01796 2023-01-11 op 	edit	=> [\&cmd_edit,		"entry"],
 40 8dc394df 2022-06-29 op 	find	=> [\&cmd_find,		"[pattern]"],
 41 8dc394df 2022-06-29 op 	mv	=> [\&cmd_mv,		"from to"],
 42 8dc394df 2022-06-29 op 	rm	=> [\&cmd_rm,		"entries..."],
 43 8dc394df 2022-06-29 op 	tee	=> [\&cmd_tee,		"[-q] entry"],
 44 8dc394df 2022-06-29 op     );
 45 8dc394df 2022-06-29 op 
 46 f19c01bc 2022-09-09 op my $usage = "[-h] command [argument ...]";
 47 5f8e7670 2022-06-29 op my $cmd;
 48 5f8e7670 2022-06-29 op sub usage {
 49 5f8e7670 2022-06-29 op 	my $prog = basename $0;
 50 d1bd3477 2022-06-29 op 	if (defined($cmd) and defined($subcmd{$cmd})) {
 51 5f8e7670 2022-06-29 op 		say STDERR "Usage: $prog $cmd $usage";
 52 5f8e7670 2022-06-29 op 	} else {
 53 5f8e7670 2022-06-29 op 		say STDERR "Usage: $prog $usage";
 54 d1bd3477 2022-06-29 op 		say STDERR "unknown command $cmd" if defined($cmd);
 55 8dc394df 2022-06-29 op 		say STDERR "commands: ", join(' ', sort(keys %subcmd));
 56 5f8e7670 2022-06-29 op 	}
 57 5f8e7670 2022-06-29 op 	exit 1;
 58 5f8e7670 2022-06-29 op }
 59 5cdf5adc 2022-05-08 op 
 60 5f8e7670 2022-06-29 op GetOptions("h|?" => \&usage) or usage();
 61 5cdf5adc 2022-05-08 op 
 62 5f8e7670 2022-06-29 op $cmd = shift // 'find';
 63 5f8e7670 2022-06-29 op usage() unless defined $subcmd{$cmd};
 64 5f8e7670 2022-06-29 op my $fn;
 65 5f8e7670 2022-06-29 op ($fn, $usage) = @{$subcmd{$cmd}};
 66 5cdf5adc 2022-05-08 op chdir $store;
 67 5cdf5adc 2022-05-08 op $fn->();
 68 5cdf5adc 2022-05-08 op exit 0;
 69 5cdf5adc 2022-05-08 op 
 70 5cdf5adc 2022-05-08 op 
 71 5cdf5adc 2022-05-08 op # utils
 72 5cdf5adc 2022-05-08 op 
 73 5cdf5adc 2022-05-08 op sub name2file {
 74 5cdf5adc 2022-05-08 op 	my $f = shift;
 75 5cdf5adc 2022-05-08 op 	$f .= ".gpg" unless $f =~ m,\.gpg$,;
 76 5cdf5adc 2022-05-08 op 	return $f;
 77 5cdf5adc 2022-05-08 op }
 78 5cdf5adc 2022-05-08 op 
 79 8c4930cf 2023-01-21 op sub edit {
 80 8c4930cf 2023-01-21 op 	my ($editor, $fh, $tempfile, $epath) = @_;
 81 8c4930cf 2023-01-21 op 
 82 8c4930cf 2023-01-21 op 	open (my $stdout, ">&", STDOUT) or die "can't redirect stdout: $!";
 83 8c4930cf 2023-01-21 op 	open (STDOUT, ">&", $fh) or die "can't redirect stdout to $tempfile";
 84 8c4930cf 2023-01-21 op 	system ($gpg, @gpg_flags, '-d', $epath);
 85 8c4930cf 2023-01-21 op 	die "$gpg exited with $?\n" if $? != 0;
 86 8c4930cf 2023-01-21 op 	open (STDOUT, ">&", $stdout) or die "can't restore stdout: $!";
 87 8c4930cf 2023-01-21 op 
 88 8c4930cf 2023-01-21 op 	my $oldtime = (stat($fh))[9];
 89 8c4930cf 2023-01-21 op 	close($fh);
 90 8c4930cf 2023-01-21 op 
 91 8c4930cf 2023-01-21 op 	system ($editor, $tempfile);
 92 8c4930cf 2023-01-21 op 	die "editor $editor failed\n" if $? != 0;
 93 8c4930cf 2023-01-21 op 
 94 8c4930cf 2023-01-21 op 	my $newtime = (stat($tempfile))[9];
 95 8c4930cf 2023-01-21 op 	if ($oldtime == $newtime) {
 96 8c4930cf 2023-01-21 op 		say STDERR "no changes made.";
 97 6b4b0a36 2023-06-17 op 		return;
 98 8c4930cf 2023-01-21 op 	}
 99 8c4930cf 2023-01-21 op 
100 fdb1653a 2024-02-16 op 	system ($gpg, @gpg_flags, '-e', '-r', recipient(), '-o', $epath,
101 fdb1653a 2024-02-16 op 	    '--batch', '--yes', $tempfile);
102 fdb1653a 2024-02-16 op 	
103 8c4930cf 2023-01-21 op 	die "gpg failed" if $? != 0;
104 8c4930cf 2023-01-21 op }
105 8c4930cf 2023-01-21 op 
106 5cdf5adc 2022-05-08 op sub recipient {
107 5cdf5adc 2022-05-08 op 	open my $fh, '<', "$store/.gpg-id"
108 5cdf5adc 2022-05-08 op 	    or die "can't open recipient file";
109 5cdf5adc 2022-05-08 op 	my $r = <$fh>;
110 5cdf5adc 2022-05-08 op 	chomp $r;
111 5cdf5adc 2022-05-08 op 	close($fh);
112 5cdf5adc 2022-05-08 op 	return $r;
113 5cdf5adc 2022-05-08 op }
114 5cdf5adc 2022-05-08 op 
115 5cdf5adc 2022-05-08 op sub passfind {
116 5cdf5adc 2022-05-08 op 	my $pattern = shift;
117 5cdf5adc 2022-05-08 op 	my @entries;
118 42215f91 2023-10-17 op 
119 42215f91 2023-10-17 op 	$pattern = decode(locale => $pattern) if defined $pattern;
120 5cdf5adc 2022-05-08 op 
121 5cdf5adc 2022-05-08 op 	find({
122 5cdf5adc 2022-05-08 op 		wanted => sub {
123 cb8467de 2023-10-17 op 			my $raw = $_;
124 cb8467de 2023-10-17 op 			$_ = decode(locale => $_);
125 5cdf5adc 2022-05-08 op 			if (m,/.git$, || m,/.got$,) {
126 5cdf5adc 2022-05-08 op 				$File::Find::prune = 1;
127 5cdf5adc 2022-05-08 op 				return;
128 5cdf5adc 2022-05-08 op 			}
129 cb8467de 2023-10-17 op 			return unless -f $raw && m,.gpg$,;
130 5cdf5adc 2022-05-08 op 
131 5cdf5adc 2022-05-08 op 			s,^$store/*,,;
132 5cdf5adc 2022-05-08 op 			s,.gpg$,,;
133 fb70a412 2022-10-21 op 
134 84eda8d6 2023-06-17 op 			return if defined($pattern) && ! m/$pattern/ix;
135 5cdf5adc 2022-05-08 op 			push @entries, $_;
136 5cdf5adc 2022-05-08 op 		},
137 5cdf5adc 2022-05-08 op 		no_chdir => 1,
138 5cdf5adc 2022-05-08 op 		follow_fast => 1,
139 5cdf5adc 2022-05-08 op 	     }, ($store));
140 a0e32af2 2023-06-17 op 	my @sorted_entries = sort(@entries);
141 a0e32af2 2023-06-17 op 	return @sorted_entries;
142 5cdf5adc 2022-05-08 op }
143 5cdf5adc 2022-05-08 op 
144 5cdf5adc 2022-05-08 op sub got {
145 2d265c92 2024-02-16 op 	my $pid = fork;
146 2d265c92 2024-02-16 op 	die "failed to fork: $!" unless defined $pid;
147 2d265c92 2024-02-16 op 
148 2d265c92 2024-02-16 op 	if ($pid != 0) {
149 2d265c92 2024-02-16 op 		wait;
150 2d265c92 2024-02-16 op 		return !$?;
151 2d265c92 2024-02-16 op 	}
152 2d265c92 2024-02-16 op 
153 2d265c92 2024-02-16 op 	open (STDOUT, '>', '/dev/null')
154 2d265c92 2024-02-16 op 	    or die "can't redirect to /dev/null";
155 2d265c92 2024-02-16 op 	exec ('got', @_);
156 5cdf5adc 2022-05-08 op }
157 5cdf5adc 2022-05-08 op 
158 5cdf5adc 2022-05-08 op sub got_add {
159 2d265c92 2024-02-16 op 	got 'add', shift
160 2d265c92 2024-02-16 op 	    or exit(1);
161 5cdf5adc 2022-05-08 op }
162 5cdf5adc 2022-05-08 op 
163 5cdf5adc 2022-05-08 op sub got_rm {
164 f96edc25 2022-06-29 op 	got 'remove', '-f', shift
165 f96edc25 2022-06-29 op 	    or exit(1);
166 5cdf5adc 2022-05-08 op }
167 5cdf5adc 2022-05-08 op 
168 5cdf5adc 2022-05-08 op sub got_ci {
169 afdbc7b0 2022-06-29 op 	my $pid = fork;
170 afdbc7b0 2022-06-29 op 	die "failed to fork: $!" unless defined $pid;
171 afdbc7b0 2022-06-29 op 
172 f9b1eaa1 2022-06-29 op 	if ($pid != 0) {
173 afdbc7b0 2022-06-29 op 		wait;
174 afdbc7b0 2022-06-29 op 		die "failed to commit changes" if $?;
175 afdbc7b0 2022-06-29 op 		return;
176 afdbc7b0 2022-06-29 op 	}
177 afdbc7b0 2022-06-29 op 
178 afdbc7b0 2022-06-29 op 	open (STDOUT, ">&", \*STDERR)
179 afdbc7b0 2022-06-29 op 	    or die "can't redirect stdout to stderr";
180 77ea6ba1 2023-01-21 op 	exec ('got', 'commit', '-m', shift)
181 77ea6ba1 2023-01-21 op 	    or die "failed to exec got: $!";
182 5cdf5adc 2022-05-08 op }
183 5cdf5adc 2022-05-08 op 
184 5cdf5adc 2022-05-08 op 
185 5cdf5adc 2022-05-08 op # cmds
186 5cdf5adc 2022-05-08 op 
187 5cdf5adc 2022-05-08 op sub cmd_cat {
188 5cdf5adc 2022-05-08 op 	GetOptions('h|?' => \&usage) or usage;
189 5cdf5adc 2022-05-08 op 	usage unless @ARGV;
190 5cdf5adc 2022-05-08 op 
191 5cdf5adc 2022-05-08 op 	while (@ARGV) {
192 5cdf5adc 2022-05-08 op 		my $file = name2file(shift @ARGV);
193 5cdf5adc 2022-05-08 op 		system ($gpg, @gpg_flags, '-d', $file);
194 5cdf5adc 2022-05-08 op 		die "failed to exec $gpg: $!" if $? == -1;
195 5cdf5adc 2022-05-08 op 	}
196 5cdf5adc 2022-05-08 op }
197 5cdf5adc 2022-05-08 op 
198 8ce01796 2023-01-11 op sub cmd_edit {
199 8ce01796 2023-01-11 op 	GetOptions('h|?' => \&usage) or usage;
200 8ce01796 2023-01-11 op 	usage if @ARGV != 1;
201 8ce01796 2023-01-11 op 
202 8ce01796 2023-01-11 op 	my $editor = $ENV{'VISUAL'} // $ENV{'EDITOR'} // 'ed';
203 8ce01796 2023-01-11 op 
204 8ce01796 2023-01-11 op 	my $entry = shift @ARGV;
205 8ce01796 2023-01-11 op 	my $epath = name2file $entry;
206 8ce01796 2023-01-11 op 
207 8c4930cf 2023-01-21 op 	my ($fh, $tempfile) = tempfile "/tmp/plass-XXXXXXXXXX";
208 8c4930cf 2023-01-21 op 	eval { edit $editor, $fh, $tempfile, $epath };
209 8c4930cf 2023-01-21 op 	unlink $tempfile;
210 8c4930cf 2023-01-21 op 	die "$@\n" if $@;
211 8ce01796 2023-01-11 op 
212 8ce01796 2023-01-11 op 	got_add $epath;
213 8ce01796 2023-01-11 op 	got_ci "update $entry";
214 8ce01796 2023-01-11 op }
215 8ce01796 2023-01-11 op 
216 5cdf5adc 2022-05-08 op sub cmd_find {
217 5cdf5adc 2022-05-08 op 	GetOptions('h|?' => \&usage) or usage;
218 f9b1eaa1 2022-06-29 op 	usage if @ARGV > 1;
219 5cdf5adc 2022-05-08 op 
220 b458d1aa 2023-06-17 op 	say $_ foreach passfind(shift @ARGV);
221 5cdf5adc 2022-05-08 op }
222 5cdf5adc 2022-05-08 op 
223 5cdf5adc 2022-05-08 op # TODO: handle moving directories?
224 5cdf5adc 2022-05-08 op sub cmd_mv {
225 5cdf5adc 2022-05-08 op 	GetOptions('h|?' => \&usage) or usage;
226 f9b1eaa1 2022-06-29 op 	usage if @ARGV != 2;
227 5cdf5adc 2022-05-08 op 
228 5cdf5adc 2022-05-08 op 	my $a = shift @ARGV;
229 5cdf5adc 2022-05-08 op 	my $b = shift @ARGV;
230 5cdf5adc 2022-05-08 op 
231 5cdf5adc 2022-05-08 op 	my $pa = name2file $a;
232 5cdf5adc 2022-05-08 op 	my $pb = name2file $b;
233 5cdf5adc 2022-05-08 op 
234 5cdf5adc 2022-05-08 op 	die "source password doesn't exist" unless -f $pa;
235 5cdf5adc 2022-05-08 op 	die "target password exists" if -f $pb;
236 5cdf5adc 2022-05-08 op 
237 6fd928d3 2023-06-17 op 	make_path(dirname $pb);
238 5cdf5adc 2022-05-08 op 	rename $pa, $pb or die "can't rename $a to $b: $!";
239 5cdf5adc 2022-05-08 op 
240 5cdf5adc 2022-05-08 op 	got_rm $pa;
241 bd71caf6 2022-06-29 op 	got_add $pb or die "can't add $pb\n";
242 5cdf5adc 2022-05-08 op 	got_ci "mv $a $b";
243 5cdf5adc 2022-05-08 op }
244 5cdf5adc 2022-05-08 op 
245 5cdf5adc 2022-05-08 op sub cmd_rm {
246 5cdf5adc 2022-05-08 op 	GetOptions('h|?' => \&usage) or usage;
247 6a455fdf 2022-06-29 op 	usage unless @ARGV;
248 5cdf5adc 2022-05-08 op 
249 6a455fdf 2022-06-29 op 	while (@ARGV) {
250 6a455fdf 2022-06-29 op 		my $name = shift @ARGV;
251 6a455fdf 2022-06-29 op 		my $file = name2file $name;
252 5cdf5adc 2022-05-08 op 
253 6a455fdf 2022-06-29 op 		got_rm $file;
254 6a455fdf 2022-06-29 op 		got_ci "-$name";
255 6a455fdf 2022-06-29 op 	}
256 5cdf5adc 2022-05-08 op }
257 5cdf5adc 2022-05-08 op 
258 afdbc7b0 2022-06-29 op sub cmd_tee {
259 afdbc7b0 2022-06-29 op 	my $q;
260 afdbc7b0 2022-06-29 op 	GetOptions(
261 afdbc7b0 2022-06-29 op 		'h|?' => \&usage,
262 afdbc7b0 2022-06-29 op 		'q'   => \$q,
263 afdbc7b0 2022-06-29 op 	    ) or usage;
264 f9b1eaa1 2022-06-29 op 	usage if @ARGV != 1;
265 5cdf5adc 2022-05-08 op 
266 5cdf5adc 2022-05-08 op 	my $name = shift @ARGV;
267 5cdf5adc 2022-05-08 op 	my $file = name2file $name;
268 5cdf5adc 2022-05-08 op 
269 5eba1883 2022-10-20 op 	my $msg = -f $file ? "update $name" : "+$name";
270 6fd928d3 2023-06-17 op 	make_path(dirname $file);
271 5eba1883 2022-10-20 op 
272 1169deba 2023-01-21 op 	my @args = ($gpg, @gpg_flags, '-e', '-r', recipient(),
273 1169deba 2023-01-21 op 	    '--batch', '--yes', '-o', $file);
274 1169deba 2023-01-21 op 	open my $fh, '|-', @args;
275 fc9fec05 2023-01-21 op 
276 fc9fec05 2023-01-21 op 	binmode(STDIN) or die "cannot binmode STDIN";
277 fc9fec05 2023-01-21 op 	binmode(STDOUT) or die "cannot binmode STDOUT";
278 fc9fec05 2023-01-21 op 	binmode($fh) or die "cannot binmode pipe";
279 5eba1883 2022-10-20 op 
280 1169deba 2023-01-21 op 	local $/ = \1024;
281 1169deba 2023-01-21 op 	while (<STDIN>) {
282 1169deba 2023-01-21 op 		print $fh $_;
283 1169deba 2023-01-21 op 		print $_ unless $q;
284 1169deba 2023-01-21 op 	}
285 1169deba 2023-01-21 op 	close($fh);
286 1169deba 2023-01-21 op 	exit $? if $?;
287 5cdf5adc 2022-05-08 op 
288 5cdf5adc 2022-05-08 op 	got_add $file;
289 5eba1883 2022-10-20 op 	got_ci $msg;
290 5cdf5adc 2022-05-08 op }