feat(api): expose configuration settings

grant read access to Config itemtype
flyve-mdm · Dec 16, 2016 · e9cd70d · e9cd70d
1 parent 70091d7
commit e9cd70d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/inc/config.class.php b/inc/config.class.php
@@ -219,4 +219,11 @@ public function prepareInputForAdd($input) {
       return $input;
    }
 
+   public static function undiscloseConfigValue($fields) {
+      if ($fields['context'] == 'storkmdm'
+            && in_array($fields['name'], array('mqtt_passwd'))) {
+         unset($fields['value']);
+      }
+      return $fields;
+   }
 }
diff --git a/install/installer.class.php b/install/installer.class.php
@@ -298,6 +298,7 @@ protected function createRegisteredProfileAccess() {
                                                          | PluginStorkmdmEntityconfig::RIGHT_STORKMDM_APP_DOWNLOAD_URL
                                                          | PluginStorkmdmEntityconfig::RIGHT_STORKMDM_INVITATION_TOKEN_LIFE,
             PluginStorkmdmInvitationlog::$rightname   => READ,
+            Config::$rightname                        => READ,
             User::$rightname                          => ALLSTANDARDRIGHT,
             Profile::$rightname                       => CREATE,
             Entity::$rightname                        => CREATE,
@@ -561,7 +562,6 @@ public function uninstall() {
     * @param string $dir
     */
    protected function rrmdir($dir) {
-
       if (file_exists($dir) && is_dir($dir)) {
          $objects = scandir($dir);
          foreach ( $objects as $object ) {
@@ -575,7 +575,6 @@ protected function rrmdir($dir) {
          reset($objects);
          rmdir($dir);
       }
-
    }
 
    /**

diff --git a/setup.php b/setup.php
@@ -61,7 +61,8 @@
 function plugin_init_storkmdm() {
    global $PLUGIN_HOOKS, $CFG_GLPI;
 
-   $PLUGIN_HOOKS['csrf_compliant']["storkmdm"] = true;
+   $PLUGIN_HOOKS['csrf_compliant']['storkmdm'] = true;
+   $PLUGIN_HOOKS['undiscloseConfigValue']['storkmdm'] = array('PluginStorkmdmConfig', 'undiscloseConfigValue');
 
    $plugin = new Plugin();
 

diff --git a/tests/0010_Integration/RegisteredUserProfileIntegrationTest.php b/tests/0010_Integration/RegisteredUserProfileIntegrationTest.php
@@ -221,8 +221,7 @@ public function testRegisteredUserProfileNetworkPortRight($rights) {
     * @param array $rights
     */
    public function testRegisteredUserProfileConfigRight($rights) {
-      //disabled for now
-      //$this->assertEquals(READ, $rights[Config::$rightname]);
+      $this->assertEquals(READ, $rights[Config::$rightname]);
    }
 
 }