Purge data of deleted users and domains

qroac · qroac · commit 95fa12f80e2e · 2018-03-10T00:03:21.000+01:00
diff --git a/install/apps/xmpp_libs/auth_prosody/prosody-purge b/install/apps/xmpp_libs/auth_prosody/prosody-purge
@@ -0,0 +1,62 @@
+#!/usr/bin/php
+<?php
+
+define('DEBUG', true);
+usage(count($argv) < 3 || count($argv) > 4);
+
+$operation = $argv[1];
+$host = $argv[2];
+
+$configFile = file_get_contents('/etc/prosody/storage.cfg.lua');
+preg_match_all('/(host|database|port|username|password) *= *"?([^"\n]*)"?;/', $configFile, $matches);
+$config = array();
+foreach($matches[1] AS $ix => $key) {
+	$config[$key] = $matches[2][$ix];
+}
+
+try {
+	// Connect to database
+	$db = new mysqli($config['host'], $config['username'], $config['password'], $config['database']);
+	
+	switch($operation){
+	case 'user':
+		usage(count($argv) != 4);
+		$user = $argv[3];
+		do_query($db->prepare("DELETE FROM prosody WHERE user = ? AND host = ?"), $host, $user);
+		do_query($db->prepare("DELETE FROM prosodyarchive WHERE user = ? AND host = ?"), $host, $user);
+		break;
+	case 'domain':
+		do_query($db->prepare("DELETE FROM prosody WHERE host = ?"), $host);
+		do_query($db->prepare("DELETE FROM prosodyarchive WHERE host = ?"), $host);
+		do_query($db->prepare("DELETE FROM prosody WHERE host LIKE ?"), "%.$host");
+		do_query($db->prepare("DELETE FROM prosodyarchive WHERE host LIKE ?"), "%.$host");
+		break;
+	}
+	$db->close();
+} catch (Exception $ex) {
+	var_dump($ex);
+}
+
+
+function do_query($query, $host, $user = false){
+	if($user !== false)
+		$query->bind_param('ss', $user, $host);
+	else
+		$query->bind_param('s', $host);
+	$query->execute();
+	$entries = $query->affected_rows;
+	$query->close();
+	if(DEBUG) echo "$entries deleted!\n";
+	return $entries;
+}	
+
+function result_false($cond = true) {
+	if(!$cond) return;
+	exit(1);
+}
+
+function usage($cond = false){
+	if(!$cond) return;
+	echo "USAGE: \n prosody-purge domain my.domain.com \n prosody-purge user my.domain.com username \n";
+	result_false();
+}
diff --git a/install/dist/conf/debian60.conf.php b/install/dist/conf/debian60.conf.php
@@ -237,7 +237,7 @@
 $conf['prosody']['storage_database'] = 'prosody';
 $conf['prosody']['storage_user'] = 'prosody';
 $conf['prosody']['storage_password'] = md5(uniqid(rand()));
-$conf['prosody']['initial_modules'] = 'roster, saslauth, tls, dialback, disco, carbons, pep, private, blocklist, compression, vard, version, uptime, time, ping, admin_adhoc, mam, bosh, websocket, http_files, announce, proxy65, offline, posix, websocket, webpresence, smacks, csi_battery_saver, pep_vcard_avatar, omemo_all_access';
+$conf['prosody']['initial_modules'] = 'roster, saslauth, tls, dialback, disco, carbons, pep, private, blocklist, vcard, version, uptime, time, ping, admin_adhoc, mam, bosh, websocket, http_files, announce, proxy65, offline, posix, websocket, webpresence, smacks, csi_battery_saver, pep_vcard_avatar, omemo_all_access';
 
 
 ?>
diff --git a/install/dist/conf/debian90.conf.php b/install/dist/conf/debian90.conf.php
@@ -237,6 +237,6 @@
 $conf['prosody']['storage_database'] = 'prosody';
 $conf['prosody']['storage_user'] = 'prosody';
 $conf['prosody']['storage_password'] = md5(uniqid(rand()));
-$conf['prosody']['initial_modules'] = 'roster, saslauth, tls, dialback, disco, carbons, pep, private, blocklist, compression, vcard, version, uptime, time, ping, admin_adhoc, mam, bosh, websocket, http_files, announce, proxy65, offline, posix, websocket, webpresence, smacks, csi_battery_saver, pep_vcard_avatar, omemo_all_access';
+$conf['prosody']['initial_modules'] = 'roster, saslauth, tls, dialback, disco, carbons, pep, private, blocklist, vcard, version, uptime, time, ping, admin_adhoc, mam, bosh, websocket, http_files, announce, proxy65, offline, posix, websocket, webpresence, smacks, csi_battery_saver, pep_vcard_avatar, omemo_all_access';
 
 ?>
