Author: lslezak
Date: Tue Jan 15 13:51:20 2008
New Revision: 43607
URL: http://svn.opensuse.org/viewcvs/yast?rev=43607&view=rev
Log:
- write key manager configuration, display/edit only trusted keys
(untrusted keys have no storage and will be lost at exit)
Modified:
trunk/packager/package/yast2-packager.changes
trunk/packager/src/clients/key_manager.ycp
trunk/packager/src/clients/repositories.ycp
trunk/packager/src/include/key_manager_dialogs.ycp
trunk/packager/src/modules/KeyManager.ycp
Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=43607&r1=43606&r2=43607&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Tue Jan 15 13:51:20 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jan 15 13:49:28 CET 2008 - lslezak@suse.cz
+
+- write key manager configuration, display/edit only trusted keys
+ (untrusted keys have no storage and will be lost at exit)
+
+-------------------------------------------------------------------
Mon Jan 14 17:25:07 CET 2008 - lslezak@suse.cz
- display details about the GPG key selected for import, UI fully
Modified: trunk/packager/src/clients/key_manager.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/key_manager.ycp?rev=43607&r1=43606&r2=43607&view=diff
==============================================================================
--- trunk/packager/src/clients/key_manager.ycp (original)
+++ trunk/packager/src/clients/key_manager.ycp Tue Jan 15 13:51:20 2008
@@ -55,6 +55,11 @@
return `next;
}
+symbol Write()
+{
+ return KeyManager::Write() ? `next : `abort;
+}
+
// main function - start the workflow
symbol Main()
{
@@ -66,7 +71,7 @@
map aliases = $[
"read" : ``(Read()),
"edit" : ``(RunGPGKeyMgmt(true)),
-// TODO "write" : Write()
+ "write" : ``(Write())
];
map sequence = $[
@@ -76,12 +81,12 @@
],
"edit" : $[
`abort : `abort,
+ `next : "write",
+ ],
+ "write" : $[
`next : `next,
+ `abort : `abort,
],
-// "write" : $[
-// `next : "summary",
-// `abort : `abort,
-// ],
];
y2milestone ("Starting the key management sequence");
Modified: trunk/packager/src/clients/repositories.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=43607&r1=43606&r2=43607&view=diff
==============================================================================
--- trunk/packager/src/clients/repositories.ycp (original)
+++ trunk/packager/src/clients/repositories.ycp Tue Jan 15 13:51:20 2008
@@ -515,11 +515,14 @@
}
);
+ y2internal("success: %1", success);
// store in the persistent libzypp storage
success = success && Pkg::SourceSaveAll(); // #176013
- success = success && KeyManager::Write();
+ y2internal("success: %1", success);
+ success = KeyManager::Write() && success;
+ y2internal("success: %1", success);
return success;
}
Modified: trunk/packager/src/include/key_manager_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/key_manager_dialogs.ycp?rev=43607&r1=43606&r2=43607&view=diff
==============================================================================
--- trunk/packager/src/include/key_manager_dialogs.ycp (original)
+++ trunk/packager/src/include/key_manager_dialogs.ycp Tue Jan 15 13:51:20 2008
@@ -56,8 +56,7 @@
map r = $[
"id" : key["id"]:"",
- "table_descr" : [ key["trusted"]:false ? UI::Glyph (`CheckMark) : "",
- key["id"]:"", key["name"]:"" ],
+ "table_descr" : [ key["id"]:"", key["name"]:"" ],
"rich_descr" : WizardHW::CreateRichTextDescription(sformat(_("Key: %1"), key["id"]:""), descr)
];
@@ -86,53 +85,9 @@
// set the previously selected key
WizardHW::SetSelectedItem(selected_key);
}
-}
-/**
- * Display a dialog for editing the properties of the selected GPG key
- */
-boolean EditKeyProperties(map key)
-{
- UI::OpenDialog(
- `MarginBox(1, 0.3,
- `VBox(
- `Frame(_("GPG Key Properties"),
- `VBox(
- `Left(`Label(sformat(_("Key ID: %1"), key["id"]:""))),
- `Left(`Label(sformat(_("Name: %1"), key["name"]:""))),
- `VSpacing(0.3),
- `Left(`CheckBox(`id(`trusted), _("&The Key is Trusted"), key["trusted"]:false)),
- `VSpacing(0.2)
- )
- ),
- `VSpacing(0.2),
- `HBox(
- `PushButton(`id(`ok),`opt(`key_F10, `default), Label::OKButton()),
- `HSpacing(2),
- `PushButton(`id(`cancel), `opt(`key_F9), Label::CancelButton())
- )
- )
- )
- );
-
- symbol ui = (symbol)UI::UserInput();
- boolean ret = false;
-
- if (ui == `ok)
- {
- boolean new_value = (boolean)UI::QueryWidget(`id(`trusted), `Value);
- if (new_value != key["trusted"]:false)
- {
- key["trusted"] = new_value;
- KeyManager::ModifyKey(key);
- }
-
- ret = true;
- }
-
- UI::CloseDialog();
-
- return ret;
+ // properties of a key cannot be changed, disable Edit button
+ UI::ChangeWidget(`id(`edit), `Enabled, false);
}
// remember the details about the added key from AddGPGKey(),
@@ -168,15 +123,12 @@
`MarginBox(1, 0.3,
`VBox(
`HBox(
- `TextEntry(`id(`file), `opt(`notify,`immediate), Label::FileName()),
+ `TextEntry(`id(`file), `opt(`notify), Label::FileName()),
`VBox(
`Label(""),
`PushButton(`id(`browse), Label::BrowseButton())
)
- ),
- `VSpacing(0.2),
- `Left(`CheckBox(`id(`trusted), _("&The Key is Trusted"), false)),
- `VSpacing(0.3)
+ )
)
)
),
@@ -264,8 +216,8 @@
continue;
}
- boolean trusted = (boolean) UI::QueryWidget(`id(`trusted), `Value);
- added_key = KeyManager::ImportFromFile(keyfile, trusted);
+ // always add as trusted
+ added_key = KeyManager::ImportFromFile(keyfile, true);
if (added_key == nil || size(added_key) == 0)
{
@@ -309,7 +261,7 @@
");
// table header
- WizardHW::CreateHWDialog(title, help_text, [_("Trusted"), _("Key ID"), _("Name")], []);
+ WizardHW::CreateHWDialog(title, help_text, [_("Key ID"), _("Name")], []);
// set the navigation keys according to the current mode
if (gpg_mgr_standalone_mode)
@@ -340,18 +292,8 @@
y2milestone("Selected key: %1, action: %2", key_id, ret);
- // change key properties
- if (ret == `edit)
- {
- map key = KeyManager::SearchGPGKey(key_id);
-
- if (key != nil && EditKeyProperties(key))
- {
- SetItems(key_id);
- }
- }
// remove the key
- else if (ret == `delete)
+ if (ret == `delete)
{
map key = KeyManager::SearchGPGKey(key_id);
Modified: trunk/packager/src/modules/KeyManager.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/KeyManager.ycp?rev=43607&r1=43606&r2=43607&view=diff
==============================================================================
--- trunk/packager/src/modules/KeyManager.ycp (original)
+++ trunk/packager/src/modules/KeyManager.ycp Tue Jan 15 13:51:20 2008
@@ -24,7 +24,7 @@
list > deleted_keys = [];
// keys to import from a file (file name => trusted flag)
-map import_from_file = $[];
+list > import_from_file = [];
boolean modified = false;
@@ -38,7 +38,7 @@
{
known_keys = [];
deleted_keys = [];
- import_from_file = $[];
+ import_from_file = [];
modified = false;
}
@@ -48,14 +48,8 @@
*/
list > ReadCurrentKeys()
{
- // read known keys
- list > ret = Pkg::GPGKeys(false);
-
- if (ret != nil)
- {
- // add trusted keys
- ret = (list >)merge(ret, Pkg::GPGKeys(true));
- }
+ // read trusted keys
+ list > ret = Pkg::GPGKeys(true);
y2milestone("Read configuration: %1", ret);
@@ -135,45 +129,18 @@
);
// import the new keys
- foreach(string tmpfile, boolean trusted, import_from_file,
+ foreach(map new_key, import_from_file,
{
- y2milestone("Importing key from '%1', trusted: %2", tmpfile, trusted);
+ y2milestone("Importing key %1 from '%2', trusted: %3", new_key["id"]:"", new_key["file"]:"", new_key["trusted"]:false);
- ret = Pkg::ImportGPGKey(tmpfile, trusted) && ret;
+ ret = Pkg::ImportGPGKey(new_key["file"]:"", new_key["trusted"]:false) && ret;
}
);
- // modify keys (change the trusted flag)
- // get the current settings
- list > current_keys = ReadCurrentKeys();
- foreach(map key, current_keys,
- {
- map found_key = SearchGPGKey(key["id"]:"");
- // is the trusted flag different?
- if (found_key != nil && found_key["trusted"]:false != key["trusted"]:false)
- {
- y2milestone("Key %1 ('%2'): new trusted state: %3", found_key["id"]:"",
- found_key["name"]:"", found_key["trusted"]:false);
-
- // the current state is trusted
- if (found_key["trusted"]:false)
- {
- // TODO move to the trusted keyring
- }
- else
- {
- // TODO move from the trusted keyring
- }
- }
- }
- );
-
-
// all changes are saved, reset them
- Reset();
-
- // update the current status
- Read();
+ deleted_keys = [];
+ import_from_file = [];
+ modified = false;
return ret;
}
@@ -197,33 +164,6 @@
}
/**
- * Modify a key
- * @param new_key A map with the key data, the key with the same Key ID is modified. (Only "trusted" flag can be changed.)
- * @return true on success
- */
-global boolean ModifyKey(map new_key)
-{
- boolean ret = true;
-
- if (new_key != nil)
- {
- // update the key
- known_keys = maplist(map k, known_keys,
- {
- if (k["id"]:"" == new_key["id"]:"")
- {
- k["trusted"] = new_key["trusted"]:false;
- }
-
- return k;
- }
- );
- }
-
- return ret;
-}
-
-/**
* Delete the key from the package manager
* @param key_id ID of the key to delete
* @return boolean true on success
@@ -259,6 +199,20 @@
known_keys = remove(known_keys, found);
}
+ boolean found_in_imported = false;
+
+ // remove from imported keys (deleting a key scheduled for import)
+ import_from_file = filter(map new_key, import_from_file,
+ {
+ boolean found_key = (new_key["id"]:"" == key_id);
+ found_in_imported = found_in_imported || found_key;
+
+ return found_key;
+ }
+ );
+
+ modified = true;
+
return (found != nil);
}
@@ -273,7 +227,7 @@
{
// check whether the file is valid, copy the file to the tmpdir
map key = Pkg::CheckGPGKeyFile(file);
- y2internal("File content: %1", key);
+ y2milestone("File content: %1", key);
if (key != nil && size(key) > 0)
{
@@ -308,11 +262,29 @@
return nil;
}
+ boolean found_in_deleted = false;
+ // check if the key is scheduled for removal
+ deleted_keys = filter(map deleted_key, deleted_keys,
+ {
+ boolean key_found = (deleted_key["id"]:"" == key["id"]:"");
+ found_in_deleted = found_in_deleted || key_found;
+
+ return !key_found;
+ }
+ );
+
+ // the key was known, move it to the known list
+ if (found_in_deleted)
+ {
+ known_keys = add(known_keys, key);
+ return key;
+ }
+
// copy the key to the temporary directory (in fact the keys are imported in Write())
string tmpfile = sformat("%1/tmp_gpg_key.%2", Directory::tmpdir, size(known_keys));
string command = sformat("/bin/cp -- '%1' '%2'", String::Quote(file), String::Quote(tmpfile));
- y2internal("Copying the key: %1", command);
+ y2milestone("Copying the key: %1", command);
integer out = (integer)SCR::Execute(.target.bash, command);
@@ -323,11 +295,13 @@
}
// store the import request
- import_from_file = add(import_from_file, tmpfile, trusted);
+ import_from_file = add(import_from_file, $[ "file" : tmpfile, "trusted" : trusted, "id" : key["id"]:"" ]);
// add the new key to the current config
known_keys = add(known_keys, key);
+ modified = true;
+
return key;
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
