Author: jdsn Date: Thu Apr 24 18:33:57 2008 New Revision: 47044 URL: http://svn.opensuse.org/viewcvs/yast?rev=47044&view=rev Log: fixed SMT autoyast bug (bnc#377929) integrated SMT renaming (bnc#376000) removed dependencies to limal for SMT support (bnc#380060) cleaned gui layout initial release of postinstallation workflow (piwo) (fate#303359) 2.16.2 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/Makefile.am trunk/registration/src/clients/inst_suse_register.ycp trunk/registration/src/config/registration.rnc trunk/registration/src/modules/Register.ycp trunk/registration/yast2-registration.spec.in Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=47044&r1=47043&r2=47044&view=diff ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Thu Apr 24 18:33:57 2008 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=47044&r1=47043&r2=47044&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Thu Apr 24 18:33:57 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Tue Apr 24 17:15:09 CEST 2008 - jdsn@suse.de + +- fixed SMT autoyast bug (bnc#377929) +- integrated SMT renaming (bnc#376000) +- removed dependencies to limal for SMT support (bnc#380060) +- cleaned gui layout +- initial release of postinstallation workflow (piwo) (fate#303359) +- 2.16.2 + +------------------------------------------------------------------- Tue Apr 1 21:09:48 CEST 2008 - jdsn@suse.de - proper pluralization in autoYaST (bnc#184893) Modified: trunk/registration/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/Makefile.am?rev=47044&r1=47043&r2=47044&view=diff ============================================================================== --- trunk/registration/src/Makefile.am (original) +++ trunk/registration/src/Makefile.am Thu Apr 24 18:33:57 2008 @@ -2,4 +2,4 @@ # Makefile.am for installation/src # -SUBDIRS = modules clients config yastbrowser +SUBDIRS = modules clients config control yastbrowser Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_suse_register.ycp?rev=47044&r1=47043&r2=47044&view=diff ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Thu Apr 24 18:33:57 2008 @@ -211,30 +211,39 @@ /* vv MAIN (WIZARD) LAYOUT vv */ term sr_layout=nil; - sr_layout=`HVCenter( `VBox( - `Left ( - `RadioButtonGroup( `id(`sr_perform), `VBox( - `Left ( `Label( nccc_top ) ), - `VSpacing(1), - `Left ( `RadioButton(`id(`noconfigure), `opt(`notify), nccc_noconfigure )), - `Left ( `RadioButton(`id(`configure), `opt(`notify), nccc_configure, true )), - `Left ( `id(`includeinfo), `HBox( `HSpacing( 3.0 ), - `VBox ( - `VSpacing(0.5), - `Left( `Label( nccc_sub_comment ) ), - `Left( `CheckBox(`id(`hwinfo), `opt(`notify), nccc_sub_hwinfo, Register::submit_hwdata ) ), - `Left( `CheckBox(`id(`optional), `opt(`notify), nccc_sub_optional, Register::submit_optional ) ), - Register::display_forcereg ? `Left( `CheckBox(`id(`forcereg), `opt(`notify), nccc_forcereg, false ) ):`Empty() , - `VSpacing(0.5), - `Right( `PushButton(`id(`showinfo), nccc_sub_showbtn ) ) - ) ) ) , - // active in SLE products only - merged here for consistency - //`VSpacing(0.5), - //`Left( `CheckBox(`id(`regularly_run), `opt(`notify), title_regularly_run, Register::register_regularly ) ), - `VSpacing(0.5) - ))) + + sr_layout = `HVSquash( + `VBox( + `Label( nccc_top ), + `VSpacing(0.5), + `Frame( title, + `RadioButtonGroup( `id(`sr_perform), + `MarginBox( 2, 0.5, + `VBox( + `Left ( `RadioButton(`id(`noconfigure), `opt(`notify), nccc_noconfigure )), + `Left ( `RadioButton(`id(`configure), `opt(`notify), nccc_configure, true )), + `Left ( `id(`includeinfo), + `HBox( `HSpacing( 3.0 ), + `VBox ( + `VSpacing(0.5), + `Left( `Label( nccc_sub_comment ) ), + `Left( `CheckBox(`id(`hwinfo), `opt(`notify), nccc_sub_hwinfo, Register::submit_hwdata ) ), + `Left( `CheckBox(`id(`optional), `opt(`notify), nccc_sub_optional, Register::submit_optional ) ), + Register::display_forcereg ? `Left( `CheckBox(`id(`forcereg), `opt(`notify), nccc_forcereg, false ) ):`Empty(), + `VSpacing(0.5), + // active in SLE products only - merged here for consistency + //`VSpacing(0.5), + //`Left( `CheckBox(`id(`regularly_run), `opt(`notify), title_regularly_run, Register::register_regularly ) ), + `Right( `PushButton(`id(`showinfo), nccc_sub_showbtn ) ) + ) + ) + ) + )) + )) )); + + term contents = `VBox ( `VSpacing (0.5), sr_layout, `VSpacing (0.5)); /* ^^ END MAIN LAYOUT ^^ */ @@ -409,13 +418,15 @@ chmod 700 $fakehome tmp=$(mktemp $fakehome/.Xauthority.XXXXXX) || exit 1 chmod 600 $tmp +chown $user:$group $tmp $fakehome trap \"rm -rf $fakehome\" EXIT INT HUP TERM ", user, group, command ); + // screen jail can be removed - no longer used (#367719) // create a script to run a system call as different user - // thanks to werner (script) and jw (.screenrc.jail) for their help + // thanks to werner (script) // unset DESKTOP_SESSION : (#207332) if (!textmode) { exec = exec + @@ -443,6 +454,7 @@ } else { + // screen jail can be removed - no longer used (#367719) exec = exec + "su -s /bin/bash -- $user -c \"cd; $cmd\""; } @@ -462,6 +474,7 @@ if ( textmode ) { cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/w3m") == 0 ? true:false; + // screen is no longer needed as there is UI::RunInTerminal for textmode programs now (#367719) bcmd = " w3m "; } else @@ -858,7 +871,11 @@ } } - // Register::finish mandatory as well - do not remove + // always return a proper return value + if (! contains([`next, `abort, `back], (symbol)ret )) + { ret = `next; } + + // Register::finish mandatory as well - do not remove (#366687) Register::finish(); return (symbol)ret; Modified: trunk/registration/src/config/registration.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/registration.rnc?rev=47044&r1=47043&r2=47044&view=diff ============================================================================== --- trunk/registration/src/config/registration.rnc (original) +++ trunk/registration/src/config/registration.rnc Thu Apr 24 18:33:57 2008 @@ -2,13 +2,13 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" -suse_register = element suse_register { do_registration? & submit_hwdata? & submit_optional? & registration_data? & register_regularly? & smt_server? & smt_server_cert? } +suse_register = element suse_register { do_registration? & submit_hwdata? & submit_optional? & registration_data? & register_regularly? & reg_server? & reg_server_cert? } do_registration = element do_registration { BOOLEAN } submit_hwdata = element submit_hwdata { BOOLEAN } submit_optional = element submit_optional { BOOLEAN } register_regularly = element register_regularly { BOOLEAN } -smt_server = element smt_server { text } -smt_server_cert = element smt_server_cert { text } +reg_server = element reg_server { text } +reg_server_cert = element reg_server_cert { text } registration_data = Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Register.ycp?rev=47044&r1=47043&r2=47044&view=diff ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Thu Apr 24 18:33:57 2008 @@ -23,7 +23,6 @@ import "Linuxrc"; import "ProductFeatures"; import "SourceManager"; -import "RegisterCert"; // -------------------------------------------------------------- @@ -243,6 +242,9 @@ ay = true; } + string smtpemPath = "/etc/ssl/certs"; + string smtpemFile = smtpemPath + "/registration-server.pem"; + // check if smt_server is a valid url map smt_server_parsed = URL::Parse(smt_server); if (smt_server_parsed == $[] || smt_server_parsed["host"]:"" == "" || smt_server_parsed["scheme"]:"" != "https" ) @@ -290,6 +292,15 @@ string certTmpFile = sformat("%1/__tmpSMTcert.crt", SCR::Read(.target.tmpdir)); + // check for existing certificate (bnc#376000) + integer certExists = nil; + certExists = (integer) SCR::Execute(.target.bash, sformat("[ -f %1 ]", smtpemFile)); + if (certmode != `url && certExists == 0) + { + // do nothing to refetch the certificate if manual interaction is necessary + y2milestone("Existing SMT certificate found and keeping it. To renew the SMT certificate please assign a URL as value to the key 'regcert' in /var/lib/YaST2/install.inf"); + return `ok; + } if ( certmode == `url ) { @@ -310,8 +321,15 @@ // download cert string curlcmd = sformat("curl -f --connect-timeout 60 --max-time 120 '%1' -o %2", smt_server_cert, certTmpFile); - if ( SCR::Execute (.target.bash, curlcmd) != 0) + if ( SCR::Execute(.target.bash, curlcmd) != 0) { + if (certExists == 0) + { + // do nothing to refetch the certificate if manual interaction is necessary + y2milestone("Could not download the current SMT certificate but existing certificate found and keeping it. To renew the SMT certificate please make sure it is available on the registration server."); + return `ok; + } + y2error("Could not download the SMT certificate file from specified URL %1", smt_server_cert); if (ay) return `conferror; @@ -359,7 +377,7 @@ { string fdpath = regexpsub( smt_server_cert , "^floppy/(.+)$","\\1"); string cp2tmp = sformat("/bin/cp -a %1 %2 ", mf["mpoint"]:"/media/floppy" + "/" + fdpath, certTmpFile ); - if ( SCR::Execute (.target.bash, cp2tmp) != 0) + if ( SCR::Execute(.target.bash, cp2tmp) != 0) { y2error("Could not copy the specified SMT certificate file from floppy disk."); if (ay) return `silentskip; @@ -484,68 +502,45 @@ - // in autoYaST mode we automatically trust - we are done here - if ( trust || ay ) { return `ok; } + // in autoYaST mode we automatically trust + if ( !ay ) // (bnc#377929) + { + // ask user if he trusts the certificate - // ask user if he trusts the certificate - map cP = RegisterCert::parseCertificate(certTmpFile); - y2milestone("SMT certificate file information: %1", cP); - - string trustQuestion = _("Do you want to trust this certificate?"); - string trustMessage = _("This certificate will be used to connect to the SMT server.\nYou have to trust this certificate in order to continue with the Registration."); - - string certInfo = ""; - list issueList = (list) cP["ISSUER"]:[]; - //translators: this is certificate context - certInfo = certInfo + _("<p><b>Issued For:</b></p>"); - if (size (issueList) > 0) - { - certInfo = certInfo + "<pre>"; - foreach (map keyval, (list >) issueList, { - foreach (string key, string val, (map) keyval, { - certInfo = certInfo + sformat("\n%1: %2", key, val); - }); - }); - certInfo = certInfo + "</pre>"; - } + // compare with existing certificate (bnc#376000) + if (certExists == 0) + { + // we can only test if the files match - no parsing possible + if ( ((integer)SCR::Execute(.target.bash, sformat("diff %1 %2", certTmpFile, smtpemFile)) == 0 )) + { + // return `ok if fingerprints match - no need to ask again + y2milestone("Current SMT certificate is up to date and will be kept."); + return `ok; + } + } - //translators: this is certificate context - certInfo = certInfo + _("<p><b>Subject:</b></p>"); - list subjectList=(list) cP["SUBJECT"]:[]; - if (size (subjectList) > 0) - { - certInfo = certInfo + "<pre>"; - foreach (map keyval, (list >) subjectList, { - foreach (string key, string val, (map)keyval, { - certInfo = certInfo + sformat("\n%1: %2", key, val); - }); - }); - certInfo = certInfo + "</pre>"; + string trustQuestion = _("Do you want to trust this certificate?"); + string trustMessage = _("This certificate will be used to connect to the SMT server.\nYou have to trust this certificate in order to continue with the Registration."); + + string certInfo = ""; + certInfo = (string) SCR::Read(.target.string, certTmpFile ); + + UI::OpenDialog( `MinSize(70, 20, `VBox( + `Left( `Label(`opt(`boldFont), trustQuestion)), + `Left( `Label(trustMessage)), + `RichText(sformat("%1",certInfo)), + `HBox(`PushButton(`id(`trust), _("Trust")), `HSpacing(1.5), `PushButton(`id(`notrust), _("Reject")) ) + ))); + any uret = UI::UserInput(); + UI::CloseDialog(); + if ((symbol)uret == `trust) { trust = true; } } - //translators: this is certificate context - certInfo = certInfo + _("<p><b>Validity:</b></p>"); - certInfo = certInfo + "<pre>"; - //translators: this is certificate context - certInfo = certInfo + "\n" + _("Valid from: ") + " " + cP["STARTDATE"]:""; - //translators: this is certificate context - certInfo = certInfo + "\n" + _("Valid to: ") + " " + cP["ENDDATE"]:""; - //translators: this is certificate context - certInfo = certInfo + "\n" + _("Fingerprint: ") + " " + cP["FINGERPRINT"]:""; - certInfo = certInfo + "</pre>"; - - UI::OpenDialog( `MinSize(70, 20, `VBox( - `Left( `Label(`opt(`boldFont), trustQuestion)), - `Left( `Label(trustMessage)), - `RichText(sformat("%1",certInfo)), - `HBox(`PushButton(`id(`trust), _("Trust")), `HSpacing(1.5), `PushButton(`id(`notrust), _("Reject")) ) - ))); - any uret = UI::UserInput(); - UI::CloseDialog(); - if ((symbol)uret == `trust) + // (bnc#377929) + if ( trust ) { - string installCert = sformat("cp -a %1 /etc/ssl/certs/smt.pem && c_rehash /etc/ssl/certs", certTmpFile); - string installCertZMD = sformat("[ -d /etc/zmd/trusted-certs ] && cp -a %1 /etc/zmd/trusted-certs/smt.cer", certTmpFile); + string installCert = sformat("cp -a %1 %2 && c_rehash %3", certTmpFile, smtpemFile, smtpemPath); + string installCertZMD = sformat("[ -d /etc/zmd/trusted-certs ] && cp -a %1 /etc/zmd/trusted-certs/registration-server.cer", certTmpFile); integer instret = (integer) SCR::Execute(.target.bash, installCert); integer instretZMD = (integer) SCR::Execute(.target.bash, installCertZMD); @@ -568,6 +563,7 @@ } else { + y2milestone("User decided not to trust the SMT registration server certificate. Registration will be skipped."); return `notrust; } @@ -592,18 +588,22 @@ */ global symbol configureRegistrationServer() { - smt_server = Linuxrc::InstallInf("smturl"); - smt_server_cert = Linuxrc::InstallInf("smtcert"); - - y2milestone("SMT config - smturl: %1", smt_server); - y2milestone("SMT config - smtcert: %1", smt_server_cert); + // boot parameters have a generic naming (regurl) - internally keeping smt for variable names + smt_server = Linuxrc::InstallInf("regurl"); + smt_server_cert = Linuxrc::InstallInf("regcert"); + + y2milestone("SMT config - regurl: %1", smt_server); + y2milestone("SMT config - regcert: %1", smt_server_cert); + +/* regurl=https:/smt.mybigcompany.com/center/regsvc/ + regcert=ask open FileDialog + regcert=done Cert already insalled - do nothing + regcert=http:/certpool.mybigcompany.com/smt/smt.crt download from there + regcert=floppy/path/to/file.crt + regcert=/path/to/local/file.crt copy from there -/* smturl=https:/smt.mybigcompany.com/center/regsvc/ - smtcert=ask open FileDialog - smtcert=done Cert already insalled - do nothing - smtcert=http:/certpool.mybigcompany.com/smt/smt-ca.crt download from there - smtcert=floppy/path/to/file.crt - smtcert=/path/to/local/file.crt copy from there + the old parameters 'smturl' and 'smtcert' are supported as well + but their values will be written to 'regurl' and 'regcert' */ // setup the smt_server settings @@ -664,6 +664,8 @@ SCR::Write(.sysconfig.suse_register.SUBMIT_HWDATA, sformat("%1", submit_hwdata ? true:false )); SCR::Execute(.target.bash, sformat("%1 /var/lib/suseRegister/neverRegisterOnBoot", register_regularly ? "rm -f ":"touch " )); + // touch a flag file for opensuseupdater + SCR::Execute(.target.bash, sformat("touch /var/lib/YaST2/registrationDidRun")); } // ------------------------------------------------------------------ @@ -867,8 +869,8 @@ do_registration = (boolean) settings["do_registration"]:do_registration; register_regularly = (boolean) settings["register_regularly"]:register_regularly; registration_data = (map) settings["registration_data"]:$[]; - smt_server = (string) settings["smt_server"]:""; - smt_server_cert = (string) settings["smt_server_cert"]:""; + smt_server = (string) settings["reg_server"]:""; + smt_server_cert = (string) settings["reg_server_cert"]:""; return true; } @@ -900,8 +902,8 @@ "submit_hwdata":submit_hwdata, "do_registration":do_registration, "register_regularly":register_regularly, - "smt_server":smt_server, - "smt_server_cert":smt_server_cert, + "reg_server":smt_server, + "reg_server_cert":smt_server_cert, "registration_data":registration_data ]; } Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.spec.in?rev=47044&r1=47043&r2=47044&view=diff ============================================================================== --- trunk/registration/yast2-registration.spec.in (original) +++ trunk/registration/yast2-registration.spec.in Thu Apr 24 18:33:57 2008 @@ -3,7 +3,6 @@ @HEADER@ Requires: yast2 >= 2.16.6 Requires: suseRegister -Requires: perl-TimeDate limal limal-perl limal-ca-mgm-perl # because of SourceManager Requires: yast2-packager >= 2.13.152 @@ -14,7 +13,6 @@ PreReq: %fillup_prereq BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager -BuildRequires: perl-TimeDate limal limal-perl limal-ca-mgm-perl # Internet YCP module BuildRequires: yast2 >= 2.16.6 @@ -59,6 +57,8 @@ @desktopdir@/*.desktop @schemadir@/autoyast/rnc/registration.rnc /usr/share/YaST2/yastbrowser +%dir /usr/share/YaST2/control +/usr/share/YaST2/control/*.xml # agents @scrconfdir@/cfg_suse_register.scr -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org