diff --git a/install/dist/conf/debiantesting.conf.php b/install/dist/conf/debiantesting.conf.php
@@ -237,7 +237,7 @@
 $conf['prosody']['storage_database'] = 'prosody';
 $conf['prosody']['storage_user'] = 'prosody';
 $conf['prosody']['storage_password'] = md5(uniqid(rand()));
-$conf['prosody']['initial_modules'] = 'roster, saslauth, tls, dialback, disco, carbons, pep, private, blocklist, compression, vard, version, uptime, time, ping, admin_adhoc, mam, bosh, websocket, http_files, announce, proxy65, offline, posix, websocket, webpresence, smacks, csi_battery_saver, pep_vcard_avatar, omemo_all_access';
+$conf['prosody']['initial_modules'] = 'roster, saslauth, tls, dialback, disco, carbons, pep, private, blocklist, vcard, version, uptime, time, ping, admin_adhoc, mam, bosh, websocket, http_files, announce, proxy65, offline, posix, websocket, webpresence, smacks, csi_battery_saver, pep_vcard_avatar, omemo_all_access';
 
 
 ?>
diff --git a/install/dist/conf/ubuntu1604.conf.php b/install/dist/conf/ubuntu1604.conf.php
@@ -237,7 +237,7 @@
 $conf['prosody']['storage_database'] = 'prosody';
 $conf['prosody']['storage_user'] = 'prosody';
 $conf['prosody']['storage_password'] = md5(uniqid(rand()));
-$conf['prosody']['initial_modules'] = 'roster, saslauth, tls, dialback, disco, carbons, pep, private, blocklist, compression, vard, version, uptime, time, ping, admin_adhoc, mam, bosh, websocket, http_files, announce, proxy65, offline, posix, websocket, webpresence, smacks, csi_battery_saver, pep_vcard_avatar, omemo_all_access';
+$conf['prosody']['initial_modules'] = 'roster, saslauth, tls, dialback, disco, carbons, pep, private, blocklist, vcard, version, uptime, time, ping, admin_adhoc, mam, bosh, websocket, http_files, announce, proxy65, offline, posix, websocket, webpresence, smacks, csi_battery_saver, pep_vcard_avatar, omemo_all_access';
 
 
 ?>
diff --git a/install/dist/conf/ubuntu1710.conf.php b/install/dist/conf/ubuntu1710.conf.php
@@ -233,7 +233,7 @@
 $conf['prosody']['storage_database'] = 'prosody';
 $conf['prosody']['storage_user'] = 'prosody';
 $conf['prosody']['storage_password'] = md5(uniqid(rand()));
