- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 server/plugins-available/mail_plugin_dkim.inc.php

@@ -75,9 +75,9 @@
    */
   function get_amavis_config() {
      $pos_config=array(
         '/etc/amavisd.conf',
         '/etc/amavisd.conf/50-user',
         '/etc/amavis/conf.d/50-user',
         '/etc/amavisd.conf',
         '/etc/amavisd/amavisd.conf'
      );
      $amavis_configfile='';
@@ -117,14 +117,14 @@
         $app->log('Amavis-config not found or not writeable.', LOGLEVEL_ERROR);
         $check=false;
      }

      /* dir for dkim-keys writeable? */
      $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
      if (   isset($mail_config['dkim_path']) && 
            !empty($mail_config['dkim_path']) && 
            isset($data['new']['dkim_private']) && 
            !empty($data['new']['dkim_private']) &&
            $mail_config['dkim_path'] != '/' &&
            $app->system->checkpath($mail_config['dkim_path'])
            $mail_config['dkim_path'] != '/' 
      ) {
            if (!is_dir($mail_config['dkim_path'])) {
                $app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
@@ -143,11 +143,21 @@
               mkdir($mail_config['dkim_path'], 0755, true);
               $app->log('No user amavis or vscan found - using root for '.$mail_config['dkim_path'], LOGLEVEL_WARNING);
            }
            }
            } else {
            if (!$app->system->checkpath($mail_config['dkim_path'])) {
               $app->log('Unable to write DKIM settings - invalid DKIM-Path (symlink?)', LOGLEVEL_ERROR);
               $check=false;
            }
         }

         if (!is_writeable($mail_config['dkim_path'])) {
            $app->log('DKIM Path '.$mail_config['dkim_path'].' not writeable.', LOGLEVEL_ERROR);
            $check=false;
         }

         if ( !$app->system->checkpath($mail_config['dkim_path']) ) {
            $app->log('DKIM Path '.$mail_config['dkim_path'].' failed in checkpath.', LOGLEVEL_ERROR);
            $check = false;
         }

      } else {
@@ -184,7 +194,7 @@
    * @param string $key_file full path to the key-file
    * @param string $key_value private-key
    * @param string $key_domain mail-domain
    * @return bool - true when the key is written to disk
    * @return bool - true when the private key was written to disk
    */
   function write_dkim_key($key_file, $key_value, $key_domain) {
      global $app, $mailconfig;
@@ -315,7 +325,7 @@
               $this->remove_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['domain']);
            }
         } else {
            $app->log('Error saving the DKIM Private-key for '.$data['new']['domain'].' - DKIM is not enabled for the domain.', LOGLEVEL_ERROR);
            $app->log('Error saving the DKIM Private-key for '.$data['new']['domain'].' - DKIM is not enabled for the domain.', LOGLEVEL_DEBUG);
         }
      }
   }
@@ -359,44 +369,46 @@
    */
   function domain_dkim_update($event_name, $data) {
      global $app;
      if ($this->check_system($data)) {
         /* maildomain disabled */
         if ($data['new']['active'] == 'n' && $data['old']['active'] == 'y' && $data['new']['dkim']=='y') {
            $app->log('Maildomain '.$data['new']['domain'].' disabled - remove DKIM-settings', LOGLEVEL_DEBUG);
            $this->remove_dkim($data['new']);
         }
         /* maildomain re-enabled */
         if ($data['new']['active'] == 'y' && $data['old']['active'] == 'n' && $data['new']['dkim']=='y') 
            $this->add_dkim($data);

         /* maildomain active - only dkim changes */
         if ($data['new']['active'] == 'y' && $data['old']['active'] == 'y') {
            /* dkim disabled */
            if ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'n') {
      if($data['new']['dkim'] == 'y' || $data['old']['dkim'] == 'y'){
         if ($this->check_system($data)) {
            /* maildomain disabled */
            if ($data['new']['active'] == 'n' && $data['old']['active'] == 'y' && $data['new']['dkim']=='y') {
               $app->log('Maildomain '.$data['new']['domain'].' disabled - remove DKIM-settings', LOGLEVEL_DEBUG);
               $this->remove_dkim($data['new']);
            }
            /* dkim enabled */
            elseif ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'y') {
            /* maildomain re-enabled */
            if ($data['new']['active'] == 'y' && $data['old']['active'] == 'n' && $data['new']['dkim']=='y') 
               $this->add_dkim($data);
            }
            /* new private-key */
            if ($data['new']['dkim_private'] != $data['old']['dkim_private'] && $data['new']['dkim'] == 'y') {
               $this->add_dkim($data);
            }
            /* new selector */
            if ($data['new']['dkim_selector'] != $data['old']['dkim_selector'] && $data['new']['dkim'] == 'y') {
               $this->add_dkim($data);
            }
            /* new domain-name */
            if ($data['new']['domain'] != $data['old']['domain']) {
               $this->remove_dkim($data['old']);
               $this->add_dkim($data);
            }
         }

         /* resync */
         if ($data['new']['active'] == 'y' && $data['new'] == $data['old']) {
            $this->add_dkim($data);
            /* maildomain active - only dkim changes */
            if ($data['new']['active'] == 'y' && $data['old']['active'] == 'y') {
               /* dkim disabled */
               if ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'n') {
                  $this->remove_dkim($data['new']);
               }
               /* dkim enabled */
               elseif ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'y') {
                  $this->add_dkim($data);
               }
               /* new private-key */
               if ($data['new']['dkim_private'] != $data['old']['dkim_private'] && $data['new']['dkim'] == 'y') {
                  $this->add_dkim($data);
               }
               /* new selector */
               if ($data['new']['dkim_selector'] != $data['old']['dkim_selector'] && $data['new']['dkim'] == 'y') {
                  $this->add_dkim($data);
               }
               /* new domain-name */
               if ($data['new']['domain'] != $data['old']['domain']) {
                  $this->remove_dkim($data['old']);
                  $this->add_dkim($data);
               }
            }

            /* resync */
            if ($data['new']['active'] == 'y' && $data['new'] == $data['old'] && $data['new']['dkim']=='y') {
               $this->add_dkim($data);
            }
         }
      }
   }