mailshears 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b1f58755e2a89e2b13f0f3d972e2042357e11569
-  data.tar.gz: c09388cc7659a1e2c06f05ddb1b15bbad31dc278
+SHA256:
+  metadata.gz: e00eaa9dfa4eba0f52b9ab26ad79bbf4bd1730260d81278488dc7710834a0ec7
+  data.tar.gz: 1b823e702d0abf5fd5b6b73ecbc166f0ea5c5a75adaa0851133b7b0df80b62e2
 SHA512:
-  metadata.gz: f189f7f051667c13eff013dae9529824f254ac70250dc8d3b0d5d4313d6c3c977ff289c8fa21f8a90565bd429c8b4fcc854047ab44d491f9c0232a347b05584a
-  data.tar.gz: 26586f35b0dbd61af8b76a5c1338aababe302064050ffeb76fd8c7a40d188922f9610a3fd5681972c12ffa0fa3038b3dea3fe8da1d564359c103a33a80751e3c
+  metadata.gz: 9b8a0ed3e568320d72bc6990e23c8f02619e9a642d322cf8ac9329a2cad8359d3af4e1a0d132a9610622ea6c544c03d5df781c6f62dc2f8f6b24dbe55dbee8e1
+  data.tar.gz: 148d00fea24eff0a94da79869cd7e71ee1f1d27d49c1bfe433951b6c578ecf22c41e6e6eeaa7d8f90f45ac44d69e70f37f6f60283048066098266109594af7f2

data/doc/TODO

@@ -20,3 +20,22 @@
   "prefs" table, but all of the shares (and principals?) have URLs
   instead of usernames. We don't parse the URLs, and instead rely
   on doing find/replace of substrings in e.g. AgendavMv.
+
+  In particular, this means that AgenDAV pruning does not work! If
+  a user with default preferences is deleted, we don't notice.
+
+* mailshears --help crashes before doing what it should just do:
+
+  $ mailshears --help
+  ERROR: prune mode takes no additional arguments.
+
+* The "pretend mode" output is missing the destination information:
+
+  # mailshears mv "test1@example.com" "test2@example.com"
+  mailshears, 2020-01-30 14:40:09 -0500 (Plugin: MvPlugin)
+  --------------------------------------------------------
+  AgendavMv - Would move user test1@example.com (User not found) to .
+  DavicalMv - Would move user test1@example.com (User not found) to .
+  DovecotMv - Would move user test1@example.com (/var/spool/mail/vhosts/example.com/test1) to .
+  PostfixadminMv - Would move user test1@example.com to .
+  RoundcubeMv - Would move user test1@example.com (User not found) to .

data/lib/common/agendav_plugin.rb

@@ -42,7 +42,7 @@ module AgendavPlugin
     sql_query  = 'SELECT username FROM prefs;'
 
     begin
-      connection.query(sql_query) do |result|
+      connection.sync_exec(sql_query) do |result|
         users = result.field_values('username')
       end
     ensure
@@ -65,7 +65,7 @@ module AgendavPlugin
 
     sql_query  = 'SELECT count(*) FROM shares;'
     begin
-      connection.query(sql_query) do |result|
+      connection.sync_exec(sql_query) do |result|
         count = result.getvalue(0,0).to_i()
       end
     ensure

data/lib/common/davical_plugin.rb

@@ -55,7 +55,7 @@ module DavicalPlugin
     sql_query = 'SELECT username FROM usr WHERE user_no > 1;'
 
     begin
-      connection.query(sql_query) do |result|
+      connection.sync_exec(sql_query) do |result|
         usernames = result.field_values('username')
       end
     ensure
@@ -88,7 +88,7 @@ module DavicalPlugin
     sql_query += 'WHERE usr.username = $1;'
 
     begin
-      connection.query(sql_query, [user.to_s()]) do |result|
+      connection.sync_exec_params(sql_query, [user.to_s()]) do |result|
         if result.num_tuples > 0
           principal_id = result[0]['principal_id']
         end

data/lib/common/postfixadmin_plugin.rb

@@ -43,7 +43,7 @@ module PostfixadminPlugin
     sql_query = "SELECT domain FROM domain WHERE domain <> 'ALL';"
 
     begin
