Author: mcalmer Date: Fri Nov 9 14:01:15 2007 New Revision: 41920 URL: http://svn.opensuse.org/viewcvs/yast?rev=41920&view=rev Log: - version 2.13.34 - fix importCA [#337524] - Enable cloning of CA-management for use with AutoYaST [FATE #302080] Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/VERSION branches/SuSE-SLE-10-SP2-Branch/ca-management/package/yast2-ca-management.changes branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm branches/SuSE-SLE-10-SP2-Branch/ca-management/src/util.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-management/VERSION?rev=41920&r1=41919&r2=41920&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/VERSION Fri Nov 9 14:01:15 2007 @@ -1 +1 @@ -2.13.33 +2.13.34 Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-management/package/yast2-ca-management.changes?rev=41920&r1=41919&r2=41920&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/package/yast2-ca-management.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/package/yast2-ca-management.changes Fri Nov 9 14:01:15 2007 @@ -1,7 +1,10 @@ ------------------------------------------------------------------- Wed Nov 7 10:37:49 CET 2007 - mc@suse.de +- version 2.13.34 +- fix importCA [#337524] - Enable cloning of CA-management for use with AutoYaST + [FATE #302080] ------------------------------------------------------------------- Wed Oct 10 12:39:02 CEST 2007 - mc@suse.de Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm?rev=41920&r1=41919&r2=41920&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/src/YaPI/CaManagement.pm Fri Nov 9 14:01:15 2007 @@ -6693,7 +6693,7 @@ * caKey (required - path to private key in PEM format) -* caPasswd (required, if the private key is unencrypted) +* caPasswd (required; password of the private key or a new password if the key is unencrypted) The return value is "undef" on an error and "1" on success. @@ -6702,7 +6702,8 @@ my $data = { caName => 'My_CA', caCertificate => /path/to/cacert.pem, - caKey => /path/to/cacert.key + caKey => /path/to/cacert.key, + caPasswd => "secret" }; my $res = YaPI::CaManagement->ImportCA($data); @@ -6750,23 +6751,24 @@ code => "FILE_DOES_NOT_EXIST"); } + if (!exists $data->{caPasswd} || !defined $data->{"caPasswd"} ) { + return $self->SetError( summary => __("Missing value 'caPasswd'."), + code => "CHECK_PARAM_FAILED"); + } + eval { my $cert = LIMAL::CaMgm::LocalManagement::readFile($data->{caCertificate}); my $key = LIMAL::CaMgm::LocalManagement::readFile($data->{caKey}); - if(!exists $data->{caPasswd} || !defined $data->{caPasswd}) { - $data->{caPasswd} = ""; - } - - if( defined $data->{'repository'}) { - + if( defined $data->{'repository'}) + { LIMAL::CaMgm::CA::importCA($caName, $cert, $key, $data->{caPasswd}, $data->{"repository"}); - - } else { - + } + else + { LIMAL::CaMgm::CA::importCA($caName, $cert, $key, $data->{caPasswd}); } Modified: branches/SuSE-SLE-10-SP2-Branch/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/ca-management/src/util.ycp?rev=41920&r1=41919&r2=41920&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/ca-management/src/util.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/ca-management/src/util.ycp Fri Nov 9 14:01:15 2007 @@ -1316,6 +1316,7 @@ ) ) ), + `Password( `id (`passKey), _("&Key Password")), `VSpacing (1), `HBox ( // push button label `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()), @@ -1362,17 +1363,28 @@ string caCertificate = (string) UI::QueryWidget(`id(`pathCert), `Value); string caKey = (string) UI::QueryWidget(`id(`pathKey), `Value); + string caPasswd = (string) UI::QueryWidget(`id(`passKey), `Value); string caName = (string) UI::QueryWidget(`id(`caName), `Value); if (size (caCertificate) == 0) { + // Error popup Popup::Error(_("Path to certificate file required.")); ret = `again; } else if (size (caKey) == 0) { + // Error popup Popup::Error(_("Path of the private key required.")); ret = `again; - } else if (size (caName) == 0) + } + else if (size (caPasswd) == 0) { + // Error popup + Popup::Error(_("Key Password is required. \nIt must be the password for the encrypted key or a new one in case of a not encrypted key.")); + ret = `again; + } + else if (size (caName) == 0) + { + // Error popup Popup::Error(_("CA name required.")); ret = `again; } @@ -1383,37 +1395,26 @@ UI::OpenDialog(`VBox(`Label(_("Importing request...")))); boolean yapiret = (boolean) YaPI::CaManagement::ImportCA ($["caName" : caName, - "caCertificate" : caCertificate, - "caKey" : caKey]); - y2milestone ("ImportRequest(%1,%2,%3) return %4", + "caCertificate" : caCertificate, + "caKey" : caKey, + "caPasswd" : caPasswd + ]); + y2milestone ("ImportRequest(%1,%2,%3, <passwd>) return %4", caName, caCertificate, caKey, yapiret); - if (!yapiret) - { - // Checking if password required only - map<string,any> messageMap = YaPI::Error(); - if (messageMap["code"]:"" == "PASSWD_REQUIRED") - { - yapiret = (boolean) YaPI::CaManagement::ImportCA ($["caName" : caName, - "caCertificate" : caCertificate, - "caKey" : caKey, - "caPasswd" : getPassword(caName) - ]); - - } - } if (yapiret == nil) { - showErrorCaManagement (); - ret = `again; + showErrorCaManagement (); + ret = `again; } else { - Popup::Message(_("Request has been imported.")); - success = true; - } + // Error popup + Popup::Message(_("CA has been imported.")); + success = true; + } UI::CloseDialog (); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org