/[notice-sender]/trunk/Nos.pm
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /trunk/Nos.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 60 by dpavlin, Tue Jun 21 21:24:10 2005 UTC revision 70 by dpavlin, Tue Aug 2 19:41:28 2005 UTC
# Line 16  our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all' Line 16  our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'
16  our @EXPORT = qw(  our @EXPORT = qw(
17  );  );
18    
19  our $VERSION = '0.5';  our $VERSION = '0.6';
20    
21  use Class::DBI::Loader;  use Class::DBI::Loader;
22  use Email::Valid;  use Email::Valid;
# Line 27  use Email::Simple; Line 27  use Email::Simple;
27  use Email::Address;  use Email::Address;
28  use Mail::DeliveryStatus::BounceParser;  use Mail::DeliveryStatus::BounceParser;
29  use Class::DBI::AbstractSearch;  use Class::DBI::AbstractSearch;
30    use Mail::Alias;
31    use Cwd qw(abs_path);
32    
33    
34  =head1 NAME  =head1 NAME
# Line 120  sub new { Line 122  sub new {
122    
123  =head2 new_list  =head2 new_list
124    
125  Create new list. Required arguments are name of C<list> and  Create new list. Required arguments are name of C<list>, C<email> address
126  C<email> address.  and path to C<aliases> file.
127    
128   $nos->new_list(   $nos->new_list(
129          list => 'My list',          list => 'My list',
130          from => 'Outgoing from comment',          from => 'Outgoing from comment',
131          email => 'my-list@example.com',          email => 'my-list@example.com',
132            aliases => '/etc/mail/mylist',
133            archive => '/path/to/mbox/archive',
134   );   );
135    
136  Returns ID of newly created list.  Returns ID of newly created list.
# Line 154  sub new_list { Line 158  sub new_list {
158  }  }
159    
160    
161    =head2 delete_list
162    
163    Delete list from database.
164    
165     my $ok = delete_list(
166            list => 'My list'
167            aliases => '/etc/mail/mylist',
168     );
169    
170    Returns false if list doesn't exist.
171    
172    =cut
173    
174    sub delete_list {
175            my $self = shift;
176    
177            my $args = {@_};
178    
179            croak "need list to delete" unless ($args->{'list'});
180    
181            $args->{'list'} = lc($args->{'list'});
182    
183            my $aliases = $args->{'aliases'} || croak "need path to aliases file";
184    
185            my $lists = $self->{'loader'}->find_class('lists');
186    
187            my $this_list = $lists->search( name => $args->{'list'} )->first || return;
188    
189            $self->_remove_alias( email => $this_list->email, aliases => $aliases);
190    
191            $this_list->delete || croak "can't delete list\n";
192    
193            return $lists->dbi_commit || croak "can't commit";
194    }
195    
196    
197  =head2 add_member_to_list  =head2 add_member_to_list
198    
199  Add new member to list  Add new member to list
# Line 343  sub delete_member_from_list { Line 383  sub delete_member_from_list {
383          my $this_user = $user->search( email => $args->{'email'} )->first || croak "can't find user: ".$args->{'email'};          my $this_user = $user->search( email => $args->{'email'} )->first || croak "can't find user: ".$args->{'email'};
384          my $this_list = $list->search( name => $args->{'list'} )->first || croak "can't find list: ".$args->{'list'};          my $this_list = $list->search( name => $args->{'list'} )->first || croak "can't find list: ".$args->{'list'};
385    
386          my $this_user_list = $user_list->search_where( list_id => $this_list->id, user_id => $this_list->id )->first || return;          my $this_user_list = $user_list->search_where( list_id => $this_list->id, user_id => $this_user->id )->first || return;
387    
388          $this_user_list->delete || croak "can't delete user from list\n";          $this_user_list->delete || croak "can't delete user from list\n";
389    
# Line 489  sub send_queued_messages { Line 529  sub send_queued_messages {
529                          if ($sent->search( message_id => $m->message_id, user_id => $u->user_id )) {                          if ($sent->search( message_id => $m->message_id, user_id => $u->user_id )) {
530                                  print "SKIP $to_email message allready sent\n";                                  print "SKIP $to_email message allready sent\n";
531                          } else {                          } else {
532                                  print "=> $to_email\n";                                  print "=> $to_email ";
533    
534                                  my $secret = $m->list_id->name . " " . $u->user_id->email . " " . $m->message_id;                                  my $secret = $m->list_id->name . " " . $u->user_id->email . " " . $m->message_id;
535                                  my $auth = Email::Auth::AddressHash->new( $secret, $self->{'hash_len'} );                                  my $auth = Email::Auth::AddressHash->new( $secret, $self->{'hash_len'} );
# Line 515  sub send_queued_messages { Line 555  sub send_queued_messages {
555                                  $m_obj->header_set('X-Nos-Hash', $hash);                                  $m_obj->header_set('X-Nos-Hash', $hash);
556    
557                                  # really send e-mail                                  # really send e-mail
558                                    my $sent_status;
559    
560                                  if (@email_send_options) {                                  if (@email_send_options) {
561                                          send $email_send_driver => $m_obj->as_string, @email_send_options;                                          $sent_status = send $email_send_driver => $m_obj->as_string, @email_send_options;
562                                  } else {                                  } else {
563                                          send $email_send_driver => $m_obj->as_string;                                          $sent_status = send $email_send_driver => $m_obj->as_string;
564                                  }                                  }
565    
566                                  $sent->create({                                  croak "can't send e-mail: $sent_status\n\nOriginal e-mail follows:\n".$m_obj->as_string unless ($sent_status);
567                                          message_id => $m->message_id,                                  my @bad = @{ $sent_status->prop('bad') };
568                                          user_id => $u->user_id,                                  croak "failed sending to ",join(",",@bad) if (@bad);
569                                          hash => $hash,  
570                                  });                                  if ($sent_status) {
571                                  $sent->dbi_commit;  
572                                            $sent->create({
573                                                    message_id => $m->message_id,
574                                                    user_id => $u->user_id,
575                                                    hash => $hash,
576                                            });
577                                            $sent->dbi_commit;
578    
579                                            print " - $sent_status\n";
580    
581                                    } else {
582                                            warn "ERROR: $sent_status\n";
583                                    }
584    
585                                  if ($sleep) {                                  if ($sleep) {
586                                          warn "sleeping $sleep seconds\n";                                          warn "sleeping $sleep seconds\n";
# Line 642  sub inbox_message { Line 696  sub inbox_message {
696    
697  Beware of dragons! You shouldn't need to call those methods directly.  Beware of dragons! You shouldn't need to call those methods directly.
698    
699    
700    =head2 _add_aliases
701    
702    Add or update alias in C</etc/aliases> (or equivavlent) file for selected list
703    
704     my $ok = $nos->add_aliases(
705            list => 'My list',
706            email => 'my-list@example.com',
707            aliases => '/etc/mail/mylist',
708            archive => '/path/to/mbox/archive',
709    
710     );
711    
712    C<archive> parametar is optional.
713    
714    Return false on failure.
715    
716    =cut
717    
718    sub _add_aliases {
719            my $self = shift;
720    
721            my $arg = {@_};
722    
723            foreach my $o (qw/list email aliases/) {
724                    croak "need $o option" unless ($arg->{$o});
725            }
726    
727            my $aliases = $arg->{'aliases'};
728            my $email = $arg->{'email'};
729            my $list = $arg->{'list'};
730    
731            unless (-e $aliases) {
732                    warn "aliases file $aliases doesn't exist, creating empty\n";
733                    open(my $fh, '>', $aliases) || croak "can't create $aliases: $!";
734                    close($fh);
735                    chmod 0777, $aliases || warn "can't change permission to 0777";
736            }
737    
738            my $a = new Mail::Alias($aliases) || croak "can't open aliases file $aliases: $!";
739    
740            my $target = '';
741    
742            if (my $archive = $arg->{'archive'}) {
743                    $target .= "$archive, ";
744    
745                    if (! -e $archive) {
746                            warn "please make sure that file $archive is writable for your e-mail user (defaulting to bad 777 permission for now)";
747    
748                            open(my $fh, '>', $archive) || croak "can't create archive file $archive: $!";
749                            close($fh);
750                            chmod 0777, $archive || croak "can't chmod archive file $archive to 0777: $!";
751                    }
752            }
753    
754            # resolve my path to absolute one
755            my $self_path = abs_path($0);
756            $self_path =~ s#/[^/]+$##;
757            $self_path =~ s#/t/*$#/#;
758    
759            $target .= qq#| cd $self_path && ./sender.pl --inbox="$list"#;
760    
761            if ($a->exists($email)) {
762                    $a->update($email, $target) or croak "can't update alias ".$a->error_check;
763            } else {
764                    $a->append($email, $target) or croak "can't add alias ".$a->error_check;
765            }
766    
767            #$a->write($aliases) or croak "can't save aliases $aliases ".$a->error_check;
768    
769            return 1;
770    }
771    
772  =head2 _add_list  =head2 _add_list
773    
774  Create new list  Create new list
# Line 650  Create new list Line 777  Create new list
777          list => 'My list',          list => 'My list',
778          from => 'Outgoing from comment',          from => 'Outgoing from comment',
779          email => 'my-list@example.com',          email => 'my-list@example.com',
780            aliases => '/etc/mail/mylist',
781   );   );
782    
783  Returns C<Class::DBI> object for created list.  Returns C<Class::DBI> object for created list.
# Line 668  sub _add_list { Line 796  sub _add_list {
796    
797          my $name = lc($arg->{'list'}) || confess "can't add list without name";          my $name = lc($arg->{'list'}) || confess "can't add list without name";
798          my $email = lc($arg->{'email'}) || confess "can't add list without e-mail";          my $email = lc($arg->{'email'}) || confess "can't add list without e-mail";
799            my $aliases = lc($arg->{'aliases'}) || confess "can't add list without path to aliases file";
800    
801          my $from_addr = $arg->{'from'};          my $from_addr = $arg->{'from'};
802    
803          my $lists = $self->{'loader'}->find_class('lists');          my $lists = $self->{'loader'}->find_class('lists');
804    
805            $self->_add_aliases(
806                    list => $name,
807                    email => $email,
808                    aliases => $aliases,
809            ) || warn "can't add alias $email for list $name";
810    
811          my $l = $lists->find_or_create({          my $l = $lists->find_or_create({
812                  name => $name,                  name => $name,
813                  email => $email,                  email => $email,
# Line 691  sub _add_list { Line 827  sub _add_list {
827  }  }
828    
829    
830    
831  =head2 _get_list  =head2 _get_list
832    
833  Get list C<Class::DBI> object.  Get list C<Class::DBI> object.
# Line 711  sub _get_list { Line 848  sub _get_list {
848          return $lists->search({ name => lc($name) })->first;          return $lists->search({ name => lc($name) })->first;
849  }  }
850    
851    
852    =head2 _remove_alias
853    
854    Remove list alias
855    
856     my $ok = $nos->_remove_alias(
857            email => 'mylist@example.com',
858            aliases => '/etc/mail/mylist',
859     );
860    
861    Returns true if list is removed or false if list doesn't exist. Dies in case of error.
862    
863    =cut
864    
865    sub _remove_alias {
866            my $self = shift;
867    
868            my $arg = {@_};
869    
870            my $email = lc($arg->{'email'}) || confess "can't remove alias without email";
871            my $aliases = lc($arg->{'aliases'}) || confess "can't remove alias without list";
872    
873            my $a = new Mail::Alias($aliases) || croak "can't open aliases file $aliases: $!";
874    
875            if ($a->exists($email)) {
876                    $a->delete($email) || croak "can't remove alias $email";
877            } else {
878                    return 0;
879            }
880    
881            return 1;
882    
883    }
884    
885  ###  ###
886  ### SOAP  ### SOAP
887  ###  ###
# Line 735  methods below). Line 906  methods below).
906    
907  my $nos;  my $nos;
908    
909    
910    =head2 new
911    
912    Create new SOAP object
913    
914     my $soap = new Nos::SOAP(
915            dsn => 'dbi:Pg:dbname=notices',
916            user => 'dpavlin',
917            passwd => '',
918            debug => 1,
919            verbose => 1,
920            hash_len => 8,
921            aliases => '/etc/aliases',
922     );
923    
924    =cut
925    
926  sub new {  sub new {
927          my $class = shift;          my $class = shift;
928          my $self = {@_};          my $self = {@_};
929    
930            croak "need aliases parametar" unless ($self->{'aliases'});
931    
932          bless($self, $class);          bless($self, $class);
933    
934          $nos = new Nos( @_ ) || die "can't create Nos object";          $nos = new Nos( @_ ) || die "can't create Nos object";
# Line 759  sub new { Line 950  sub new {
950  sub NewList {  sub NewList {
951          my $self = shift;          my $self = shift;
952    
953            my $aliases = $nos->{'aliases'} || croak "need 'aliases' argument to new constructor";
954    
955          if ($_[0] !~ m/^HASH/) {          if ($_[0] !~ m/^HASH/) {
956                  return $nos->new_list(                  return $nos->new_list(
957                          list => $_[0], from => $_[1], email => $_[2],                          list => $_[0], from => $_[1], email => $_[2],
958                            aliases => $aliases,
959                  );                  );
960          } else {          } else {
961                  return $nos->new_list( %{ shift @_ } );                  return $nos->new_list( %{ shift @_ }, aliases => $aliases );
962          }          }
963  }  }
964    
965    
966    =head2 DeleteList
967    
968     $ok = DeleteList(
969            list => 'My list',
970     );
971    
972    =cut
973    
974    sub DeleteList {
975            my $self = shift;
976    
977            my $aliases = $nos->{'aliases'} || croak "need 'aliases' argument to new constructor";
978    
979            if ($_[0] !~ m/^HASH/) {
980                    return $nos->delete_list(
981                            list => $_[0],
982                            aliases => $aliases,
983                    );
984            } else {
985                    return $nos->delete_list( %{ shift @_ }, aliases => $aliases );
986            }
987    }
988    
989  =head2 AddMemberToList  =head2 AddMemberToList
990    
991   $member_id = AddMemberToList(   $member_id = AddMemberToList(
# Line 801  sub AddMemberToList { Line 1018  sub AddMemberToList {
1018    
1019  Returns array of hashes with user informations, see C<list_members>.  Returns array of hashes with user informations, see C<list_members>.
1020    
1021    Returning arrays from SOAP calls is somewhat fuzzy (at least to me). It
1022    seems that SOAP::Lite client thinks that it has array with one element which
1023    is array of hashes with data.
1024    
1025  =cut  =cut
1026    
1027  sub ListMembers {  sub ListMembers {
# Line 814  sub ListMembers { Line 1035  sub ListMembers {
1035                  $list_name = $_[0]->{'list'};                  $list_name = $_[0]->{'list'};
1036          }          }
1037    
1038          return $nos->list_members( list => $list_name );          return [ $nos->list_members( list => $list_name ) ];
1039  }  }
1040    
1041    
1042    =head2 DeleteMemberFromList
1043    
1044     $member_id = DeleteMemberFromList(
1045            list => 'My list',
1046            email => 'e-mail@example.com',
1047     );
1048    
1049    =cut
1050    
1051    sub DeleteMemberFromList {
1052            my $self = shift;
1053    
1054            if ($_[0] !~ m/^HASH/) {
1055                    return $nos->delete_member_from_list(
1056                            list => $_[0], email => $_[1],
1057                    );
1058            } else {
1059                    return $nos->delete_member_from_list( %{ shift @_ } );
1060            }
1061    }
1062    
1063    
1064  =head2 AddMessageToList  =head2 AddMessageToList
1065    
1066   $message_id = AddMessageToList(   $message_id = AddMessageToList(
Legend:
Removed from v.60  
changed lines
  Added in v.70
  ViewVC Help
Powered by ViewVC 1.1.26