Added setup security check

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6141 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/setup/class_setupStep_Welcome.inc b/setup/class_setupStep_Welcome.inc
index 7549aaae320252a6444b11f41e17a33b2880c5f1..1546419586afd0e65e59329f09d68d3ab2e65e79 100644 (file)
--- a/setup/class_setupStep_Welcome.inc
+++ b/setup/class_setupStep_Welcome.inc
@@ -42,8 +42,21 @@ class Step_Welcome  extends setup_step
   
   function execute()
   {
-    $this->is_completed = true;
+    /* Get auth ID from file */
+    if (file_exists('/tmp/gosa.auth') && is_readable('/tmp/gosa.auth')){
+      $contents= file('/tmp/gosa.auth');
+      $id= chop($contents[0]);
+    }
+
+    /* Continue if we've the correct ID */
+    if ($id == session_id()){
+      $this->is_completed = true;
+    } else {
+      $this->is_completed = false;
+    }
+
     $smarty = get_smarty();
+    $smarty->assign('auth_id', session_id());
     return($smarty->fetch(get_template_path("setup_welcome.tpl",TRUE,dirname(__FILE__))));
   }
 

diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index 36c66ebef67258e76579bcc2bdaca907498ef14b..9121a411451046d226bc7824b7e0f3ccc6f6e91c 100644 (file)
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -1,5 +1,21 @@
 <div>
     <div class='default'>
-        <p><b>{t}This one is empty, currently.{/t}</b></p>
+        <p><b>{t}Tasks{/t}</b></p>
+
+       * Look for ACL's. If none is there, choose one user to be the super administrator
+       <br>
+       * Look for organizationalUnits and let add GOsa departments for selected ones
+       <br>
+       * Look for person / organizationalPerson and add GOsa account
+       <br>
+       * Allow to move selected users to people ou's - take care for groupOfNames
+       <br>
+       * Allow to move selected groups to group ou's - take care for groupOfNames
+       <br>
+       * Allow to move selected winstations to winstation ou's - take care for groupOfNames
+       <br>
+       * Check for double uidNumbers/gidNumbers
+       <br>
+       * Check for mail accounts and add gosaMailAccount - optionally create these accounts on the IMAP server
     </div>
 </div>

diff --git a/setup/setup_welcome.tpl b/setup/setup_welcome.tpl
index 44a51bec7461af989b6310e1a2ed21f3a7e03586..e73841b6d59c395fb9797763c15a860a6c1ec716 100644 (file)
--- a/setup/setup_welcome.tpl
+++ b/setup/setup_welcome.tpl
@@ -1,11 +1,39 @@
 <div>
     <div class='default'>
-        <p><b>{t}Starting to configure GOsa to your needs{/t}</b></p>
        <p>
        {t}This seems to be the first time you start GOsa - we didn't find any configuration right now. This simple wizard intends to help you while setting it up.{/t}
        </p>
        <p>
-       {t}There needs to be more information here...{/t}
+       
+       <p style='border-top:1px solid #AAAAAA; padding-top:10px;'>
+       <b>{t}What will the wizard do for you?{/t}</b>
+       </p>
+       <ul>
+        <li>{t}Create a basic, single site configuration{/t}</li>
+        <li>{t}Tries to find problems within your PHP and LDAP setup{/t}</li>
+        <li>{t}Let you choose from a set of basic and advanced configuration switches{/t}</li>
+        <li>{t}Guided migration of existing LDAP trees{/t}</li>
+       </ul>
+       <p>
+       <b>{t}What will the wizard NOT do for you?{/t}</b>
+       </p>
+       <ul>
+        <li>{t}Find every possible configuration error{/t}</li>
+        <li>{t}Migrate every possible LDAP setup - create backup dumps!{/t}</li>
+       </ul>
+
+       </p>
+       <p style='border-top:1px solid #AAAAAA; padding-top:10px;'>
+       <b>{t}To continue...{/t}</b>
+       </p>
+       <p>
+       {t}For security reasons you need to authenticate for the installation by creating the file '/tmp/gosa.aut', containing the current session ID on the servers local filesystem. This can be done by executing the following command:{/t}
+       </p>
+       <tt>
+       # echo -n <b>{$auth_id}</b> &gt; /tmp/gosa.auth
+       </tt>
+       <p>
+       {t}Click the 'Continue' button when you've finished.{/t}
        </p>
      </div>
 </div>