Changeset 500

Timestamp:

May 3, 2010, 9:29:29 PM (11 years ago)

Author:

zecrazytux

Message:

Added a lock and enhanced mailmap writing mechanism

Location:

bearmail/lib/BearMail

Files:

• Backend/Files.pm (modified) (9 diffs)
• Dispatch.pm (modified) (1 diff)
• Web.pm (modified) (1 diff)
• Web/Address/Add.pm (modified) (1 diff)
• Web/Login.pm (modified) (1 diff)

bearmail/lib/BearMail/Backend/Files.pm

@@ -19 +19 @@
 use Carp;
 use Exporter 'import';
+use Fcntl ':flock';
 @EXPORT_OK = qw(new commit apply get_domains get_users get_user set_domain set_address add_domain add_address del_domain del_address get_postmasters get_postmaster_domains); 
 
@@ -41 +42 @@
 my $version = "0.3";
 my %records;
+my %new_records;
+my @records_to_delete;
 my %by_domain;
 my @domains;
@@ -110 +113 @@
 sub add_domain() {
   my ($class, $domain, $postmaster, $password) = @_;
+
+  if(exists($by_domain{$domain})) {
+    carp "Domain $domain already exist !";
+    return 0;
+  }
+
   if($postmaster eq "postmaster@".$domain) {
     add_address($class, $postmaster, $password, "local");
@@ -131 +140 @@
     return 0;
   } else {
-    $records{"$address"} = { 
+    $new_records{"$address"} = { 
               address => $address,
               password => $password,
@@ -142 +151 @@
   my ($class, $domain) = @_;
   if(scalar(@{$by_domain{$domain}}) le 1) {
-    delete($records{"postmaster\@$domain"});
+    push(@records_to_delete, "postmaster\@$domain");
   } else {
     carp "There are remaining email addresses for this domain !\n";
@@ -151 +160 @@
 sub del_address() {
   my ($class, $address) = @_;
-  delete($records{"$address"}); 
+  push(@records_to_delete, $address); 
 }
 
@@ -192 +201 @@
 
   open(MAILMAP, "<$mailmap") or croak "$mailmap: $!";
+  flock(MAILMAP, LOCK_NB);
+
 
   while(<MAILMAP>) {
@@ -214 +225 @@
   }
 
-  close MAILMAP;
+  close(MAILMAP);
+  flock(MAILMAP, LOCK_UN);
   _sort_mailmap();
 }
 
-sub _write_mailmap {   #FIXME: Add a lock !
+sub _write_mailmap {
   return if !%records;
 
   open(MAILMAP, ">$mailmap") or croak "$mailmap: $!";
+  flock(MAILMAP, LOCK_EX + LOCK_NB)
+    or croak "Can't get exclusive lock on $mailmap: $!";
+
+  _read_mailmap();
+  %records = (%records, %new_records);
+  delete($records{$_}) foreach(@records_to_delete);
+  _sort_mailmap();
 
   foreach(keys %records) {
@@ -228 +247 @@
   }
 
-  close MAILMAP;
+  flock(MAILMAP, LOCK_UN);
+  close(MAILMAP);
 }
 

bearmail/lib/BearMail/Dispatch.pm

@@ -35 +35 @@
         }
     },
-    debug => 1,
+    #debug => 1,
     table       => [
             ':app'     => {},

bearmail/lib/BearMail/Web.pm

@@ -24 +24 @@
 use BearMail::Backend;
 use Data::Dumper;
-
-
 
 sub setup {

bearmail/lib/BearMail/Web/Address/Add.pm

@@ -37 +37 @@
     }
 
-    if(grep(/$domain/, $backend->get_domains())) {
+    if(grep(/^$domain$/, $backend->get_domains())) {
       $backend->add_address($email, $password, $target) 
         or error($self, "BAD_CONFIGURATION");

bearmail/lib/BearMail/Web/Login.pm

@@ -71 +71 @@
     $self->session->param('user', $user);
     $self->session->param('level', $level);
+    $self->session->flush();
 
     # Redirect to the original page the user intended to go, or some fitting