-$conf['prosody']['initial_modules'] = 'roster, saslauth, tls, dialback, disco, carbons, pep, private, blocklist, compression, vard, version, uptime, time, ping, admin_adhoc, mam, bosh, websocket, http_files, announce, proxy65, offline, posix, websocket, webpresence, smacks, csi_battery_saver, pep_vcard_avatar, omemo_all_access';
+$conf['prosody']['initial_modules'] = 'roster, saslauth, tls, dialback, disco, carbons, pep, private, blocklist, vcard, version, uptime, time, ping, admin_adhoc, mam, bosh, websocket, http_files, announce, proxy65, offline, posix, websocket, webpresence, smacks, csi_battery_saver, pep_vcard_avatar, omemo_all_access';
 
 
 ?>
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1863,7 +1863,9 @@ public function configure_prosody($options = '') {
         // Copy isp libs
         if(!@is_dir('/usr/local/lib/prosody/auth')) mkdir('/usr/local/lib/prosody/auth', 0755, true);
         caselog('cp -rf apps/xmpp_libs/auth_prosody/* /usr/local/lib/prosody/auth/', __FILE__, __LINE__);
-                caselog('chmod 755 /usr/local/lib/prosody/auth/authenticate_isp.sh', __FILE__, __LINE__);
+		caselog('chmod 755 /usr/local/lib/prosody/auth/authenticate_isp.sh', __FILE__, __LINE__);
+		caselog('chown root:ispconfig /usr/local/lib/prosody/auth/prosody-purge', __FILE__, __LINE__);
+		caselog('chmod 750 /usr/local/lib/prosody/auth/prosody-purge', __FILE__, __LINE__);
 
         // Process db config
         $full_file_name = '/usr/local/lib/prosody/auth/db_conf.inc.php';
diff --git a/install/tpl/xmpp_prosody_conf_global.master b/install/tpl/xmpp_prosody_conf_global.master
@@ -34,7 +34,6 @@ modules_enabled = {
         "pep",
         "private",
         "blocklist",
-        "compression",
         "vcard",
         "version",
         "uptime",
diff --git a/interface/web/mail/templates/xmpp_user_list.htm b/interface/web/mail/templates/xmpp_user_list.htm
@@ -50,8 +50,10 @@ <h1><tmpl_var name="list_head_txt"></h1>
                 <tmpl_loop name="records">
                     <tr>
                         <td><a href="#" data-load-content="mail/xmpp_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="jid"}</a></td>
+                <tmpl_if name="temporary removed, not used at the moment">
                         <td><a href="#" data-load-content="mail/xmpp_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="is_domain_admin"}</a></td>
                         <td><a href="#" data-load-content="mail/xmpp_user_edit.php?id={tmpl_var name='id'}">{tmpl_var name="is_muc_admin"}</a></td>
+                </tmpl_if>
                         <td class="text-right">
                             <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('mail/xmpp_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></button>
                         </td>
diff --git a/server/mods-available/xmpp_module.inc.php b/server/mods-available/xmpp_module.inc.php
@@ -79,6 +79,7 @@ class that contains the function functionname.
         */
 
         $app->modules->registerTableHook('xmpp_domain', 'xmpp_module', 'process');
+        $app->modules->registerTableHook('xmpp_user', 'xmpp_module', 'process');
         $app->services->registerService('xmpp', 'xmpp_module', 'reloadXMPP');
         $app->services->registerService('xmpp', 'xmpp_module', 'restartXMPP');
 
diff --git a/server/plugins-available/xmpp_plugin.inc.php b/server/plugins-available/xmpp_plugin.inc.php
@@ -134,6 +134,8 @@ function domainInsert($event_name, $data) {
         global $app, $conf;
 
         $this->domainUpdate($event_name, $data);
+        // Need to restart the server
+        $app->services->restartServiceDelayed('xmpp', 'restart');
 
     }
 
@@ -260,7 +262,6 @@ function domainDelete($event_name, $data){
         // get the config
         $app->uses("system");
         $domain = $data['old']['domain'];
-        $folder = str_replace('-', '%2d', str_replace('.', '%2e', $str = urlencode($domain)));
 
         // Remove config files
         $app->system->unlink("/etc/{$this->daemon}/hosts/$domain.cfg.lua");
@@ -272,12 +273,19 @@ function domainDelete($event_name, $data){
         $app->system->unlink("/etc/{$this->daemon}/certs/$domain.key");
         $app->system->unlink("/etc/{$this->daemon}/certs/$domain.csr");
         // Remove all stored data
-        if($this->daemon === 'metronome') {
-            exec('rm -rf /var/lib/metronome/'.$folder);
-            exec('rm -rf /var/lib/metronome/*%2e'.$folder);
+        $folder = str_replace('-', '%2d', str_replace('.', '%2e', $str = urlencode($domain)));
+
+        exec("rm -rf /var/lib/{$this->daemon}/{$folder}");
+        exec("rm -rf /var/lib/{$this->daemon}/*%2e{$folder}");
+        switch($this->daemon) {
+            case 'metronome':
+                break;
+            case 'prosody':
+                exec("php /usr/local/lib/prosody/auth/prosody-purge domain {$domain}");
+                break;
         }
 
-        $app->services->restartServiceDelayed('xmpp', 'reload');
+        $app->services->restartServiceDelayed('xmpp', 'restart');
     }
 
     function userInsert($event_name, $data){
@@ -297,8 +305,17 @@ function userDelete($event_name, $data){
         // Check domain for auth settings
         // Don't allow manual user deletion for mailaccount controlled domains
 
-        // Remove account from metronome
-        exec("{$this->daemon}ctl deluser {$data['old']['jid']}");
+        $jid_parts = explode('@', $data['old']['jid']);
+
+        switch($this->daemon) {
+            case 'metronome':
+                // Remove account from metronome
+                exec("{$this->daemon}ctl deluser {$data['old']['jid']}");
+                break;
+            case 'prosody':
+                exec("php /usr/local/lib/prosody/auth/prosody-purge user {$jid_parts[1]} {$jid_parts[0]}");
+                break;
+        }
     }
 
     // Handle the creation of SSL certificates
