A small workstation security update

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

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index ea542f1448687f50cd043afc0d6d023b1a4c3ae2..64ba6e3b0f0861dd9974a2b97e78ff7b86e69f9e 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -245,6 +245,10 @@ class workgeneric extends plugin
     $query= "fping -q -r 1 -t 500 ".$this->cn;
     exec ($query, $dummy, $retval);
 
+    foreach($this->attributes as $attrs ){
+      $smarty->assign($attrs."ACL",chkacl($this->acl,$attrs));
+    }
+
     /* Offline */
     if ($retval == 0){
       $smarty->assign("actions", array("halt" => _("Switch off"), "reboot" => _("Reboot"),
@@ -318,14 +322,13 @@ class workgeneric extends plugin
     $this->netConfigDNS->save_object();
 
     /* Set inherit mode */
-    if(isset($_POST['workgeneric_posted'])){
+    if(isset($_POST['workgeneric_posted']) && chkacl($this->acl,"gotoNtpServer") == ""){
       if(isset($_POST["inheritTimeServer"])){
         $this->inheritTimeServer = true;
       }else{
         $this->inheritTimeServer = false;
       }
     }
-
   }
 
 

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 5d020a17d81bf907cebd9474239f7bce6aab7c57..cd517e53a361dc84ecb0490866e10895b625ebdc 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -693,6 +693,8 @@ class workstartup extends plugin
         $use = " checked ";
       };
 
+      $use .= chkacl($this->acl,"gotoLdapServer");
+
       $display = $server;
 
       $SelectBoxLdapServer->AddEntry(

diff --git a/plugins/admin/systems/workstation.tpl b/plugins/admin/systems/workstation.tpl
index 128da389cb138044f872bd56e210b2b2436043cd..7811521d7b8ef6bef67a829cb0a8830a7a33f2ec 100644 (file)
--- a/plugins/admin/systems/workstation.tpl
+++ b/plugins/admin/systems/workstation.tpl
@@ -9,14 +9,14 @@
      {else}
      <td><LABEL for="cn">{t}Workstation name{/t}</LABEL>{$must}</td>
      <td>
-      <input name="cn" id="cn" size=18 maxlength=60 value="{$cn}">
+      <input name="cn" id="cn" size=18 maxlength=60 value="{$cn}" {$cnACL}>
      </td>
      {/if}
     </tr>
     <tr>
      <td><LABEL for="cn">{t}Location{/t}</LABEL></td>
      <td>
-      <input name="l" id="l" size=18 maxlength=60 value="{$l}">
+      <input name="l" id="l" size=18 maxlength=60 value="{$l}" {$lACL}>
      </td>
     </tr>
     <tr>
@@ -56,7 +56,7 @@
    <table width="100%">
     <tr>
      <td colspan="2">
-        <input type="checkbox" value="1" name="inheritTimeServer"
+        <input type="checkbox" value="1" name="inheritTimeServer"  {$gotoNtpServerACL}
             {if $inheritTimeServer } checked {/if}
             onClick="javascript:
                     changeState('gotoNtpServerSelected');

diff --git a/plugins/admin/systems/workstationStartup.tpl b/plugins/admin/systems/workstationStartup.tpl
index fe647589f4db19f73e42f2acb65438c392c8b863..e68ed7577154cdfe1cff13ffa27a2ae1f5554e34 100644 (file)
--- a/plugins/admin/systems/workstationStartup.tpl
+++ b/plugins/admin/systems/workstationStartup.tpl
@@ -50,7 +50,7 @@
                        </tr>
                        <tr>
                                <td>
-                                       <select name="FAIdebianMirror"   onchange='document.mainform.submit()'>
+                                       <select name="FAIdebianMirror"   onchange='document.mainform.submit()' {$FAIdebianMirrorACL}>
                                                {html_options options=$FAIdebianMirrors output=$FAIdebianMirrors selected=$FAIdebianMirror}
                                        </select>
                                </td>
@@ -87,7 +87,7 @@
                                <!--<input type="submit" value="{t}set{/t}" name="refresh">-->
                                </td>
                                <td>
-                                       <select name="FAIrelease"  onchange='document.mainform.submit()'>
+                                       <select name="FAIrelease"  onchange='document.mainform.submit()' {$FAIclassACL}>
                                        {html_options options=$FAIreleases output=$FAIreleases selected=$FAIrelease}
                                        </select>
                                </td>
@@ -118,7 +118,8 @@
    <h2>
     <img class="center" alt="" align="middle" src="images/hardware.png"> {t}Kernel modules (format: name parameters){/t}
    </h2>
-    <select style="width:100%; height:150px;" name="modules_list[]" size=15 multiple title="{t}Add additional modules to load on startup{/t}">
+    <select style="width:100%; height:150px;" name="modules_list[]" size=15 multiple title="{t}Add additional modules to load on startup{/t}" 
+       {$gotoModulesACL}>
      {html_options values=$gotoModules output=$gotoModules}
         <option disabled>&nbsp;</option>
     </select>