-      connection.query(sql_query) do |result|
+      connection.sync_exec(sql_query) do |result|
         domains = result.field_values('domain')
       end
     ensure
@@ -68,7 +68,7 @@ module PostfixadminPlugin
     sql_query = 'SELECT username FROM mailbox;'
 
     begin
-      connection.query(sql_query) do |result|
+      connection.sync_exec(sql_query) do |result|
         users = result.field_values('username')
       end
     ensure
@@ -104,7 +104,7 @@ module PostfixadminPlugin
     begin
       # Now replace each Domain with its string representation and pass
       # those in as our individual parameters.
-      connection.query(sql_query, domains.map{ |d| d.to_s() }) do |result|
+      connection.sync_exec_params(sql_query, domains.map{ |d| d.to_s() }) do |result|
         usernames = result.field_values('username')
       end
     ensure
@@ -131,7 +131,7 @@ module PostfixadminPlugin
     sql_query = 'SELECT address,goto FROM alias;'
 
     begin
-      results = connection.query(sql_query)
+      results = connection.sync_exec(sql_query)
       results.each do |row|
         # row should be a hash
         aliases << row
@@ -163,7 +163,7 @@ module PostfixadminPlugin
     sql_query = 'SELECT COUNT(domain) as count FROM domain WHERE domain = $1;'
 
     begin
-      connection.query(sql_query, [domain.to_s()]) do |result|
+      connection.sync_exec_params(sql_query, [domain.to_s()]) do |result|
         return false if result.ntuples() < 1
         count = result.getvalue(0,0).to_i()
 

data/lib/common/roundcube_plugin.rb

@@ -47,12 +47,12 @@ module RoundcubePlugin
   def list_users()
     usernames = []
 
-    connection = PG::Connection.connect(@db_hash)
+    connection = PG::Connection.new(@db_hash)
 
     sql_query = 'SELECT username FROM users;'
 
     begin
-      connection.query(sql_query) do |result|
+      connection.sync_exec(sql_query) do |result|
         usernames = result.field_values('username')
       end
     ensure
@@ -79,7 +79,7 @@ module RoundcubePlugin
     sql_query = 'SELECT user_id FROM users WHERE username = $1;'
 
     begin
-      connection.query(sql_query, [user.to_s()]) do |result|
+      connection.sync_exec_params(sql_query, [user.to_s()]) do |result|
         if result.num_tuples > 0
           user_id = result[0]['user_id']
         end

data/lib/mv/mv_runner.rb

@@ -38,17 +38,17 @@ class MvRunner
       msg += "."
       report(plugin, msg)
 
-    rescue NonexistentUserError => e
+    rescue NonexistentUserError
       # This means that the SOURCE user didn't exist, since a
       # nonexistent destination user is perfectly expected.
       report(plugin, "Source user #{src.to_s()} not found.")
-    rescue NonexistentDomainError => e
+    rescue NonexistentDomainError
       # This could mean that the source domain doesn't exist, but in
       # that case, we just report that the source user doesn't
       # exist. So a nonexistent domain refers to a nonexistent
       # DESTINATION domain.
       report(plugin, "Destination domain #{dst.domainpart()} not found.")
-    rescue UserAlreadyExistsError => e
+    rescue UserAlreadyExistsError
       report(plugin, "Destination user #{dst.to_s()} already exists.")
     end
   end

data/lib/mv/plugins/agendav.rb

@@ -40,7 +40,7 @@ class AgendavMv
       # The "prefs" table uses the normal username as a key...
       # This should be harmless if the source user does not exist.
       sql_query0 = 'UPDATE prefs SET username = $1 WHERE username = $2;'
-      connection.query(sql_query0, [dst.to_s(), src.to_s()])
+      connection.sync_exec_params(sql_query0, [dst.to_s(), src.to_s()])
 
       # But the "shares" table uses encoded principal URLs. For the
       # "shares" table, we need to do a find/replace on the username
@@ -58,7 +58,7 @@ class AgendavMv
       sql_queries << 'UPDATE shares SET "with"=REPLACE("with", $2, $1);'
 
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [encoded_dst, encoded_src])
+        connection.sync_exec_params(sql_query, [encoded_dst, encoded_src])
       end
     ensure
       # Make sure the connection gets closed even if a query explodes.

