X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Frm%2Fplugins%2Fagendav.rb;h=4bf6bc4aca11a2427c10e40151310bbeca452ea6;hp=6d92c26d6fb054d9de44ba5d30b60abec76c2f8d;hb=579a22471329c71552bcb4077a0590d60cdec784;hpb=20b843bddcd73833d41f98ff79d92ef59bb4d81e

diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb
index 6d92c26..4bf6bc4 100644
--- a/lib/rm/plugins/agendav.rb
+++ b/lib/rm/plugins/agendav.rb
@@ -3,28 +3,50 @@ require 'pg'
 require 'common/agendav_plugin'
 require 'rm/rm_plugin'
 
+
+# Handle the removal of Agendav users from its database. Agendav has
+# no concept of domains.
+#
 class AgendavRm
 
   include AgendavPlugin
   include RmPlugin
 
 
-  def delete_user(user)
-    # Delete the given username and any records in other tables
-    # belonging to it.
+  # Remove *user* from the Agendav database. This should remove him
+  # from _every_ table in which he is referenced.
+  #
+  # @param user [User] the user to remove.
+  #
+  def remove_user(user)
     raise NonexistentUserError.new(user.to_s()) if not user_exists(user)
 
     sql_queries = ['DELETE FROM prefs WHERE username = $1;']
-    sql_queries << 'DELETE FROM shared WHERE user_from = $1;'
-
-    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
-                                @db_name, @db_user, @db_pass)
 
-    sql_queries.each do |sql_query|
-      connection.query(sql_query, [user.to_s()])
+    # The "shares" table contains principal URLs, and the "@" symbol
+    # is usually encoded to "%40". These queries do a regex match on
+    # the username after replacing the "%40" with a "@".
+    #
+    # As a precaution, I haven chosen not to delete based on the
+    # "calendar" field here. Nobody should have a calendar named
+    # "user%40example.com", but it's not impossible -- and we don't
+    # want to delete that calendar when the not-necessarily-related
+    # "user@example.com" account is removed. And the usual appearance
+    # of the user's email address in the "calendar" field happens when
+    # he is also the owner, so the calendar does get deleted in the
+    # normal situation.
+    sql_queries << "DELETE FROM shares WHERE REPLACE(owner, '%40', '@') ~ $1;"
+    sql_queries << "DELETE FROM shares WHERE REPLACE(with, '%40', '@')  ~ $1;"
+
+    connection = PG::Connection.new(@db_hash)
+    begin
+      sql_queries.each do |sql_query|
+        connection.query(sql_query, [user.to_s()])
+      end
+    ensure
+      # Make sure the connection gets closed even if a query explodes.
+      connection.close()
     end
-
-    connection.close()
   end
 
 end