Mailinglist Archive: yast-commit (459 mails)

[openvasfelix@xxxxxxxxxxxxxxxx]

Author: openvasfelix
Date: Fri Feb 12 13:01:14 2010
New Revision: 60809

URL: http://svn.opensuse.org/viewcvs/yast?rev=60809&view=rev
Log:
* src/OpenvasSecurityScanner.ycp: Adressed warning about format.
* src/dialogs.ycp: Wording, do some basic input validation.
* src/helps.ycp: Wording, mentioned input validation.

Modified:
    
branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/OpenvasSecurityScanner.ycp
    branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/dialogs.ycp
    branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/helps.ycp

Modified: 
branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/OpenvasSecurityScanner.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/OpenvasSecurityScanner.ycp?rev=60809&r1=60808&r2=60809&view=diff
==============================================================================
--- 
branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/OpenvasSecurityScanner.ycp
 (original)
+++ 
branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/OpenvasSecurityScanner.ycp
 Fri Feb 12 13:01:14 2010
@@ -524,8 +524,7 @@
     /* Copy access key and set permissions */
     if (PollAbort ()) return false;
     Progress::NextStage ();
-    y2milestone (" --> cp " + gsf_location + "/gsf-access-key"
-                            + " /etc/openvas/gsf-access-key <--");
+    y2milestone (" --> cp %1 /gsf-access-key /etc/openvas/gsf-access-key <--", 
(string) gsf_location);
     SCR::Execute (.target.bash, "cp " + gsf_location + "/gsf-access-key"
                                 + " /etc/openvas/gsf-access-key");
     SCR::Execute (.target.bash, "chmod 400 /etc/openvas/gsf-access-key");

Modified: 
branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/dialogs.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/dialogs.ycp?rev=60809&r1=60808&r2=60809&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/dialogs.ycp 
(original)
+++ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/dialogs.ycp 
Fri Feb 12 13:01:14 2010
@@ -288,7 +288,7 @@
  */
 any AddUserDialog () {
     string caption = _("Add User to OpenVAS Security Scanner");
-    string message = _("In order for the OpenVAS Security Scanner to work, a 
user has to be installed.");
+    string message = _("In order for the OpenVAS Security Scanner to work,\na 
openvas login has to be registered.\n");
 
     term contents = `VBox (`Label(message),
                            `InputField(`id(`user_login), _("&Login of the 
user"), ""));
@@ -302,7 +302,6 @@
 
     any ret = nil;
 
-    /** @todo Nicer wording when displaying text what happens (no user ... has 
to be created ... ). */
     while (true) {
         ret = UI::UserInput ();
         if (ret == `abort)
@@ -314,9 +313,16 @@
           any login = UI::QueryWidget(`id(`user_login), `Value);
           any pw1 = UI::QueryWidget(`id(`user_pass), `Value);
           any pw2 = UI::QueryWidget(`id(`user_pass_again), `Value);
+           // Do some input checks
            if (login == nil || login == "")
              {
-               Popup::Message(_("User name must not be empty."));
+               Popup::Message(_("Login name must not be empty."));
+               continue;
+             }
+           else if (issubstring (login, " ") || issubstring (pw1, " ") || 
issubsting (pw2, " ")
+                    || issubsting (login, ".."))
+             {
+               Popup::Message (_("Login name and password must not contain 
space character or double dots."));
                continue;
              }
            if (pw1 == pw2)

Modified: 
branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/helps.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/helps.ycp?rev=60809&r1=60808&r2=60809&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/helps.ycp 
(original)
+++ branches/SuSE-Code-11-SP1-Branch/openvas-security-scanner/src/helps.ycp Fri 
Feb 12 13:01:14 2010
@@ -131,8 +131,8 @@
                      + "</p></p>",
 
   "adduser" : _("<p><b><big>Add User to OpenVAS Security Scanner</big></b></br>
-<p>A working installation of the OpenVAS Security Scanner has at least one 
user installed.
-Note that this user is specific to OpenVAS.</p>
+<p>A working installation of the OpenVAS Security Scanner has at least one 
openvas login registered.
+This needs to be done just once. The login and password might not contain 
spaces or double dots (..).</p>
 <p><b>Login of the user</b>: Type the user login name here.</p>
 <p><b>Password for user</b>: Type the password for the user here.</p>
 <p><b>Password for user (again)</b>: Type the password for the user here, 
again.</p>

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx