Author: mcalmer Date: Thu Sep 29 11:03:02 2011 New Revision: 66136 URL: http://svn.opensuse.org/viewcvs/yast?rev=66136&view=rev Log: quote pathes used in target.bash (bnc#266220) Modified: trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/src/ca_mgm_auto.ycp trunk/ca-management/src/ca_mgm_proposal.ycp trunk/ca-management/src/crlExport.ycp Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-management.changes?rev=66136&r1=66135&r2=66136&view=diff ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Thu Sep 29 11:03:02 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 29 11:01:16 CEST 2011 - mc@suse.de + +- quote pathes used in target.bash (bnc#266220) + +------------------------------------------------------------------- Mon Sep 26 14:44:47 CEST 2011 - visnov@suse.cz - version 2.21.7 Modified: trunk/ca-management/src/ca_mgm_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm_auto.ycp?rev=66136&r1=66135&r2=66136&view=diff ============================================================================== --- trunk/ca-management/src/ca_mgm_auto.ycp (original) +++ trunk/ca-management/src/ca_mgm_auto.ycp Thu Sep 29 11:03:02 2011 @@ -48,13 +48,13 @@ list<string> name_list = maplist ( string k, string v, country_map, { return v; }); - name_list = sort (name_list); - + name_list = sort (name_list); + foreach (string name, name_list, ``{ result = add (result, `item (`id (country_index[name]:""), name , CaMgm::autoYaSTSettings["country"]:Timezone::GetCountryForTimezone("") == country_index[name]:"") ); }); - return result; + return result; } @@ -73,7 +73,7 @@ Here, change the settings of this CA and certificate or import a CA and certificate from a file. </p> "); - + /* Initialization dialog contents */ Wizard::CreateDialog(); @@ -86,7 +86,7 @@ _("Import Common CA and Certificate"), CaMgm::autoYaSTSettings["importCertificate"]:true)), `HBox ( `HSpacing (3), - `VBox( + `VBox( `HBox ( `HWeight(2, `TextEntry( `id (`pathCert), _("&Path of Certificate"), CaMgm::autoYaSTSettings["pathCertificate"]:"")), @@ -97,42 +97,42 @@ ) ), `HBox(`HWeight (1,`Password(`id(`pw3), `opt(`hstretch), _("&Password:"), CaMgm::autoYaSTSettings["password"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`Password(`id(`pw4), `opt(`hstretch), _("Co&nfirm Password"), confirmPassword)) ) ) - ), + ), `Left(`RadioButton(`id(`notImport), `opt( `notify), _("Generate Common CA and Certificate"), !(CaMgm::autoYaSTSettings["importCertificate"]:false))), `HBox(`HSpacing (3), - `VBox( + `VBox( `HBox(`HWeight (1,`TextEntry( `id (`id_CAName), _("&CA Name:"), CaMgm::autoYaSTSettings["CAName"]:"YaST_Default_CA")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`TextEntry( `id (`id_commonName), _("&Common Name:"), CaMgm::autoYaSTSettings["ca_commonName"]:"")) ), `HBox(`HWeight (1,`TextEntry(`id(`email), _("E-Mail"), CaMgm::autoYaSTSettings["server_email"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`ComboBox( `id (`id_country), `opt(`editable), _("C&ountry:"), getAutoCountryList())) - ), + ), `HBox(`HWeight (1,`TextEntry( `id (`id_organisation), _("O&rganization:"), CaMgm::autoYaSTSettings["organisation"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`TextEntry( `id (`id_organisationUnit), _("Or&ganizational Unit:"), CaMgm::autoYaSTSettings["organisationUnit"]:"")) ), `HBox(`HWeight (1,`TextEntry( `id (`id_locality), _("Loca&lity:"), CaMgm::autoYaSTSettings["locality"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`TextEntry( `id (`id_state), _("&State:"), CaMgm::autoYaSTSettings["state"]:"")) ), `HBox(`HWeight (1,`Password(`id(`pw1), `opt(`hstretch), _("&Password:"), CaMgm::autoYaSTSettings["password"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`Password(`id(`pw2), `opt(`hstretch), _("Co&nfirm Password"), confirmPassword)) ), `Left(`CheckBox(`id(`localServerName), `opt(`notify), @@ -140,7 +140,7 @@ CaMgm::autoYaSTSettings["takeLocalServerName"]:true)), `HBox(`HWeight (1,`TextEntry( `id (`id_serverName), _("&Server Name:"), CaMgm::autoYaSTSettings["server_commonName"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`Empty()) ) ) @@ -148,15 +148,15 @@ ) ) ); - + Wizard::SetContents (caption, contents, help_text, false, true); Wizard::SetNextButton(`next, Label::FinishButton() ); - + // Get the user input. // any ret = nil; - repeat + repeat { if (UI::QueryWidget(`id(`rb), `CurrentButton) == `import) { @@ -172,11 +172,11 @@ UI::ChangeWidget (`id (`pw2), `Enabled, false); UI::ChangeWidget (`id (`localServerName), `Enabled, false); UI::ChangeWidget (`id (`id_serverName), `Enabled, false); - UI::ChangeWidget (`id (`pathCert), `Enabled, true); + UI::ChangeWidget (`id (`pathCert), `Enabled, true); UI::ChangeWidget (`id(`browseCert), `Enabled, true); UI::ChangeWidget (`id (`pw3), `Enabled, true); UI::ChangeWidget (`id (`pw4), `Enabled, true); - + } else { @@ -189,11 +189,11 @@ UI::ChangeWidget (`id (`id_locality), `Enabled, true); UI::ChangeWidget (`id (`id_state), `Enabled, true); UI::ChangeWidget (`id (`localServerName), `Enabled, true); - UI::ChangeWidget (`id (`pathCert), `Enabled, false); + UI::ChangeWidget (`id (`pathCert), `Enabled, false); UI::ChangeWidget (`id(`browseCert), `Enabled, false); UI::ChangeWidget (`id (`pw3), `Enabled, false); UI::ChangeWidget (`id (`pw4), `Enabled, false); - + UI::ChangeWidget (`id (`pw1), `Enabled, true); UI::ChangeWidget (`id (`pw2), `Enabled, true); @@ -204,10 +204,10 @@ else { UI::ChangeWidget (`id (`id_serverName), `Enabled, true); - } + } } - + ret = Wizard::UserInput(); if (ret == `browseCert) @@ -217,14 +217,14 @@ { UI::ChangeWidget(`id(`pathCert), `Value, name); } - ret = `again; + ret = `again; } if (ret == `next ||ret == `back) { remove (CaMgm::autoYaSTSettings, "certificate"); - + boolean notImport = (boolean) (UI::QueryWidget(`id(`rb), `CurrentButton) == `notImport); if (notImport) { @@ -246,7 +246,7 @@ { Popup::Error(_("CA name required.")); ret = `again; - } + } if (notImport && size ((string) UI::QueryWidget(`id(`id_commonName), `Value)) <= 0 && ret!=`again) @@ -268,7 +268,7 @@ && ret!=`again) { Popup::Error(_("Server name required.")); - ret = `again; + ret = `again; } if (!notImport @@ -284,42 +284,42 @@ { Popup::Error(_("Password length should be greater than three characters.")); ret = `again; - } - } + } + } map retmap = $[]; - + if (!notImport && ret!=`again) { string command = sformat("/usr/bin/openssl base64 -in %1 -e", - (string) UI::QueryWidget(`id (`pathCert), `Value)); + String::Quote ( (string) UI::QueryWidget(`id (`pathCert), `Value))); retmap = (map) SCR::Execute (.target.bash_output, command, $[] ); y2milestone("%1 :%2", command, retmap); if (retmap["exit"]:0 != 0) { - y2error("%1 :%2", command, retmap); + y2error("%1 :%2", command, retmap); Popup::Error(_("Cannot read the certificate.")); - ret = `again; + ret = `again; } } if (ret!=`again) { CaMgm::autoYaSTSettings = $[]; - + CaMgm::autoYaSTSettings["importCertificate"] = (boolean) ((symbol)UI::QueryWidget(`id(`rb), `CurrentButton) == `import); if (CaMgm::autoYaSTSettings["importCertificate"]:false) { CaMgm::autoYaSTSettings["certificate"] = strip(retmap["stdout"]:""); CaMgm::autoYaSTSettings["pathCertificate"] = (string) UI::QueryWidget(`id (`pathCert), `Value); - CaMgm::autoYaSTSettings["password"] = (string) UI::QueryWidget(`id(`pw3), `Value); + CaMgm::autoYaSTSettings["password"] = (string) UI::QueryWidget(`id(`pw3), `Value); } else { - CaMgm::autoYaSTSettings["takeLocalServerName"] = (boolean) UI::QueryWidget(`id(`localServerName), `Value); + CaMgm::autoYaSTSettings["takeLocalServerName"] = (boolean) UI::QueryWidget(`id(`localServerName), `Value); CaMgm::autoYaSTSettings["password"] = (string) UI::QueryWidget(`id(`pw1), `Value); if (!CaMgm::autoYaSTSettings["takeLocalServerName"]:true) { @@ -363,7 +363,7 @@ // importing CA/certificate CaMgm::autoYaSTSettings["certificate"] = settings["certificate"]:""; CaMgm::autoYaSTSettings["pathCertificate"] = settings["pathCertificate"]:""; - CaMgm::autoYaSTSettings["password"] = settings["password"]:""; + CaMgm::autoYaSTSettings["password"] = settings["password"]:""; } else { @@ -372,20 +372,20 @@ { CaMgm::autoYaSTSettings["password"] = settings["password"]:""; } - + CaMgm::autoYaSTSettings["takeLocalServerName"] = settings["takeLocalServerName"]:true; if (settings["takeLocalServerName"]:true ) { map host_ips = getHostIPs (); string hostname_bak = ""; - + foreach(string key, string value, host_ips, { if(value == "DNS") { hostname_bak = key; } }); - + map retmap = (map) SCR::Execute (.target.bash_output, "/bin/hostname --long", $[] ); @@ -406,44 +406,44 @@ else { if (haskey (settings, "server_commonName")) - { + { CaMgm::autoYaSTSettings["server_commonName"] = settings["server_commonName"]:""; } } if (haskey (settings, "CAName")) - { + { CaMgm::autoYaSTSettings["CAName"] = settings["CAName"]:"YaST_Default_CA"; } if (haskey (settings, "ca_commonName")) - { + { CaMgm::autoYaSTSettings["ca_commonName"] = settings["ca_commonName"]:""; } if (haskey (settings, "server_email")) - { + { CaMgm::autoYaSTSettings["server_email"] = settings["server_email"]:""; } if (haskey (settings, "country")) - { + { CaMgm::autoYaSTSettings["country"] = settings["country"]:""; } if (haskey (settings, "organisation")) - { + { CaMgm::autoYaSTSettings["organisation"] = settings["organisation"]:""; } if (haskey (settings, "organisationUnit")) - { + { CaMgm::autoYaSTSettings["organisationUnit"] = settings["organisationUnit"]:""; } if (haskey (settings, "locality")) - { + { CaMgm::autoYaSTSettings["locality"] = settings["locality"]:""; } if (haskey (settings, "state")) - { + { CaMgm::autoYaSTSettings["state"] = settings["state"]:""; } } - + return ret; } @@ -453,7 +453,7 @@ * @return map Dumped settings (later acceptable by Import ()) */ map Export () { - + return CaMgm::autoYaSTSettings; } @@ -477,7 +477,7 @@ if (CaMgm::autoYaSTSettings["importCertificate"]:false) { - summary = Summary::AddHeader (summary,_("Import Certificate from File")); + summary = Summary::AddHeader (summary,_("Import Certificate from File")); summary = Summary::AddLine (summary, CaMgm::autoYaSTSettings["pathCertificate"]:""); } else @@ -507,7 +507,7 @@ summary = Summary::AddLine (summary, CaMgm::autoYaSTSettings["locality"]:_("[not set]")); summary = Summary::AddHeader (summary, _("State")); summary = Summary::AddLine (summary, CaMgm::autoYaSTSettings["state"]:_("[not set]")); - + summary = Summary::AddHeader (summary, _("Password")); if (size (CaMgm::autoYaSTSettings["password"]:"") <= 0 ) { @@ -518,7 +518,7 @@ summary = Summary::AddLine (summary, _("[set]")); } } - + return summary; } @@ -535,7 +535,7 @@ Report::DisplayErrors(true, 5); Report::DisplayMessages(true, 5); - + // We do not set help text here, because it was set outside Progress::New(caption, " ", steps, [ /* Progress stage 1/2 */ @@ -556,13 +556,13 @@ // Read server information string tmpfile = (string) SCR::Read (.target.tmpdir) + "/YaST-Servercert.p12"; - + Progress::NextStage(); if (CaMgm::autoYaSTSettings["importCertificate"]:false) { // importing CA/certificate string command = sformat("/usr/bin/openssl base64 -out %1 -d", - tmpfile); + String::Quote ( tmpfile )); SCR::Execute (.target.bash_input, command, CaMgm::autoYaSTSettings["certificate"]:""); @@ -574,14 +574,14 @@ { map host_ips = getHostIPs (); string hostname_bak = ""; - + foreach(string key, string value, host_ips, { if(value == "DNS") { hostname_bak = key; } }); - + map retmap = (map) SCR::Execute (.target.bash_output, "/bin/hostname --long", $[] ); @@ -604,7 +604,7 @@ { CaMgm::prop_server_commonName = CaMgm::autoYaSTSettings["server_commonName"]:""; } - + CaMgm::prop_selection = `def; CaMgm::prop_ca_commonName = CaMgm::autoYaSTSettings["ca_commonName"]:""; CaMgm::prop_CAName = CaMgm::autoYaSTSettings["CAName"]:"YaST_Default_CA"; @@ -618,7 +618,7 @@ } Progress::NextStage(); - + // write settings if (success) @@ -635,18 +635,18 @@ || !importret) { success = false; - } + } } else { - success = create_default_CA_certificate(); + success = create_default_CA_certificate(); } } if (!success) { /* Error message */ Report::Error (_("Cannot create certificates.")); - } + } sleep(sl); @@ -690,14 +690,14 @@ { domain = strip(retmap["stdout"]:"site"); } - + if(found) { map serverCertDN = servercert["DN_HASH"]:$[]; map serverCertIssuer = servercert["ISSUER_HASH"]:$[]; - - CaMgm::autoYaSTSettings["takeLocalServerName"] = false; + + CaMgm::autoYaSTSettings["takeLocalServerName"] = false; CaMgm::autoYaSTSettings["password"] = "ENTER PASSWORD HERE"; CaMgm::autoYaSTSettings["server_commonName"] = ((list)serverCertDN["CN"]:[])[0]:(hostname + "." + domain); CaMgm::autoYaSTSettings["CAName"] = "YaST_Default_CA"; @@ -711,7 +711,7 @@ } else { - CaMgm::autoYaSTSettings["takeLocalServerName"] = true; + CaMgm::autoYaSTSettings["takeLocalServerName"] = true; CaMgm::autoYaSTSettings["password"] = "ENTER PASSWORD HERE"; CaMgm::autoYaSTSettings["CAName"] = "YaST_Default_CA"; CaMgm::autoYaSTSettings["ca_commonName"] = "YaST Default CA " + "(" + domain + ")"; Modified: trunk/ca-management/src/ca_mgm_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm_proposal.ycp?rev=66136&r1=66135&r2=66136&view=diff ============================================================================== --- trunk/ca-management/src/ca_mgm_proposal.ycp (original) +++ trunk/ca-management/src/ca_mgm_proposal.ycp Thu Sep 29 11:03:02 2011 @@ -56,7 +56,7 @@ string hostname_bak = ""; if (size(CaMgm::prop_subject_alt_name_list) <= 0){ CaMgm::prop_subject_alt_name_list = []; - + foreach(string key, string value, host_ips, { if(value == "DNS") { @@ -68,7 +68,7 @@ CaMgm::prop_subject_alt_name_list = add (CaMgm::prop_subject_alt_name_list, elem); }); } - + map retmap = (map) SCR::Execute (.target.bash_output, "/bin/hostname --long", $[] ); @@ -94,7 +94,7 @@ retmap["stdout"] = hostname_bak; } } - + string longhostname = strip(retmap["stdout"]:""); if ( longhostname == nil ) longhostname = ""; // (bnc#428101) @@ -106,12 +106,12 @@ if ( hostname == nil ) hostname = ""; // (bnc#428101) string domain = substring (longhostname, findfirstof(longhostname,".")+1); if ( domain == nil ) domain = ""; // (bnc#428101) - + if (size (domain) <= 0) { domain = longhostname; } - + if (!CaMgm::prop_ca_commonNameChanged) { CaMgm::prop_ca_commonName = "YaST Default CA (" + hostname + ")"; @@ -128,12 +128,12 @@ { CaMgm::prop_email = "postmaster@" + domain; } - + if(ret["warning"]:"" != "") { return ret; } - + // new handling of force reset because of (#238754) if (force_reset) @@ -185,8 +185,8 @@ "inForm":"PEM" ]); CaMgm::prop_settingsWritten = defaultRootCA != nil ? true:false; - - + + if (CaMgm::prop_settingsWritten) { if( CaMgm::prop_keep_ca || !Popup::YesNo(_("CA Management") + "\n" + @@ -200,7 +200,7 @@ "type":"parsed", "datatype":"CERTIFICATE", "inForm":"PEM" ]); - + map defaultServerCertIssuer = defaultServerCert["ISSUER_HASH"]:$[]; // CaMgm::prop_selection = `def; CaMgm::prop_ca_commonName = ((list)defaultServerCertIssuer["CN"]:[])[0]:""; @@ -209,9 +209,9 @@ CaMgm::prop_CAName = CaMgm::prop_CAName; map defaultSCmap = defaultServerCert["DN_HASH"]:$[]; - + CaMgm::prop_server_commonName = ((list)defaultSCmap["CN"]:[])[0]:""; - + ret = $[ "workflow_sequence" : `auto ]; } @@ -276,7 +276,7 @@ } if ( size(pw1) < 4) { - Popup::Error(_("The password is too short for use as the password for the certificates. + Popup::Error(_("The password is too short for use as the password for the certificates. Enter a valid password for the certificates or disable certificate creation. ")); continue; @@ -292,7 +292,7 @@ break; } } - + UI::CloseDialog (); } if (CaMgm::prop_keep_ca) @@ -311,14 +311,14 @@ proposal = HTML::Para(_("Creating default CA and certificate.") + HTML::Newline()); } - + string passwordString = (string) (CaMgm::prop_passwordChanged ? _("[manually set]") : _("[root password]")); string subAltName = ""; foreach(map elem, CaMgm::prop_subject_alt_name_list, { subAltName = subAltName + elem["kind"]:"" + ":" + elem["name"]:"" + " "; }); - + proposal = proposal+ HTML::List( [ _("CA Name: ") + CaMgm::prop_CAName, _("Common Name: ") + CaMgm::prop_ca_commonName, _("Server Name: ") + CaMgm::prop_server_commonName, @@ -327,10 +327,10 @@ _("E-Mail: ") + CaMgm::prop_email, _("Alternative Names: ") + subAltName, ] ); - + if ( !CaMgm::prop_keep_ca && size(CaMgm::prop_password) < 4) { - ret = add( ret, "warning", _("The root password is too short for use as the password for the certificates. + ret = add( ret, "warning", _("The root password is too short for use as the password for the certificates. Enter a valid password for the certificates or disable certificate creation. ")); ret = add( ret, "warning_level", `blocker ); @@ -344,7 +344,7 @@ { proposal = HTML::Para(_("Importing a CA and certificate from file")); } - + ret = add (ret, "preformatted_proposal", proposal); if ( ((list<string>) splitstring (CaMgm::prop_server_commonName, "."))[0]:"" == "linux") { @@ -398,7 +398,7 @@ else if (func == "Write") { boolean success = true; - + if (!CaMgm::prop_settingsWritten) { if (CaMgm::prop_selection == `def) @@ -414,7 +414,7 @@ CaMgm::prop_settingsWritten = true; } } - + ret = $[ "success" : success ]; } return ret; Modified: trunk/ca-management/src/crlExport.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/crlExport.ycp?rev=66136&r1=66135&r2=66136&view=diff ============================================================================== --- trunk/ca-management/src/crlExport.ycp (original) +++ trunk/ca-management/src/crlExport.ycp Thu Sep 29 11:03:02 2011 @@ -60,7 +60,7 @@ define void showSecurityInfo() { Popup::LongText( - // Translators: window caption + // Translators: window caption _("Security Information"), // Translators: long help text - security information `RichText(_("Warning!<br>Activating the automatic creation and export of a CRL will write the CA password to a configuration file on disk. The password will be stored there in plain text as it is needed to create a CRL. The file will only be readable for the root user.")), @@ -120,7 +120,7 @@ define void readSettings(string ca) { string crlConf = sformat("/var/lib/CAM/%1/exportcrl.conf", deletechars(ca, " ")); - if (SCR::Execute(.target.bash, sformat("[ -f %1 ]", crlConf) ) == 0 ) + if (SCR::Execute(.target.bash, sformat("[ -f %1 ]", String::Quote (crlConf) ) ) == 0 ) { SCR::RegisterAgent( .temp_crlexport_agent, `ag_ini( `IniAgent( crlConf, crlConfFormat )) ); @@ -160,9 +160,9 @@ define void writeSettings(string ca) { string crlConf = sformat("/var/lib/CAM/%1/exportcrl.conf", deletechars(ca, " ")); - if (! (SCR::Execute(.target.bash, sformat("[ -f %1 ]", crlConf) ) == 0)) + if (! (SCR::Execute(.target.bash, sformat("[ -f %1 ]", String::Quote (crlConf)) ) == 0)) { - SCR::Execute(.target.bash, sformat("umask 0077 && touch %1", crlConf) ); + SCR::Execute(.target.bash, sformat("umask 0077 && touch %1", String::Quote (crlConf)) ); } SCR::RegisterAgent( .temp_crlexport_agent, `ag_ini( @@ -240,7 +240,7 @@ `VBox(`VSpacing(1), `PushButton(`id(`askFile), Label::BrowseButton() )) ), `Left( `RadioButtonGroup(`id(`fileformat), - `HBox( + `HBox( `Label(_("Export Format")), `RadioButton(`id(`ffpem), `opt(`notify), _("PEM Format"), true ), `RadioButton(`id(`ffder), `opt(`notify), _("DER Format") ) @@ -276,7 +276,7 @@ `Left( `CheckBox(`id(`exportFile), `opt(`notify), _("Export to file"), true )), `HBox( `HSpacing(hspace), cfilesettings ), `VSpacing(vspace), - `Left( `CheckBox(`id(`exportLDAP), `opt(`notify), _("Export to LDAP"), false )), + `Left( `CheckBox(`id(`exportLDAP), `opt(`notify), _("Export to LDAP"), false )), `HBox( `HSpacing(hspace), cldapsettings ), `VSpacing(vspace), cinterval @@ -308,7 +308,7 @@ if (ui == `askFile) { string fformat = "*.pem"; - if (fileformat == `ffder) fformat = "*.der"; + if (fileformat == `ffder) fformat = "*.der"; string newcrlfile = UI::AskForSaveFileName( crlfile, fformat, _("Save as") ); if (newcrlfile != nil && newcrlfile != "") crlfile = newcrlfile; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org