aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Fripost/Schema
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Fripost/Schema')
-rw-r--r--lib/Fripost/Schema/Search.pm12
-rw-r--r--lib/Fripost/Schema/Type/Alias.pm39
-rw-r--r--lib/Fripost/Schema/Type/Domain.pm45
-rw-r--r--lib/Fripost/Schema/Type/User.pm36
-rw-r--r--lib/Fripost/Schema/Utils.pm76
5 files changed, 137 insertions, 71 deletions
diff --git a/lib/Fripost/Schema/Search.pm b/lib/Fripost/Schema/Search.pm
index 3dc2efa..67815bd 100644
--- a/lib/Fripost/Schema/Search.pm
+++ b/lib/Fripost/Schema/Search.pm
@@ -5,6 +5,7 @@ use warnings;
use strict;
use Fripost::Schema::Type;
+use Fripost::Schema::Utils;
use base qw/Net::LDAP::Search/;
our $VERSION = '0.01';
@@ -41,9 +42,10 @@ sub entries {
sub _userEntry {
my $entry = shift;
my %user;
- &_get_values( $entry, \%user, 'username', 'uid');
+ $user{username} = Fripost::Schema::Utils::fromDN ($entry->dn);
+ &_get_values( $entry, \%user, 'uid');
map { &_get_values($entry, \%user, $_) }
- qw /maildir isActive userPassword/;
+ qw /isActive userPassword/;
return \%user;
}
@@ -56,7 +58,7 @@ sub _domainEntry {
if (defined $domain{owner}) {
$domain{owner} = [ $domain{owner} ]
unless (ref $domain{owner}) eq 'ARRAY';
- $domain{owner} = [ map { (split /=/, (split /,/, $_, 2)[0], 2)[1] }
+ $domain{owner} = [ map { Fripost::Schema::Utils::fromDN($_) }
@{$domain{owner}} ];
}
return \%domain;
@@ -65,10 +67,14 @@ sub _domainEntry {
sub _aliasEntry {
my $entry = shift;
my %alias;
+ my $domain = (split /=/, (split /,/, $entry->dn, 3)[1], 2)[1];
+
&_get_values( $entry, \%alias, 'address', 'mailLocalAddress');
if (defined $alias{address}) {
$alias{address} = [ $alias{address} ]
unless (ref $alias{address}) eq 'ARRAY';
+ $alias{address} = [ map { $_ . '@' . $domain }
+ @{$alias{address}} ];
}
&_get_values( $entry, \%alias, 'goto', 'mailTarget');
&_get_values( $entry, \%alias, 'isActive');
diff --git a/lib/Fripost/Schema/Type/Alias.pm b/lib/Fripost/Schema/Type/Alias.pm
index 7949b4b..5ee334d 100644
--- a/lib/Fripost/Schema/Type/Alias.pm
+++ b/lib/Fripost/Schema/Type/Alias.pm
@@ -18,31 +18,27 @@ our $VERSION = '0.01';
# this domain only.
sub search {
my $self = shift;
+ my $alias = shift;
- my $base = join ',', ( 'ou=domains'
- , $self->{_options}->{base_dn} );
- $base = 'dc='.$_[0]->{domain} .','. $base
- if defined $_[0]->{domain};
+ my ($username, $domain);
+ ($username, $domain) = split /\@/, $alias->{address}, 2
+ if defined $alias->{address};
+
+ my $base = $self->{_options}->{base_dn};
+ $base = join ',', ( 'dc='.$domain, $base )
+ if defined $domain;
my @filters = ('(ObjectClass=virtualAliases)');
- push @filters, '(mailLocalAddress=' .$_[0]->{address}. ')'
- if defined $_[0]->{address};
- push @filters, '(mailTarget=' .$_[0]->{goto}. ')'
- if defined $_[0]->{goto};
-
- my $filter;
- if ($#filters == 0 ) {
- $filter = $filters[0];
- }
- elsif ($#filters > 0) {
- $filter = '(&' . (join '', @filters) . ')';
- }
+ push @filters, '(mailLocalAddress=' .$username. ')'
+ if defined $username;
+ push @filters, '(mailTarget=' .$alias->{goto}. ')'
+ if defined $alias->{goto};
my $res = $self->{_ldap}->search(
base => $base,
scope => 'subtree',
attrs => [ 'mailLocalAddress', 'mailTarget', 'isActive' ],
- filter => $filter
+ filter => Fripost::Schema::Utils::mkAndFilter( @filters )
);
die "Error: " .$res->error. "\n" if $res->code;
@@ -59,22 +55,19 @@ sub add {
"' targetting to itself.\n"
if $alias->{address} eq $alias->{goto};
- my $domain = (split /\@/, $alias->{address}, 2)[1];
+ my ($username, $domain) = split /\@/, $alias->{address}, 2;
my $base = join ',', ( 'mailTarget='.$alias->{goto}
, 'dc='. $domain
- , 'ou=domains'
, $self->{_options}->{base_dn} );
- my @attrs = ( mailLocalAddress => $alias->{address} );
+ my @attrs = ( mailLocalAddress => $username );
my $res;
if ($self->search({ goto => $alias->{goto}, domain => $domain })->count) {
$res = $self->{_ldap}->modify( $base, add => [ @attrs ] );
}
else {
$res = $self->{_ldap}->add( $base,
- attrs => [ mailTarget => $alias->{goto}
- , objectClass => [ 'top',
- 'inetLocalMailRecipient',
+ attrs => [ objectClass => [ 'inetLocalMailRecipient',
'virtualAliases' ]
, @attrs
, isActive => $alias->{isActive}
diff --git a/lib/Fripost/Schema/Type/Domain.pm b/lib/Fripost/Schema/Type/Domain.pm
index 0d2be17..2b803ac 100644
--- a/lib/Fripost/Schema/Type/Domain.pm
+++ b/lib/Fripost/Schema/Type/Domain.pm
@@ -5,6 +5,8 @@ use warnings;
use strict;
use base qw/Net::LDAP/;
+use Fripost::Schema::Utils;
+
our $VERSION = '0.01';
@@ -14,41 +16,31 @@ our $VERSION = '0.01';
# domain is given, returns all domains.
# Filters on values of both keys `domain' and `owner' (unless they are
# undefined).
-# If `owner' is the empty string, serch for non self-managed domains
+# If `owner' is the empty string, search for non self-managed domains
# only.
sub search {
my $self = shift;
+ my $domain = shift;
- my ($base, $owner);
- $base = join ',', ('ou=domains',$self->{_options}->{base_dn});
- $owner = join ',', ( 'uid='.$_[0]->{owner}
- , 'ou=mailboxes'
- , $self->{_options}->{base_dn} )
- if defined $_[0]->{owner};
+ my $owner;
+ $owner = Fripost::Schema::Utils::mkDN ( $self->{_options}, $domain->{owner} )
+ if defined $domain->{owner};
my @filters = ('(ObjectClass=virtualDomain)');
- push @filters, "(dc=" .$_[0]->{domain}. ")" if defined $_[0]->{domain};
- if (defined $_[0]->{owner}) {
- if ($_[0]->{owner} eq '') {
+ push @filters, "(dc=" .$domain->{domain}. ")" if defined $domain->{domain};
+ if (defined $domain->{owner}) {
+ if ($domain->{owner} eq '') {
push @filters, "(!(owner=*))";
}
else {
push @filters, "(owner=" .$owner. ")";
}
}
- my $filter;
- if ($#filters == 0) {
- $filter = $filters[0];
- }
- elsif ($#filters > 0) {
- $filter = "(&" . (join '', @filters) . ")";
- }
-
my $res = $self->{_ldap}->search(
- base => $base,
+ base => $self->{_options}->{base_dn},
scope => 'one',
attrs => [ 'dc', 'owner', 'isActive' ],
- filter => $filter
+ filter => Fripost::Schema::Utils::mkAndFilter( @filters )
);
die "Error: " .$res->error. "\n" if $res->code;
return $res;
@@ -61,13 +53,9 @@ sub add {
my $domain = shift;
my ($base, $owner);
- $base = join ',', ( 'dc='.$domain->{domain}
- , 'ou=domains'
- , $self->{_options}->{base_dn} );
- $owner = join ',', ( 'uid='.$domain->{owner}
- , 'ou=mailboxes'
- , $self->{_options}->{base_dn} )
- if defined $domain->{owner};
+ $base = Fripost::Schema::Utils::mkDN ( $self->{_options}, $domain->{domain} );
+ $owner = Fripost::Schema::Utils::mkDN ( $self->{_options}, $domain->{owner} )
+ if defined $domain->{owner};
my $res;
if ($self->search({ domain => $domain->{domain} })->count) {
@@ -77,8 +65,7 @@ sub add {
$res = $self->{_ldap}->modify( $base, add => [ owner => $owner ] );
}
else {
- my @attrs = ( dc => $domain->{domain},
- , objectClass => [ 'top', 'virtualDomain' ],
+ my @attrs = ( objectClass => 'virtualDomain',
, isActive => $domain->{isActive}
);
push @attrs, (owner => $owner)
diff --git a/lib/Fripost/Schema/Type/User.pm b/lib/Fripost/Schema/Type/User.pm
index b21c2e1..f5b6ce2 100644
--- a/lib/Fripost/Schema/Type/User.pm
+++ b/lib/Fripost/Schema/Type/User.pm
@@ -5,6 +5,8 @@ use warnings;
use strict;
use base qw/Net::LDAP/;
+use Fripost::Schema::Utils;
+
our $VERSION = '0.01';
@@ -12,20 +14,26 @@ our $VERSION = '0.01';
# Search a user, and return the corresponding entries if found. If no
# user is given, returns all users.
-# Filters on the value of the key `uid' only (unless it is undefined).
+# If the user has no domain part, returns matching users for any
+# domains.
sub search {
my $self = shift;
-
- my $base = join ',', ('ou=mailboxes',$self->{_options}->{base_dn});
+ my $user = shift;
+ my ($username, $domain) = split /\@/, $user->{username}, 2;
+
+ my $base = $self->{_options}->{base_dn};
+ $base = join ',', ( 'dc='.$domain, $base )
+ if defined $domain;
+
my $filter = "(ObjectClass=virtualMailbox)";
- $filter = "(&" .$filter. "(uid=" .$_[0]->{username}. ")" .")"
- if defined $_[0]->{username};
+ $filter = "(&" .$filter. "(uid=" .$username. ")" .")"
+ if defined $username;
my $res = $self->{_ldap}->search(
base => $base,
- scope => 'one',
- attrs => [ 'uid', 'gn' , 'sn', 'maildir', 'isActive' ],
+ scope => 'sub',
+ attrs => [ 'uid', 'gn' , 'sn', 'isActive' ],
filter => $filter
);
die "Error: " .$res->error. "\n" if $res->code;
@@ -38,15 +46,12 @@ sub add {
my $self = shift;
my $user = shift;
- my $base = join ',', ( 'uid=' .$user->{username}
- , 'ou=mailboxes'
- , $self->{_options}->{base_dn} );
+ my $base = Fripost::Schema::Utils::mkDN ( $self->{_options}
+ , $user->{username} );
my $res = $self->{_ldap}->add( $base,
- attrs => [ uid => $user->{username},
- objectClass => [ 'top', 'virtualMailbox' ],
+ attrs => [ objectClass => 'virtualMailbox',
userPassword => $user->{userPassword},
- maildir => $user->{maildir},
isActive => $user->{isActive}
]
);
@@ -60,9 +65,8 @@ sub passwd {
my $self = shift;
my $user = shift;
- my $base = join ',', ( 'uid=' .$user->{username}
- , 'ou=mailboxes'
- , $self->{_options}->{base_dn} );
+ my $base = Fripost::Schema::Utils::mkDN ( $self->{_options}
+ , $user->{username} );
my $res = $self->{_ldap}->modify( $base,
replace => [ userPassword => $user->{userPassword} ]
diff --git a/lib/Fripost/Schema/Utils.pm b/lib/Fripost/Schema/Utils.pm
new file mode 100644
index 0000000..382da1c
--- /dev/null
+++ b/lib/Fripost/Schema/Utils.pm
@@ -0,0 +1,76 @@
+package Fripost::Schema::Utils;
+
+use 5.010_000;
+use warnings;
+use strict;
+
+our $VERSION = '0.01';
+
+
+#######################################################################
+
+sub mkDN {
+ my $config = shift;
+
+ my ($user, $domain) = split /\@/, $_[0], 2;
+
+ my $dn;
+ if (defined $domain) {
+ $dn = join ',', ( 'uid='. $user
+ , 'dc='. $domain
+ , $config->{base_dn} );
+ }
+ elsif (defined $user) {
+ $dn = join ',', ( 'dc='. $user
+ , $config->{base_dn} );
+ }
+ else {
+ $dn = $config->{base_dn};
+ }
+ return $dn;
+}
+
+sub fromDN {
+ my ($u,$d) = split /,/, $_[0], 3;
+ join '@', ( map { (split /=/, $_, 2)[1] } ($u,$d) );
+}
+
+sub mkAndFilter {
+ my @filters = @_;
+
+ my $filter;
+ if ($#filters == 0) {
+ $filter = $filters[0];
+ }
+ elsif ($#filters > 0) {
+ $filter = "(&" . (join '', @filters) . ")";
+ }
+}
+
+
+#######################################################################
+
+1;
+
+=head1 NAME
+
+Fripost::Schema::Type::User -
+
+=head1 AUTHOR
+
+Guilhem Moulin C<< <guilhem at fripost.org> >>
+
+=head1 COPYRIGHT
+
+Copyright 2012 Guilhem Moulin, all rights reserved.
+
+=head1 LICENSE
+
+This program is free software; you can redistribute it and/or modify it
+under the same terms as perl itself.
+
+=cut
+
+1; # End of Utils.pm
+
+__END__
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 22:42:29 +0000