From 2aa21cf7d9c689da89568ecd210a44c09e5a39ee Mon Sep 17 00:00:00 2001 From: Andinus Date: Sun, 8 Nov 2020 00:37:48 +0530 Subject: Warn when signify & gnupg is used together Warn when signify & gnupg is used together & added config option to disable the warning if the user knows what they're doing. --- leo.pl | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/leo.pl b/leo.pl index 1a10c5f..2e9dc93 100755 --- a/leo.pl +++ b/leo.pl @@ -50,8 +50,8 @@ foreach my $section (sort keys $config->%*) { foreach my $key (sort keys $config->{$section}->%*) { # Override encrypt & sign options with local values. if ($key eq "encrypt" - or $key eq "sign" - or $key eq "signify") { + or $key eq "sign" + or $key eq "signify") { $profile{$section}{$key} = $config->{$section}->{$key}; next; } @@ -65,7 +65,6 @@ foreach my $section (sort keys $config->%*) { my $date = date(); my $backup_dir = $options{backup_dir} || "/tmp/backups"; -# $backup_dir .= "/$date"; path($backup_dir)->mkpath; # Create backup directory. @@ -84,12 +83,16 @@ foreach my $prof ( @ARGV ) { path("$backup_dir/${prof}")->mkpath; # Create backup directory. backup($prof); - # It will fail because signify will look for "${prof}.tar" but - # delete option would've deleted it. I can make signify look - # for "${prof}.tar.gpg" but this is fine for now. - warn "[WARN] signify might fail if used with gpg\n" - if ($profile{$prof}{signify} - and ($profile{$prof}{encrypt} or $profile{$prof}{sign})); + unless ($options{signify_and_gnupg_warning_disable}) { + warn " +[WARN] signify will sign `.tar' & gnupg will delete it to create `.tar.gpg'. +The signature should be valid after decrypting the `.tar' archive. +Add `signify_and_gnupg_warning_disable = 1` in your config file to disable this +warning. +\n" + if ($profile{$prof}{signify} + and ($profile{$prof}{encrypt} or $profile{$prof}{sign})); + } signify($prof) if $profile{$prof}{signify}; encrypt_sign($prof) if $profile{$prof}{sign} or $profile{$prof}{encrypt}; @@ -112,6 +115,8 @@ sub backup { my @tmp_paths = $profile{$prof}{backup}->@*; while (my $path = shift @tmp_paths) { + # If it's a directory then check if we need to exclude any + # child path. if (-d $path) { my $iter = path($path)->iterator(); while ( my $path = $iter->() ) { -- cgit 1.4.1-2-gfad0 842f84b530d11c29'>c/profapi.h
blob: 1ed05360fc0bce1b7616f346b143326810576907 (plain) (tree) 
9d782fa6 ^




















































































































































































1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180