actions: imports
This commit is contained in:
parent
9a76830ca8
commit
c5b4d308d1
182
src/actions.cpp
182
src/actions.cpp
|
|
@ -201,10 +201,100 @@ int action_list (bool nice_fingerprint, const std::string&filter,
|
|||
}
|
||||
|
||||
|
||||
int action_import (bool armor, bool no_action, bool yes,
|
||||
int action_import (bool armor, bool no_action, bool yes, bool fp,
|
||||
const std::string&filter, const std::string&name,
|
||||
keyring&KR)
|
||||
{
|
||||
std::string data;
|
||||
read_all_input (data);
|
||||
|
||||
if (armor) {
|
||||
std::string type;
|
||||
std::vector<std::string> parts;
|
||||
if (!envelope_read (data, 0, type, parts) ) {
|
||||
err ("error: no data envelope found");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (type != ENVELOPE_SECRETS || parts.size() != 1) {
|
||||
err ("error: wrong envelope format");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!base64_decode (parts[0], data) ) {
|
||||
err ("error: malformed data");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
sencode*S = sencode_decode (data);
|
||||
if (!S) {
|
||||
err ("error: could not parse input sencode");
|
||||
return 1;
|
||||
}
|
||||
|
||||
keyring::pubkey_storage p;
|
||||
if (!keyring::parse_pubkeys (S, p) ) {
|
||||
err ("error: could not parse input structure");
|
||||
return 1;
|
||||
}
|
||||
sencode_destroy (S);
|
||||
|
||||
if (!p.size() ) {
|
||||
err ("notice: keyring was empty");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (no_action) {
|
||||
for (keyring::pubkey_storage::iterator
|
||||
i = p.begin(), e = p.end(); i != e; ++i) {
|
||||
if (keyspec_matches (filter, i->second.name,
|
||||
i->first) )
|
||||
output_key (fp,
|
||||
"pubkey", "public key",
|
||||
i->second.alg, i->first,
|
||||
i->second.name);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
//informatively count how much stuff is this going to destroy.
|
||||
int rewrites = 0, privs = 0;
|
||||
for (keyring::pubkey_storage::iterator
|
||||
i = p.begin(), e = p.end(); i != e; ++i) {
|
||||
if (keyspec_matches (filter, i->second.name, i->first) ) {
|
||||
if (KR.pairs.count (i->first) ) {
|
||||
++privs;
|
||||
++rewrites;
|
||||
} else if (KR.pubs.count (i->first) ) {
|
||||
++rewrites;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (rewrites && !yes) {
|
||||
err ("error: this would overwrite "
|
||||
<< rewrites << " of your keys "
|
||||
"(including " << privs << " private keys). "
|
||||
"Use Yes option to confirm.");
|
||||
return 1;
|
||||
}
|
||||
|
||||
//merge into KR. Also prevent keyID collisions
|
||||
for (keyring::pubkey_storage::iterator
|
||||
i = p.begin(), e = p.end(); i != e; ++i) {
|
||||
if (keyspec_matches (filter, i->second.name, i->first) ) {
|
||||
KR.pubs.erase (i->first);
|
||||
KR.pairs.erase (i->first);
|
||||
KR.pubs[i->first] = i->second;
|
||||
}
|
||||
}
|
||||
|
||||
if (!KR.save() ) {
|
||||
err ("error: couldn't save keyring");
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -364,15 +454,99 @@ int action_list_sec (bool nice_fingerprint, const std::string&filter,
|
|||
}
|
||||
|
||||
|
||||
int action_import_sec (bool armor, bool no_action, bool yes,
|
||||
int action_import_sec (bool armor, bool no_action, bool yes, bool fp,
|
||||
const std::string & filter, const std::string & name,
|
||||
keyring & KR)
|
||||
{
|
||||
std::string data;
|
||||
read_all_input (data);
|
||||
|
||||
if (armor) {
|
||||
std::string type;
|
||||
std::vector<std::string> parts;
|
||||
if (!envelope_read (data, 0, type, parts) ) {
|
||||
err ("error: no data envelope found");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (type != ENVELOPE_SECRETS || parts.size() != 1) {
|
||||
err ("error: wrong envelope format");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!base64_decode (parts[0], data) ) {
|
||||
err ("error: malformed data");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
sencode*S = sencode_decode (data);
|
||||
if (!S) {
|
||||
err ("error: could not parse input sencode");
|
||||
return 1;
|
||||
}
|
||||
|
||||
keyring::keypair_storage s;
|
||||
if (!keyring::parse_keypairs (S, s) ) {
|
||||
err ("error: could not parse input structure");
|
||||
return 1;
|
||||
}
|
||||
sencode_destroy (S);
|
||||
|
||||
if (!s.size() ) {
|
||||
err ("notice: keyring was empty");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (no_action) {
|
||||
for (keyring::keypair_storage::iterator
|
||||
i = s.begin(), e = s.end(); i != e; ++i) {
|
||||
if (keyspec_matches (filter, i->second.pub.name,
|
||||
i->first) )
|
||||
output_key (fp,
|
||||
"keypair", "key pair",
|
||||
i->second.pub.alg, i->first,
|
||||
i->second.pub.name);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int rewrites = 0;
|
||||
for (keyring::keypair_storage::iterator
|
||||
i = s.begin(), e = s.end(); i != e; ++i) {
|
||||
if (keyspec_matches (filter, i->second.pub.name, i->first)
|
||||
&& (KR.pubs.count (i->first)
|
||||
|| KR.pairs.count (i->first) ) )
|
||||
++rewrites;
|
||||
}
|
||||
|
||||
if (rewrites && !yes) {
|
||||
err ("error: this would overwrite "
|
||||
<< rewrites << " of your keys. "
|
||||
"Use Yes option to confirm.");
|
||||
return 1;
|
||||
}
|
||||
|
||||
//merge into KR. Also prevent keyID collisions
|
||||
for (keyring::keypair_storage::iterator
|
||||
i = s.begin(), e = s.end(); i != e; ++i) {
|
||||
if (keyspec_matches (filter, i->second.pub.name, i->first) ) {
|
||||
KR.pubs.erase (i->first);
|
||||
KR.pairs.erase (i->first);
|
||||
KR.pairs[i->first] = i->second;
|
||||
}
|
||||
}
|
||||
|
||||
if (!KR.save() ) {
|
||||
err ("error: couldn't save keyring");
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int action_export_sec (bool armor,
|
||||
int action_export_sec (bool armor, bool yes,
|
||||
const std::string & filter, const std::string & name,
|
||||
keyring & KR)
|
||||
{
|
||||
|
|
@ -392,10 +566,12 @@ int action_export_sec (bool armor,
|
|||
return 1;
|
||||
}
|
||||
|
||||
if (!yes) {
|
||||
bool okay = false;
|
||||
ask_for_yes (okay, "This will export " << s.size()
|
||||
<< " secret keys! Continue?");
|
||||
if (!okay) return 0;
|
||||
}
|
||||
|
||||
sencode*S = keyring::serialize_keypairs (s);
|
||||
if (!S) return 1; //weird.
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ int action_decrypt_verify (bool armor, keyring&, algorithm_suite&);
|
|||
int action_list (bool nice_fingerprint, const std::string&filter,
|
||||
keyring&);
|
||||
|
||||
int action_import (bool armor, bool no_action, bool yes,
|
||||
int action_import (bool armor, bool no_action, bool yes, bool fp,
|
||||
const std::string&filter, const std::string&name,
|
||||
keyring&);
|
||||
|
||||
|
|
@ -75,11 +75,11 @@ int action_rename (bool yes,
|
|||
int action_list_sec (bool nice_fingerprint, const std::string&filter,
|
||||
keyring&);
|
||||
|
||||
int action_import_sec (bool armor, bool no_action, bool yes,
|
||||
int action_import_sec (bool armor, bool no_action, bool yes, bool fp,
|
||||
const std::string&filter, const std::string&name,
|
||||
keyring&);
|
||||
|
||||
int action_export_sec (bool armor,
|
||||
int action_export_sec (bool armor, bool yes,
|
||||
const std::string&filter, const std::string&name,
|
||||
keyring&);
|
||||
|
||||
|
|
|
|||
12
src/main.cpp
12
src/main.cpp
|
|
@ -288,7 +288,6 @@ int main (int argc, char**argv)
|
|||
* something will be happening, therefore init everything
|
||||
*/
|
||||
|
||||
int exitval = 0;
|
||||
keyring KR;
|
||||
algorithm_suite AS;
|
||||
|
||||
|
|
@ -298,6 +297,8 @@ int main (int argc, char**argv)
|
|||
return 1;
|
||||
}
|
||||
|
||||
int exitval = 0;
|
||||
|
||||
if (!KR.load() ) {
|
||||
err ("could not load keyring!");
|
||||
exitval = 1;
|
||||
|
|
@ -368,7 +369,8 @@ int main (int argc, char**argv)
|
|||
|
||||
case 'i':
|
||||
exitval = action_import (opt_armor, opt_import_no_action,
|
||||
opt_yes, filter, name, KR);
|
||||
opt_yes, opt_fingerprint,
|
||||
filter, name, KR);
|
||||
break;
|
||||
|
||||
case 'p':
|
||||
|
|
@ -389,11 +391,13 @@ int main (int argc, char**argv)
|
|||
|
||||
case 'I':
|
||||
exitval = action_import_sec (opt_armor, opt_import_no_action,
|
||||
opt_yes, filter, name, KR);
|
||||
opt_yes, opt_fingerprint,
|
||||
filter, name, KR);
|
||||
break;
|
||||
|
||||
case 'P':
|
||||
exitval = action_export_sec (opt_armor, filter, name, KR);
|
||||
exitval = action_export_sec (opt_armor, opt_yes,
|
||||
filter, name, KR);
|
||||
break;
|
||||
|
||||
case 'X':
|
||||
|
|
|
|||
Loading…
Reference in a new issue