data/lib/mv/plugins/davical.rb

@@ -33,7 +33,7 @@ class DavicalMv
 
     connection = PG::Connection.new(@db_hash)
     begin
-      connection.query(sql_query, [dst.to_s(), src.to_s()])
+      connection.sync_exec_params(sql_query, [dst.to_s(), src.to_s()])
     ensure
       # Make sure the connection gets closed even if the query explodes.
       connection.close()

data/lib/mv/plugins/postfixadmin.rb

@@ -59,7 +59,7 @@ class PostfixadminMv
                   {:value => dst.domainpart(), :type => varchar},
                   {:value => dst.localpart(), :type => varchar},
                   {:value => src.to_s(), :type => varchar}]
-        connection.query(sql_query, params)
+        connection.sync_exec_params(sql_query, params)
       end
     ensure
       # Make sure the connection gets closed even if a query explodes.

data/lib/mv/plugins/roundcube.rb

@@ -34,7 +34,7 @@ class RoundcubeMv
 
     connection = PG::Connection.new(@db_hash)
     begin
-      connection.query(sql_query, [dst.to_s(), src.to_s()])
+      connection.sync_exec_params(sql_query, [dst.to_s(), src.to_s()])
     ensure
       # Make sure the connection gets closed even if the query explodes.
       connection.close()

data/lib/rm/plugins/agendav.rb

@@ -47,7 +47,7 @@ class AgendavRm
     connection = PG::Connection.new(@db_hash)
     begin
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [user.to_s()])
+        connection.sync_exec_params(sql_query, [user.to_s()])
       end
     ensure
       # Make sure the connection gets closed even if a query explodes.

data/lib/rm/plugins/davical.rb

@@ -27,7 +27,7 @@ class DavicalRm
 
     connection = PG::Connection.new(@db_hash)
     begin
-      connection.query(sql_query, [user.to_s()])
+      connection.sync_exec_params(sql_query, [user.to_s()])
     ensure
       # Make sure the connection gets closed even if the query explodes.
       connection.close()

data/lib/rm/plugins/postfixadmin.rb

@@ -56,7 +56,7 @@ class PostfixadminRm
       sql_queries.each do |sql_query|
         varchar = 1043 # from pg_type.h
         params = [{:value => user.to_s(), :type => varchar}]
-        connection.query(sql_query, params)
+        connection.sync_exec_params(sql_query, params)
       end
     ensure
       # Make sure the connection gets closed even if a query explodes.
@@ -103,7 +103,7 @@ class PostfixadminRm
 
     begin
       sql_queries.each do |sql_query|
-        connection.query(sql_query, [domain.to_s()])
+        connection.sync_exec_params(sql_query, [domain.to_s()])
       end
     ensure
       # Make sure the connection gets closed even if a query explodes.

data/lib/rm/plugins/roundcube.rb

@@ -29,10 +29,10 @@ class RoundcubeRm
     # records associated with user_id too.
     sql_query = 'DELETE FROM users WHERE user_id = $1::int;'
 
-    connection = PG::Connection.connect(@db_hash)
+    connection = PG::Connection.new(@db_hash)
 
     begin
-      connection.query(sql_query, [user_id])
+      connection.sync_exec_params(sql_query, [user_id])
     ensure
       # Make sure the connection gets closed even if the query explodes.
       connection.close()

data/mailshears.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name              = 'mailshears'
-  s.version           = '0.0.3'
+  s.version           = '0.0.4'
   s.platform          = Gem::Platform::RUBY
   s.authors           = ['Michael Orlitzky']
   s.email             = ['michael@orlitzky.com']
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
 
   # If you have runtime dependencies, add them here
-  s.add_runtime_dependency 'pg', '~> 0.11'
+  s.add_runtime_dependency 'pg', '~> 1.2'
 
   # The list of files to be contained in the gem. We can obtain it
   # from git as long as we remember that this magic will happen and we

data/test/mailshears_test.rb

