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
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
|
/*
* Copyright (C) 2010 Vyatta, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <cstore/cstore.hpp>
#include <cnode/cnode.hpp>
#include <cnode/cnode-algorithm.hpp>
using namespace std;
using namespace cnode;
////// constants
static const string PFX_DIFF_ADD = "+"; // added
static const string PFX_DIFF_DEL = "-"; // deleted
static const string PFX_DIFF_UPD = ">"; // changed
static const string PFX_DIFF_NONE = " ";
static const string PFX_DIFF_NULL = "";
static const string PFX_DEACT_D = "!"; // deactivated
static const string PFX_DEACT_DP = "D"; // deactivate pending
static const string PFX_DEACT_AP = "A"; // activate pending
static const string PFX_DEACT_NONE = " ";
////// static (internal) functions
static void
_show_diff(CfgNode *cfg1, CfgNode *cfg2, int level, bool show_def,
bool hide_secret);
static void
_print_value_str(const string& name, const char *vstr, bool hide_secret)
{
// handle secret hiding first
if (hide_secret) {
static const char *sname[] = { "passphrase", "password",
"pre-shared-secret", "key", NULL };
static size_t slen[] = { 10, 8, 17, 3, 0 };
size_t nlen = name.length();
for (size_t i = 0; sname[i]; i++) {
if (nlen < slen[i]) {
// can't match
continue;
}
if (name.find(sname[i], nlen - slen[i]) != name.npos) {
// found secret
printf("****************");
return;
}
}
}
const char *quote = "";
size_t vlen = strlen(vstr);
if (*vstr == 0 || strcspn(vstr, "*}{;\011\012\013\014\015 ") < vlen) {
quote = "\"";
}
printf("%s%s%s", quote, vstr, quote);
}
static void
_diff_print_indent(CfgNode *cfg1, CfgNode *cfg2, int level,
const char *pfx_diff)
{
const char *pfx_deact = PFX_DEACT_NONE.c_str();
bool de1 = (cfg1 ? cfg1->isDeactivated() : false);
bool de2 = (cfg2 ? cfg2->isDeactivated() : false);
if (de1) {
if (de2) {
pfx_deact = PFX_DEACT_D.c_str();
} else {
pfx_deact = PFX_DEACT_AP.c_str();
}
} else {
if (de2) {
pfx_deact = PFX_DEACT_DP.c_str();
}
// 4th case handled by default
}
printf("%s %s", pfx_deact, pfx_diff);
for (int i = 0; i < level; i++) {
printf(" ");
}
}
static void
_diff_print_comment(CfgNode *cfg1, CfgNode *cfg2, int level)
{
const char *pfx_diff = PFX_DIFF_NONE.c_str();
string comment = "";
if (cfg1 != cfg2) {
string c1 = (cfg1 ? cfg1->getComment() : "");
string c2 = (cfg2 ? cfg2->getComment() : "");
if (c1 != "") {
if (c2 != "") {
// in both
comment = c2;
if (c1 != c2) {
pfx_diff = PFX_DIFF_UPD.c_str();
}
} else {
// only in cfg1
comment = c1;
pfx_diff = PFX_DIFF_DEL.c_str();
}
} else {
if (c2 != "") {
// only in cfg2
comment = c2;
pfx_diff = PFX_DIFF_ADD.c_str();
}
// 4th case handled by default
}
} else {
// same node => no diff
pfx_diff = PFX_DIFF_NULL.c_str();
comment = cfg1->getComment();
}
if (comment == "") {
// no comment
return;
}
_diff_print_indent(cfg1, cfg2, level, pfx_diff);
printf("/* %s */\n", comment.c_str());
}
static bool
_diff_check_and_show_leaf(CfgNode *cfg1, CfgNode *cfg2, int level,
bool show_def, bool hide_secret)
{
if ((cfg1 && !cfg1->isLeaf()) || (cfg2 && !cfg2->isLeaf())) {
// not a leaf node
return false;
}
CfgNode *cfg = NULL;
const char *force_pfx_diff = NULL;
if (!cfg1) {
cfg = cfg2;
force_pfx_diff = PFX_DIFF_ADD.c_str();
} else {
cfg = cfg1;
if (!cfg2) {
force_pfx_diff = PFX_DIFF_DEL.c_str();
} else if (cfg1 == cfg2) {
force_pfx_diff = PFX_DIFF_NULL.c_str();
}
}
_diff_print_comment(cfg1, cfg2, level);
if (cfg->isMulti()) {
// multi-value node
if (force_pfx_diff) {
// simple case: just use the same diff prefix for all values
const vector<string>& vvec = cfg->getValues();
for (size_t i = 0; i < vvec.size(); i++) {
_diff_print_indent(cfg1, cfg2, level, force_pfx_diff);
printf("%s ", cfg->getName().c_str());
_print_value_str(cfg->getName(), vvec[i].c_str(), hide_secret);
printf("\n");
}
} else {
// need to actually do a diff.
// this follows the original perl logic.
const vector<string>& ovec = cfg1->getValues();
const vector<string>& nvec = cfg1->getValues();
vector<string> values;
vector<const char *> pfxs;
Cstore::MapT<string, bool> nmap;
for (size_t i = 0; i < nvec.size(); i++) {
nmap[nvec[i]] = true;
}
Cstore::MapT<string, bool> omap;
for (size_t i = 0; i < ovec.size(); i++) {
omap[ovec[i]] = true;
if (nmap.find(ovec[i]) == nmap.end()) {
values.push_back(ovec[i]);
pfxs.push_back(PFX_DIFF_DEL.c_str());
}
}
for (size_t i = 0; i < nvec.size(); i++) {
values.push_back(nvec[i]);
if (omap.find(nvec[i]) == omap.end()) {
pfxs.push_back(PFX_DIFF_ADD.c_str());
} else if (i < ovec.size() && nvec[i] == ovec[i]) {
pfxs.push_back(PFX_DIFF_NONE.c_str());
} else {
pfxs.push_back(PFX_DIFF_UPD.c_str());
}
}
for (size_t i = 0; i < values.size(); i++) {
_diff_print_indent(cfg1, cfg2, level, pfxs[i]);
printf("%s ", cfg->getName().c_str());
_print_value_str(cfg->getName(), values[i].c_str(), hide_secret);
printf("\n");
}
}
} else {
// single-value node
if (show_def || !cfg->isDefault()) {
const string& val = cfg->getValue();
if (!force_pfx_diff) {
const string& val1 = cfg1->getValue();
if (val == val1) {
force_pfx_diff = PFX_DIFF_NONE.c_str();
} else {
force_pfx_diff = PFX_DIFF_UPD.c_str();
}
}
_diff_print_indent(cfg1, cfg2, level, force_pfx_diff);
printf("%s ", cfg->getName().c_str());
_print_value_str(cfg->getName(), val.c_str(), hide_secret);
printf("\n");
}
}
return true;
}
static void
_diff_show_other(CfgNode *cfg1, CfgNode *cfg2, int level, bool show_def,
bool hide_secret)
{
CfgNode *cfg = NULL;
const char *pfx_diff = PFX_DIFF_NONE.c_str();
if (!cfg1) {
cfg = cfg2;
pfx_diff = PFX_DIFF_ADD.c_str();
} else {
cfg = cfg1;
if (!cfg2) {
pfx_diff = PFX_DIFF_DEL.c_str();
} else if (cfg1 == cfg2) {
pfx_diff = PFX_DIFF_NULL.c_str();
}
}
/* only print "this" node if it
* (1) is a tag value or an intermediate node,
* (2) is not "root", and
* (3) has a "name".
*/
const string& name = cfg->getName();
bool print_this = (((cfg1 && (!cfg1->isTag() || cfg1->isValue()))
|| (cfg2 && (!cfg2->isTag() || cfg2->isValue())))
&& level >= 0 && name.size() > 0);
if (print_this) {
_diff_print_comment(cfg1, cfg2, level);
_diff_print_indent(cfg1, cfg2, level, pfx_diff);
if (cfg->isValue()) {
// at tag value
printf("%s %s", name.c_str(), cfg->getValue().c_str());
} else {
// at intermediate node
printf("%s", name.c_str());
}
printf("%s\n", (cfg->isLeafTypeless() ? "" : " {"));
}
// handle child nodes
vector<CfgNode *> cnodes1, cnodes2;
if (cfg1) {
cnodes1 = cfg1->getChildNodes();
}
if (cfg2) {
cnodes2 = cfg2->getChildNodes();
}
Cstore::MapT<string, bool> map;
Cstore::MapT<string, CfgNode *> nmap1, nmap2;
for (size_t i = 0; i < cnodes1.size(); i++) {
string key
= ((cfg->isTag() && !cfg->isValue())
? cnodes1[i]->getValue() : cnodes1[i]->getName());
map[key] = true;
nmap1[key] = cnodes1[i];
}
for (size_t i = 0; i < cnodes2.size(); i++) {
string key
= ((cfg->isTag() && !cfg->isValue())
? cnodes2[i]->getValue() : cnodes2[i]->getName());
map[key] = true;
nmap2[key] = cnodes2[i];
}
vector<string> cnodes;
Cstore::MapT<string, bool>::iterator it = map.begin();
for (; it != map.end(); ++it) {
cnodes.push_back((*it).first);
}
Cstore::sortNodes(cnodes);
for (size_t i = 0; i < cnodes.size(); i++) {
bool in1 = (nmap1.find(cnodes[i]) != nmap1.end());
bool in2 = (nmap2.find(cnodes[i]) != nmap2.end());
CfgNode *c1 = (in1 ? nmap1[cnodes[i]] : NULL);
CfgNode *c2 = (in2 ? nmap2[cnodes[i]] : NULL);
int next_level = level + 1;
if (!print_this) {
next_level = (level >= 0 ? level : 0);
}
_show_diff(c1, c2, next_level, show_def, hide_secret);
}
// finish printing "this" node if necessary
if (print_this && !cfg->isLeafTypeless()) {
_diff_print_indent(cfg1, cfg2, level, pfx_diff);
printf("}\n");
}
}
static void
_show_diff(CfgNode *cfg1, CfgNode *cfg2, int level, bool show_def,
bool hide_secret)
{
// if doesn't exist, treat as NULL
if (cfg1 && !cfg1->exists()) {
cfg1 = NULL;
}
if (cfg2 && !cfg2->exists()) {
cfg2 = NULL;
}
/* cfg1 and cfg2 point to the same config node in two configs. a "diff"
* output is shown comparing the two configs recursively with this node
* as the root of the config tree.
*
* there are four possible scenarios:
* (1) (cfg1 && cfg2) && (cfg1 != cfg2): node exists in both config.
* (2) (cfg1 && cfg2) && (cfg1 == cfg2): the two point to the same config.
* this will be just a "show".
* (3) (!cfg1 && cfg2): node exists in cfg2 but not in cfg1 (added).
* (4) (cfg1 && !cfg2): node exists in cfg1 but not in cfg1 (deleted).
*
* calling this with both NULL is invalid.
*/
if (!cfg1 && !cfg2) {
fprintf(stderr, "_show_diff error (both config NULL)\n");
exit(1);
}
if (_diff_check_and_show_leaf(cfg1, cfg2, (level >= 0 ? level : 0),
show_def, hide_secret)) {
// leaf node has been shown. done.
return;
} else {
// intermediate node, tag node, or tag value
_diff_show_other(cfg1, cfg2, level, show_def, hide_secret);
}
}
////// algorithms
void
cnode::show_diff(const CfgNode& cfg1, const CfgNode& cfg2, bool show_def,
bool hide_secret)
{
if (cfg1.isInvalid() || cfg2.isInvalid()) {
printf("Specified configuration path is not valid\n");
return;
}
if (cfg1.isEmpty() && cfg2.isEmpty()) {
printf("Configuration under specified path is empty\n");
return;
}
_show_diff(const_cast<CfgNode *>(&cfg1), const_cast<CfgNode *>(&cfg2), -1,
show_def, hide_secret);
}
|