Merge branch 'master' of ssh://cpp/liblerdorf
This commit is contained in:
commit
9ff6402d87
65
ACU/LDAP.pm
65
ACU/LDAP.pm
|
@ -8,16 +8,22 @@ use warnings;
|
|||
use Carp;
|
||||
|
||||
use Net::LDAPS;
|
||||
use Net::LDAP::Filter;
|
||||
use Net::LDAP::Util qw(ldap_error_text);
|
||||
|
||||
use ACU::Password;
|
||||
use ACU::Right;
|
||||
use ACU::Log;
|
||||
|
||||
use constant {
|
||||
BASE_DN => "dc=acu,dc=epita,dc=fr",
|
||||
YEAR_DN => "cn=year,dc=acu,dc=epita,dc=fr",
|
||||
};
|
||||
|
||||
## Connection functions
|
||||
|
||||
our $ldaphost = "ldap.acu.epita.fr";
|
||||
our $binddn = "cn=intra,dc=acu,dc=epita,dc=fr";
|
||||
our $binddn = "cn=intra," . BASE_DN;
|
||||
my $bindsecret = "";
|
||||
|
||||
sub ldap_get_password
|
||||
|
@ -42,10 +48,7 @@ sub ldap_connect()
|
|||
|
||||
log(DEBUG, "Connect to LDAP with $binddn");
|
||||
|
||||
if ($mesg->code) {
|
||||
log(ERROR, "An error occurred: " .ldap_error_text($mesg->code));
|
||||
croak "An error occurred: " .ldap_error_text($mesg->code);
|
||||
}
|
||||
croak ldap_error_text($mesg->code) if ($mesg->code);
|
||||
|
||||
return $ldap;
|
||||
}
|
||||
|
@ -57,10 +60,7 @@ sub ldap_connect_anon()
|
|||
|
||||
log(DEBUG, "Connect to LDAP anonymously");
|
||||
|
||||
if ($mesg->code) {
|
||||
log(ERROR, "An error occurred: " .ldap_error_text($mesg->code));
|
||||
croak "An error occurred: " .ldap_error_text($mesg->code);
|
||||
}
|
||||
croak ldap_error_text($mesg->code) if ($mesg->code);
|
||||
|
||||
return $ldap;
|
||||
}
|
||||
|
@ -75,7 +75,7 @@ sub add_group($$$;$)
|
|||
my $year = shift // get_year();
|
||||
my $ou = shift // "intra"; # expected roles or intra
|
||||
|
||||
my $dn = "cn=$cn,ou=$year,ou=$ou,ou=groups,dc=acu,dc=epita,dc=fr";
|
||||
my $dn = "cn=$cn,ou=$year,ou=$ou,ou=groups," . BASE_DN;
|
||||
|
||||
log(DEBUG, "Add group $dn");
|
||||
|
||||
|
@ -94,7 +94,7 @@ sub get_year(;$)
|
|||
{
|
||||
my $ldap = shift // ldap_connect_anon();
|
||||
|
||||
return get_attribute($ldap, "cn=year,dc=acu,dc=epita,dc=fr", "year");
|
||||
return get_attribute($ldap, YEAR_DN, "year");
|
||||
}
|
||||
|
||||
sub get_rights($)
|
||||
|
@ -105,8 +105,8 @@ sub get_rights($)
|
|||
my $ldap = ldap_connect_anon();
|
||||
|
||||
my $mesg = $ldap->search( # search
|
||||
base => "ou=roles,ou=groups,dc=acu,dc=epita,dc=fr",
|
||||
filter => "&(memberUid=$login)(objectClass=intraGroup)",
|
||||
base => "ou=roles,ou=groups," . BASE_DN,
|
||||
filter => Net::LDAP::Filter->new("&(memberUid=$login)(objectClass=intraGroup)"),
|
||||
attrs => [ 'intraRight' ],
|
||||
scope => "sub"
|
||||
);
|
||||
|
@ -127,8 +127,8 @@ sub get_rights($)
|
|||
|
||||
|
||||
$mesg = $ldap->search( # search
|
||||
base => "ou=intra,ou=groups,dc=acu,dc=epita,dc=fr",
|
||||
filter => "&(memberUid=$login)(objectClass=intraGroup)",
|
||||
base => "ou=intra,ou=groups," . BASE_DN,
|
||||
filter => Net::LDAP::Filter->new("&(memberUid=$login)(objectClass=intraGroup)"),
|
||||
attrs => [ 'intraRight' ],
|
||||
scope => "sub"
|
||||
);
|
||||
|
@ -144,8 +144,8 @@ sub get_rights($)
|
|||
|
||||
|
||||
$mesg = $ldap->search( # search
|
||||
base => "ou=users,dc=acu,dc=epita,dc=fr",
|
||||
filter => "&(uid=$login)(objectClass=intraAccount)",
|
||||
base => "ou=users," . BASE_DN,
|
||||
filter => Net::LDAP::Filter->new("&(uid=$login)(objectClass=intraAccount)"),
|
||||
attrs => [ 'intraRight' ],
|
||||
scope => "sub"
|
||||
);
|
||||
|
@ -191,7 +191,7 @@ sub get_dn($$@)
|
|||
|
||||
my $mesg = $ldap->search( # search
|
||||
base => "$dn",
|
||||
filter => "(objectClass=*)",
|
||||
filter => Net::LDAP::Filter->new("(objectClass=*)"),
|
||||
attrs => \@_,
|
||||
scope => "sub"
|
||||
);
|
||||
|
@ -261,7 +261,7 @@ sub delete_attribute($$$@)
|
|||
{
|
||||
log(DEBUG, "Remove attribute $what ($value) from $dn");
|
||||
|
||||
@data = grep { ! $value eq $_ } @data;
|
||||
@data = grep { $value ne $_ } @data;
|
||||
$mod = 1;
|
||||
}
|
||||
else {
|
||||
|
@ -321,18 +321,19 @@ sub search_dn($$@)
|
|||
my $base = shift;
|
||||
my $filter = shift;
|
||||
|
||||
if ($base) {
|
||||
$base .= ","
|
||||
}
|
||||
$base .= "," if ($base);
|
||||
|
||||
log (DEBUG, "Looking for $filter in $base" . BASE_DN);
|
||||
|
||||
my $mesg = $ldap->search( # search
|
||||
base => $base."dc=acu,dc=epita,dc=fr",
|
||||
filter => $filter,
|
||||
base => $base . BASE_DN,
|
||||
filter => Net::LDAP::Filter->new($filter),
|
||||
attrs => [ ],
|
||||
scope => "sub"
|
||||
);
|
||||
if ($mesg->code != 0) { log(WARN, $mesg->error); return undef; }
|
||||
if ($mesg->count != 1) { log(WARN, "$filter not found or multiple entries match"); return undef; }
|
||||
croak($mesg->error) if ($mesg->code != 0);
|
||||
croak("$filter not found") if ($mesg->count == 0);
|
||||
croak("$filter not unique") if ($mesg->count > 1);
|
||||
|
||||
return $mesg->entry(0)->dn;
|
||||
}
|
||||
|
@ -343,17 +344,15 @@ sub search_dns($$$@)
|
|||
my $base = shift;
|
||||
my $filter = shift;
|
||||
|
||||
if ($base) {
|
||||
$base .= ","
|
||||
}
|
||||
$base .= "," if ($base);
|
||||
|
||||
my $mesg = $ldap->search( # search
|
||||
base => $base."dc=acu,dc=epita,dc=fr",
|
||||
filter => $filter,
|
||||
attrs => @_,
|
||||
base => $base . BASE_DN,
|
||||
filter => Net::LDAP::Filter->new($filter),
|
||||
attrs => \@_,
|
||||
scope => "sub"
|
||||
);
|
||||
if ($mesg->code != 0) { log(WARN, $mesg->error); return undef; }
|
||||
if ($mesg->code != 0) { log(WARN, $mesg->error); return []; }
|
||||
|
||||
return $mesg->entries;
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ my $promo = qx(git config hooks.promo);
|
|||
my $id_project = qx(git config hooks.idproject);
|
||||
my $repo_login = qx(git config hooks.repologin);
|
||||
|
||||
my @habitent_loin = ("amed_m", "bellev_m", "faure_n", "freima_m", "ikouna_l", "simon_j");
|
||||
my @habitent_loin = ("abdeln_a", "amed_m", "bellev_m", "faure_n", "freima_m", "ikouna_l", "simon_j");
|
||||
|
||||
# First, check if the repository is in the YYYY/ directory
|
||||
exit 0 if (($promo && $id_project && $repo_login) || $ENV{GL_REPO} !~ /^2[0-9]{3}\/.+\/.+/);
|
||||
|
|
|
@ -64,6 +64,7 @@ if ($ref =~ m<^refs/tags/(.+)$>)
|
|||
my $close = DateTime::Format::ISO8601->parse_datetime($rendu->{period}{end});
|
||||
|
||||
# TODO: check exceptions by login/group
|
||||
$open = DateTime::Format::ISO8601->parse_datetime("2013-10-16T16:00:00") if ($repo_login eq "ikouna_l");
|
||||
|
||||
say "Date courante : ", $glts->strftime("%d/%m/%Y %H:%M:%S");
|
||||
|
||||
|
|
Reference in New Issue
Block a user