@@ -208,7 +208,7 @@ class MailshearsTest < MiniTest::Test
       plugin_dbname = cfg.send("#{plugin}_dbname")
       next if plugin_dbname.nil? # Skip the dovecot plugin
       query = "CREATE DATABASE #{plugin_dbname};"
-      connection.query(query)
+      connection.sync_exec(query)
 
       plugin_dbhost = cfg.send("#{plugin}_dbhost")
       plugin_dbport = cfg.send("#{plugin}_dbport")
@@ -223,9 +223,9 @@ class MailshearsTest < MiniTest::Test
                                        plugin_dbpass)
 
       sql = File.open("test/sql/#{plugin}.sql").read()
-      plugin_conn.query(sql)
+      plugin_conn.sync_exec(sql)
       sql = File.open("test/sql/#{plugin}-fixtures.sql").read()
-      plugin_conn.query(sql)
+      plugin_conn.sync_exec(sql)
       plugin_conn.close()
     end
 
@@ -246,7 +246,7 @@ class MailshearsTest < MiniTest::Test
       plugin_dbname = cfg.send("#{plugin}_dbname")
       next if plugin_dbname.nil? # Skip the dovecot plugin
       query = "DROP DATABASE IF EXISTS #{plugin_dbname};"
-      connection.query(query)
+      connection.sync_exec(query)
     end
 
     connection.close()

data/test/sql/postfixadmin.sql

@@ -89,7 +89,7 @@ ALTER FUNCTION public.merge_quota2() OWNER TO postgres;
 
 SET default_tablespace = '';
 
-SET default_with_oids = true;
+SET default_with_oids = false;
 
 --
 -- Name: admin; Type: TABLE; Schema: public; Owner: postgres; Tablespace: 
@@ -160,7 +160,7 @@ ALTER TABLE public.alias_domain OWNER TO postgres;
 COMMENT ON TABLE alias_domain IS 'Postfix Admin - Domain Aliases';
 
 
-SET default_with_oids = true;
+SET default_with_oids = false;
 
 --
 -- Name: config; Type: TABLE; Schema: public; Owner: postgres; Tablespace: 
@@ -371,7 +371,7 @@ CREATE TABLE quota2 (
 
 ALTER TABLE public.quota2 OWNER TO postgres;
 
-SET default_with_oids = true;
+SET default_with_oids = false;
 
 --
 -- Name: vacation; Type: TABLE; Schema: public; Owner: postgres; Tablespace: 

data/test/sql/roundcube.sql

@@ -26,7 +26,7 @@ SET search_path = public, pg_catalog;
 
 SET default_tablespace = '';
 
-SET default_with_oids = true;
+SET default_with_oids = false;
 
 --
 -- Name: cache; Type: TABLE; Schema: public; Owner: postgres; Tablespace: 
@@ -145,7 +145,7 @@ CREATE SEQUENCE contactgroups_ids
 
 ALTER TABLE public.contactgroups_ids OWNER TO postgres;
 
-SET default_with_oids = true;
+SET default_with_oids = false;
 
 --
 -- Name: contacts; Type: TABLE; Schema: public; Owner: postgres; Tablespace: 
@@ -182,7 +182,7 @@ CREATE TABLE dictionary (
 
 ALTER TABLE public.dictionary OWNER TO postgres;
 
-SET default_with_oids = true;
+SET default_with_oids = false;
 
 --
 -- Name: identities; Type: TABLE; Schema: public; Owner: postgres; Tablespace: 
@@ -251,7 +251,7 @@ CREATE TABLE searches (
 
 ALTER TABLE public.searches OWNER TO postgres;
 
-SET default_with_oids = true;
+SET default_with_oids = false;
 
 --
 -- Name: session; Type: TABLE; Schema: public; Owner: postgres; Tablespace: 
@@ -296,7 +296,7 @@ CREATE SEQUENCE user_ids
 
 ALTER TABLE public.user_ids OWNER TO postgres;
 
-SET default_with_oids = true;
+SET default_with_oids = false;
 
 --
 -- Name: users; Type: TABLE; Schema: public; Owner: postgres; Tablespace: 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailshears
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael Orlitzky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1.2'
 description: |2
       Managing a mail system with virtual users is annoying. The
       authoritative database of users is stored in one table, but every
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Prune unused mail directories.