From 1be510f9529cb082f802408b472a77d074b394c0 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Sun, 14 Apr 2013 13:46:12 +0000 Subject: Add zarb MLs html archives --- .../20110122/21e2570e/attachment-0001.html | 80 +++++++++++ .../attachments/20110122/21e2570e/attachment.html | 80 +++++++++++ .../20110122/297c6dcb/attachment-0001.html | 89 ++++++++++++ .../attachments/20110122/297c6dcb/attachment.html | 89 ++++++++++++ .../20110122/3f04e3ea/attachment-0001.html | 156 +++++++++++++++++++++ .../attachments/20110122/3f04e3ea/attachment.html | 156 +++++++++++++++++++++ .../20110122/71753e02/attachment-0001.html | 153 ++++++++++++++++++++ .../attachments/20110122/71753e02/attachment.html | 153 ++++++++++++++++++++ .../20110122/b30915d0/attachment-0001.html | 76 ++++++++++ .../attachments/20110122/b30915d0/attachment.html | 76 ++++++++++ .../20110122/c9c46541/attachment-0001.html | 76 ++++++++++ .../attachments/20110122/c9c46541/attachment.html | 76 ++++++++++ 12 files changed, 1260 insertions(+) create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/21e2570e/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/21e2570e/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/297c6dcb/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/297c6dcb/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/3f04e3ea/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/3f04e3ea/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/71753e02/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/71753e02/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/b30915d0/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/b30915d0/attachment.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/c9c46541/attachment-0001.html create mode 100644 zarb-ml/mageia-sysadm/attachments/20110122/c9c46541/attachment.html (limited to 'zarb-ml/mageia-sysadm/attachments/20110122') diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/21e2570e/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110122/21e2570e/attachment-0001.html new file mode 100644 index 000000000..569bd8da3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/21e2570e/attachment-0001.html @@ -0,0 +1,80 @@ + + + +[877] Change ACL for non-privileged users to not work on reset model, instead allow + + + + +
+
+
Revision
877
+
Author
buchan
+
Date
2011-01-22 10:48:10 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Change ACL for non-privileged users to not work on reset model, instead allow
+registrars to change unprivileged passwords directly
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/openldap/templates/mandriva-dit-access.conf
+===================================================================
+--- puppet/modules/openldap/templates/mandriva-dit-access.conf	2011-01-21 14:53:38 UTC (rev 876)
++++ puppet/modules/openldap/templates/mandriva-dit-access.conf	2011-01-22 09:48:10 UTC (rev 877)
+@@ -22,8 +22,8 @@
+ # Allow account registration to write userPassword of unprivileged users accounts
+ access to dn.subtree="ou=People,<%= dc_suffix %>" 
+ 	filter="(&(objectclass=inetOrgPerson)(!(objectclass=posixAccount)))"
+-	attrs=userPassword,pwdReset
+-	by group/groupOfNames/member.exact="cn=registrars,ou=system groups,<%= dc_suffix %>" +a
++	attrs=userPassword
++	by group/groupOfNames/member.exact="cn=registrars,ou=system groups,<%= dc_suffix %>" +w
+ 	by * +0 break
+ 
+ # shadowLastChange is here because it needs to be writable by the user because
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/21e2570e/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110122/21e2570e/attachment.html new file mode 100644 index 000000000..569bd8da3 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/21e2570e/attachment.html @@ -0,0 +1,80 @@ + + + +[877] Change ACL for non-privileged users to not work on reset model, instead allow + + + + +
+
+
Revision
877
+
Author
buchan
+
Date
2011-01-22 10:48:10 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Change ACL for non-privileged users to not work on reset model, instead allow
+registrars to change unprivileged passwords directly
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/openldap/templates/mandriva-dit-access.conf
+===================================================================
+--- puppet/modules/openldap/templates/mandriva-dit-access.conf	2011-01-21 14:53:38 UTC (rev 876)
++++ puppet/modules/openldap/templates/mandriva-dit-access.conf	2011-01-22 09:48:10 UTC (rev 877)
+@@ -22,8 +22,8 @@
+ # Allow account registration to write userPassword of unprivileged users accounts
+ access to dn.subtree="ou=People,<%= dc_suffix %>" 
+ 	filter="(&(objectclass=inetOrgPerson)(!(objectclass=posixAccount)))"
+-	attrs=userPassword,pwdReset
+-	by group/groupOfNames/member.exact="cn=registrars,ou=system groups,<%= dc_suffix %>" +a
++	attrs=userPassword
++	by group/groupOfNames/member.exact="cn=registrars,ou=system groups,<%= dc_suffix %>" +w
+ 	by * +0 break
+ 
+ # shadowLastChange is here because it needs to be writable by the user because
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/297c6dcb/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110122/297c6dcb/attachment-0001.html new file mode 100644 index 000000000..efd2e1a35 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/297c6dcb/attachment-0001.html @@ -0,0 +1,89 @@ + + + +[336] Fix greeting in password reset key mail, by sending cn to stash + + + + +
+
+
Revision
336
+
Author
buchan
+
Date
2011-01-22 10:38:25 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Fix greeting in password reset key mail, by sending cn to stash
+Also add some more error error checking on the search
+ +

Modified Paths

+ + +
+
+Modified: identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm
+===================================================================
+--- identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-22 08:52:05 UTC (rev 335)
++++ identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-22 09:38:25 UTC (rev 336)
+@@ -56,7 +56,10 @@
+ 	$emailfilter =~ s/\%s/$email/g,
+ 	$c->log->debug("Searching for email $email with filter $emailfilter");
+ 	my $mesg = $c->model('Proxy')->search($emailfilter);
+-	if (!$mesg->entries()) {
++
++	$c->log->info(printf("Search failed: %s"),$mesg->error)	if ($mesg->code);
++	my @entries = $mesg->entries;
++	if (@entries != 1) {
+ 		push @errors,$c->loc(
+ 			'This email address is not bound to an account'
+ 		);
+@@ -86,6 +89,7 @@
+ 			'template'	=> 'forgot_password.tt',
+ 		},
+ 		url => $c->uri_for('/forgot_password/confirm') . "?secret=$secret",
++		cn => @entries[0]->cn,
+ 	);
+ 
+ 	$c->log->info("Sending forgot password mail to email address $email");
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/297c6dcb/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110122/297c6dcb/attachment.html new file mode 100644 index 000000000..efd2e1a35 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/297c6dcb/attachment.html @@ -0,0 +1,89 @@ + + + +[336] Fix greeting in password reset key mail, by sending cn to stash + + + + +
+
+
Revision
336
+
Author
buchan
+
Date
2011-01-22 10:38:25 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Fix greeting in password reset key mail, by sending cn to stash
+Also add some more error error checking on the search
+ +

Modified Paths

+ + +
+
+Modified: identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm
+===================================================================
+--- identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-22 08:52:05 UTC (rev 335)
++++ identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-22 09:38:25 UTC (rev 336)
+@@ -56,7 +56,10 @@
+ 	$emailfilter =~ s/\%s/$email/g,
+ 	$c->log->debug("Searching for email $email with filter $emailfilter");
+ 	my $mesg = $c->model('Proxy')->search($emailfilter);
+-	if (!$mesg->entries()) {
++
++	$c->log->info(printf("Search failed: %s"),$mesg->error)	if ($mesg->code);
++	my @entries = $mesg->entries;
++	if (@entries != 1) {
+ 		push @errors,$c->loc(
+ 			'This email address is not bound to an account'
+ 		);
+@@ -86,6 +89,7 @@
+ 			'template'	=> 'forgot_password.tt',
+ 		},
+ 		url => $c->uri_for('/forgot_password/confirm') . "?secret=$secret",
++		cn => @entries[0]->cn,
+ 	);
+ 
+ 	$c->log->info("Sending forgot password mail to email address $email");
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/3f04e3ea/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110122/3f04e3ea/attachment-0001.html new file mode 100644 index 000000000..fd24dde22 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/3f04e3ea/attachment-0001.html @@ -0,0 +1,156 @@ + + + +[338] Ugly code rejecting submit when buildrequires are missing + + + + +
+
+
Revision
338
+
Author
pterjan
+
Date
2011-01-22 15:49:03 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Ugly code rejecting submit when buildrequires are missing
+ +

Added Paths

+ + +
+
+Added: build_system/mdv-youri-submit/trunk/lib/Youri/Submit/Check/Deps.pm
+===================================================================
+--- build_system/mdv-youri-submit/trunk/lib/Youri/Submit/Check/Deps.pm	                        (rev 0)
++++ build_system/mdv-youri-submit/trunk/lib/Youri/Submit/Check/Deps.pm	2011-01-22 14:49:03 UTC (rev 338)
+@@ -0,0 +1,87 @@
++package Youri::Submit::Check::Deps;
++
++=head1 NAME
++
++Youri::Submit::Check::Deps - Check dependencies
++
++=head1 DESCRIPTION
++
++This check plugin rejects packages with unresolved dependencies.
++
++=cut
++
++use warnings;
++use strict;
++use Carp;
++use Youri::Media::URPM;
++use base qw/Youri::Submit::Check/;
++
++sub resolvedep {
++    my ($media, @requires) = @_;
++
++    my @errors;
++    my $index = sub {
++        my ($package) = @_;
++
++	my @provides = $package->get_provides();
++
++	@requires = grep {
++	    my $require = $_;
++	    my $notfound = 1;
++            foreach my $provide (@provides) {
++                next unless $provide->[Youri::Package::DEPENDENCY_NAME] eq $require->[Youri::Package::DEPENDENCY_NAME];
++                if ($require->[Youri::Package::DEPENDENCY_RANGE]) {
++                    next unless $package->check_ranges_compatibility($provide->[Youri::Package::DEPENDENCY_RANGE], $require->[Youri::Package::DEPENDENCY_RANGE]);
++	        }
++	        $notfound = 0;
++	    }
++
++            if ($notfound && $require->[Youri::Package::DEPENDENCY_NAME] =~ m|/|) {
++                foreach my $file ($package->get_files()) {
++		    next unless $file eq $require->[Youri::Package::DEPENDENCY_NAME];
++		    $notfound = 0;
++		    last;
++	        }
++            }
++	    $notfound;
++        } @requires;
++    };
++    $media->traverse_headers($index);
++    foreach my $require (@requires) {
++	    push (@errors, "Unresolved dep on " . $require->[Youri::Package::DEPENDENCY_NAME]);
++    }
++    return @errors;
++}
++
++sub run {
++    my ($self, $package, $repository, $target, $define) = @_;
++    croak "Not a class method" unless ref $self;
++
++    # FIXME Define some Youri::Media with allowed_deps in the config and
++    # match target + section to a media
++    my $section = $repository->_get_section($package, $target, $define);
++    return unless $target eq "cauldron" && $section eq 'core/release';
++
++    my @requires = $package->get_requires();
++    
++    my $path = $repository->get_install_root() . "/" . $target;
++    # FIXME we need dependencies on all archs except for ExclusiveArch
++    my $arch = 'i586';
++#    foreach my $arch ($repository->get_extra_arches()) {
++        my $media = new Youri::Media::URPM(name => "core.".$arch,
++                                           type => "binary",
++					   hdlist => "$path/$arch/media/$section/media_info/hdlist.cz");
++    return resolvedep($media, @requires);
++#    }
++
++}
++
++=head1 COPYRIGHT AND LICENSE
++
++Copyright (C) 2011, YOURI project
++
++This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.
++
++=cut
++
++1;
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/3f04e3ea/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110122/3f04e3ea/attachment.html new file mode 100644 index 000000000..fd24dde22 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/3f04e3ea/attachment.html @@ -0,0 +1,156 @@ + + + +[338] Ugly code rejecting submit when buildrequires are missing + + + + +
+
+
Revision
338
+
Author
pterjan
+
Date
2011-01-22 15:49:03 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Ugly code rejecting submit when buildrequires are missing
+ +

Added Paths

+ + +
+
+Added: build_system/mdv-youri-submit/trunk/lib/Youri/Submit/Check/Deps.pm
+===================================================================
+--- build_system/mdv-youri-submit/trunk/lib/Youri/Submit/Check/Deps.pm	                        (rev 0)
++++ build_system/mdv-youri-submit/trunk/lib/Youri/Submit/Check/Deps.pm	2011-01-22 14:49:03 UTC (rev 338)
+@@ -0,0 +1,87 @@
++package Youri::Submit::Check::Deps;
++
++=head1 NAME
++
++Youri::Submit::Check::Deps - Check dependencies
++
++=head1 DESCRIPTION
++
++This check plugin rejects packages with unresolved dependencies.
++
++=cut
++
++use warnings;
++use strict;
++use Carp;
++use Youri::Media::URPM;
++use base qw/Youri::Submit::Check/;
++
++sub resolvedep {
++    my ($media, @requires) = @_;
++
++    my @errors;
++    my $index = sub {
++        my ($package) = @_;
++
++	my @provides = $package->get_provides();
++
++	@requires = grep {
++	    my $require = $_;
++	    my $notfound = 1;
++            foreach my $provide (@provides) {
++                next unless $provide->[Youri::Package::DEPENDENCY_NAME] eq $require->[Youri::Package::DEPENDENCY_NAME];
++                if ($require->[Youri::Package::DEPENDENCY_RANGE]) {
++                    next unless $package->check_ranges_compatibility($provide->[Youri::Package::DEPENDENCY_RANGE], $require->[Youri::Package::DEPENDENCY_RANGE]);
++	        }
++	        $notfound = 0;
++	    }
++
++            if ($notfound && $require->[Youri::Package::DEPENDENCY_NAME] =~ m|/|) {
++                foreach my $file ($package->get_files()) {
++		    next unless $file eq $require->[Youri::Package::DEPENDENCY_NAME];
++		    $notfound = 0;
++		    last;
++	        }
++            }
++	    $notfound;
++        } @requires;
++    };
++    $media->traverse_headers($index);
++    foreach my $require (@requires) {
++	    push (@errors, "Unresolved dep on " . $require->[Youri::Package::DEPENDENCY_NAME]);
++    }
++    return @errors;
++}
++
++sub run {
++    my ($self, $package, $repository, $target, $define) = @_;
++    croak "Not a class method" unless ref $self;
++
++    # FIXME Define some Youri::Media with allowed_deps in the config and
++    # match target + section to a media
++    my $section = $repository->_get_section($package, $target, $define);
++    return unless $target eq "cauldron" && $section eq 'core/release';
++
++    my @requires = $package->get_requires();
++    
++    my $path = $repository->get_install_root() . "/" . $target;
++    # FIXME we need dependencies on all archs except for ExclusiveArch
++    my $arch = 'i586';
++#    foreach my $arch ($repository->get_extra_arches()) {
++        my $media = new Youri::Media::URPM(name => "core.".$arch,
++                                           type => "binary",
++					   hdlist => "$path/$arch/media/$section/media_info/hdlist.cz");
++    return resolvedep($media, @requires);
++#    }
++
++}
++
++=head1 COPYRIGHT AND LICENSE
++
++Copyright (C) 2011, YOURI project
++
++This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.
++
++=cut
++
++1;
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/71753e02/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110122/71753e02/attachment-0001.html new file mode 100644 index 000000000..de0a7bfb6 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/71753e02/attachment-0001.html @@ -0,0 +1,153 @@ + + + +[337] Add a means to filter out users who arent allowed to reset passwords with only + + + + +
+
+
Revision
337
+
Author
buchan
+
Date
2011-01-22 14:55:56 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Add a means to filter out users who arent allowed to reset passwords with only
+email verification (by default users who don't match (!(objectclass=posixAccount))
+Fix email template to use configurable project url
+ +

Modified Paths

+ + +
+
+Modified: identity/CatDap/trunk/catdap.yml
+===================================================================
+--- identity/CatDap/trunk/catdap.yml	2011-01-22 09:38:25 UTC (rev 336)
++++ identity/CatDap/trunk/catdap.yml	2011-01-22 13:55:56 UTC (rev 337)
+@@ -40,6 +40,7 @@
+                 path:   '/tmp/'
+                 prefix: 'catdap-forgot_password-'
+                 timeout: 259200
++        allow_filter: '(!(objectClass=posixAccount))'
+ 
+ authentication:
+         default_realm: ldap
+
+Modified: identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm
+===================================================================
+--- identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-22 09:38:25 UTC (rev 336)
++++ identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-22 13:55:56 UTC (rev 337)
+@@ -57,28 +57,38 @@
+ 	$c->log->debug("Searching for email $email with filter $emailfilter");
+ 	my $mesg = $c->model('Proxy')->search($emailfilter);
+ 
+-	$c->log->info(printf("Search failed: %s"),$mesg->error)	if ($mesg->code);
++	if ($mesg->code) {
++		$c->log->info(printf("Search failed: %s"),$mesg->error);
++		push @errors, $c->loc('Error while searching for account: ') . $mesg->error;
++	}
+ 	my @entries = $mesg->entries;
+ 	if (@entries != 1) {
+ 		push @errors,$c->loc(
+ 			'This email address is not bound to an account'
+ 		);
+ 	}
++	my $checkfilter = '(&' . $c->config->{'forgot_password'}{'allow_filter'} . 
++	  $emailfilter . ')';
++	$c->log->info(sprintf("Checking if user passes allow_filter $checkfilter"));
++	$mesg = $c->model('Proxy')->search($checkfilter);
++	if ($mesg->code) {
++		$c->log->info(printf("Search failed: %s"),$mesg->error);
++		push @errors, $c->loc('Error while searching for account: ') . $mesg->error;
+ 
++	}
++	my @checkentries = $mesg->entries;
++	if (@entries == 1 and @checkentries != 1) {
++		push @errors,$c->loc(
++			'Privileged accounts may not recover passwords via this mechanism'
++		);
++	}
++
+ 	if (@errors) {
+ 		$c->stash(errors => \@errors);
+ 		$c->stash(template => 'forgot_password/index.tt');
+ 		return;
+ 	}
+ 
+-	if ($mesg->code) {
+-		push @errors,$mesg->error;
+-		$c->log->info( sprintf("finding email $email failed: %s", $mesg->error) );
+-		$c->stash(errors => \@errors);
+-		$c->stash(template => 'register/index.tt');
+-		return;
+-	}
+-
+ 	my $secret = gen_secret($c, $email);
+ 
+ 	$c->stash(
+@@ -89,7 +99,7 @@
+ 			'template'	=> 'forgot_password.tt',
+ 		},
+ 		url => $c->uri_for('/forgot_password/confirm') . "?secret=$secret",
+-		cn => @entries[0]->cn,
++		cn => $entries[0]->cn,
+ 	);
+ 
+ 	$c->log->info("Sending forgot password mail to email address $email");
+
+Modified: identity/CatDap/trunk/root/email/forgot_password.tt
+===================================================================
+--- identity/CatDap/trunk/root/email/forgot_password.tt	2011-01-22 09:38:25 UTC (rev 336)
++++ identity/CatDap/trunk/root/email/forgot_password.tt	2011-01-22 13:55:56 UTC (rev 337)
+@@ -4,4 +4,4 @@
+ [% url %]
+ 
+ --
+-http://mageia.org/
++[% c.config.project_url %]
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/71753e02/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110122/71753e02/attachment.html new file mode 100644 index 000000000..de0a7bfb6 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/71753e02/attachment.html @@ -0,0 +1,153 @@ + + + +[337] Add a means to filter out users who arent allowed to reset passwords with only + + + + +
+
+
Revision
337
+
Author
buchan
+
Date
2011-01-22 14:55:56 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Add a means to filter out users who arent allowed to reset passwords with only
+email verification (by default users who don't match (!(objectclass=posixAccount))
+Fix email template to use configurable project url
+ +

Modified Paths

+ + +
+
+Modified: identity/CatDap/trunk/catdap.yml
+===================================================================
+--- identity/CatDap/trunk/catdap.yml	2011-01-22 09:38:25 UTC (rev 336)
++++ identity/CatDap/trunk/catdap.yml	2011-01-22 13:55:56 UTC (rev 337)
+@@ -40,6 +40,7 @@
+                 path:   '/tmp/'
+                 prefix: 'catdap-forgot_password-'
+                 timeout: 259200
++        allow_filter: '(!(objectClass=posixAccount))'
+ 
+ authentication:
+         default_realm: ldap
+
+Modified: identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm
+===================================================================
+--- identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-22 09:38:25 UTC (rev 336)
++++ identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-22 13:55:56 UTC (rev 337)
+@@ -57,28 +57,38 @@
+ 	$c->log->debug("Searching for email $email with filter $emailfilter");
+ 	my $mesg = $c->model('Proxy')->search($emailfilter);
+ 
+-	$c->log->info(printf("Search failed: %s"),$mesg->error)	if ($mesg->code);
++	if ($mesg->code) {
++		$c->log->info(printf("Search failed: %s"),$mesg->error);
++		push @errors, $c->loc('Error while searching for account: ') . $mesg->error;
++	}
+ 	my @entries = $mesg->entries;
+ 	if (@entries != 1) {
+ 		push @errors,$c->loc(
+ 			'This email address is not bound to an account'
+ 		);
+ 	}
++	my $checkfilter = '(&' . $c->config->{'forgot_password'}{'allow_filter'} . 
++	  $emailfilter . ')';
++	$c->log->info(sprintf("Checking if user passes allow_filter $checkfilter"));
++	$mesg = $c->model('Proxy')->search($checkfilter);
++	if ($mesg->code) {
++		$c->log->info(printf("Search failed: %s"),$mesg->error);
++		push @errors, $c->loc('Error while searching for account: ') . $mesg->error;
+ 
++	}
++	my @checkentries = $mesg->entries;
++	if (@entries == 1 and @checkentries != 1) {
++		push @errors,$c->loc(
++			'Privileged accounts may not recover passwords via this mechanism'
++		);
++	}
++
+ 	if (@errors) {
+ 		$c->stash(errors => \@errors);
+ 		$c->stash(template => 'forgot_password/index.tt');
+ 		return;
+ 	}
+ 
+-	if ($mesg->code) {
+-		push @errors,$mesg->error;
+-		$c->log->info( sprintf("finding email $email failed: %s", $mesg->error) );
+-		$c->stash(errors => \@errors);
+-		$c->stash(template => 'register/index.tt');
+-		return;
+-	}
+-
+ 	my $secret = gen_secret($c, $email);
+ 
+ 	$c->stash(
+@@ -89,7 +99,7 @@
+ 			'template'	=> 'forgot_password.tt',
+ 		},
+ 		url => $c->uri_for('/forgot_password/confirm') . "?secret=$secret",
+-		cn => @entries[0]->cn,
++		cn => $entries[0]->cn,
+ 	);
+ 
+ 	$c->log->info("Sending forgot password mail to email address $email");
+
+Modified: identity/CatDap/trunk/root/email/forgot_password.tt
+===================================================================
+--- identity/CatDap/trunk/root/email/forgot_password.tt	2011-01-22 09:38:25 UTC (rev 336)
++++ identity/CatDap/trunk/root/email/forgot_password.tt	2011-01-22 13:55:56 UTC (rev 337)
+@@ -4,4 +4,4 @@
+ [% url %]
+ 
+ --
+-http://mageia.org/
++[% c.config.project_url %]
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/b30915d0/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110122/b30915d0/attachment-0001.html new file mode 100644 index 000000000..7c60bd4af --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/b30915d0/attachment-0001.html @@ -0,0 +1,76 @@ + + + +[335] Dont detach when checking ldap error code,, we want to continue to set a template + + + + +
+
+
Revision
335
+
Author
buchan
+
Date
2011-01-22 09:52:05 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Dont detach when checking ldap error code,, we want to continue to set a template
+ +

Modified Paths

+ + +
+
+Modified: identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm
+===================================================================
+--- identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-21 18:37:27 UTC (rev 334)
++++ identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-22 08:52:05 UTC (rev 335)
+@@ -177,7 +177,6 @@
+ 	if ($mesg->code) {
+ 		my $perror = $mesg->error;
+ 		push @errors, "Password change failed: $perror";
+-		$c->detach;
+ 	}
+ 
+ 	# if error show confirm page again to retry
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/b30915d0/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110122/b30915d0/attachment.html new file mode 100644 index 000000000..7c60bd4af --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/b30915d0/attachment.html @@ -0,0 +1,76 @@ + + + +[335] Dont detach when checking ldap error code,, we want to continue to set a template + + + + +
+
+
Revision
335
+
Author
buchan
+
Date
2011-01-22 09:52:05 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Dont detach when checking ldap error code,, we want to continue to set a template
+ +

Modified Paths

+ + +
+
+Modified: identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm
+===================================================================
+--- identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-21 18:37:27 UTC (rev 334)
++++ identity/CatDap/trunk/lib/CatDap/Controller/forgot_password.pm	2011-01-22 08:52:05 UTC (rev 335)
+@@ -177,7 +177,6 @@
+ 	if ($mesg->code) {
+ 		my $perror = $mesg->error;
+ 		push @errors, "Password change failed: $perror";
+-		$c->detach;
+ 	}
+ 
+ 	# if error show confirm page again to retry
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/c9c46541/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20110122/c9c46541/attachment-0001.html new file mode 100644 index 000000000..8ebf22736 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/c9c46541/attachment-0001.html @@ -0,0 +1,76 @@ + + + +[878] Enable my new rejection of submits with missing buildrequires + + + + +
+
+
Revision
878
+
Author
pterjan
+
Date
2011-01-22 15:51:40 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Enable my new rejection of submits with missing buildrequires
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/templates/submit-todo.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/submit-todo.conf	2011-01-22 09:48:10 UTC (rev 877)
++++ puppet/modules/buildsystem/templates/submit-todo.conf	2011-01-22 14:51:40 UTC (rev 878)
+@@ -24,6 +24,7 @@
+     cauldron:
+         checks:
+             - source
++            - deps
+             - version
+             #- svn
+             - tag
+
+
+ + + \ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20110122/c9c46541/attachment.html b/zarb-ml/mageia-sysadm/attachments/20110122/c9c46541/attachment.html new file mode 100644 index 000000000..8ebf22736 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20110122/c9c46541/attachment.html @@ -0,0 +1,76 @@ + + + +[878] Enable my new rejection of submits with missing buildrequires + + + + +
+
+
Revision
878
+
Author
pterjan
+
Date
2011-01-22 15:51:40 +0100 (Sat, 22 Jan 2011)
+
+ +

Log Message

+
Enable my new rejection of submits with missing buildrequires
+ +

Modified Paths

+ + +
+
+Modified: puppet/modules/buildsystem/templates/submit-todo.conf
+===================================================================
+--- puppet/modules/buildsystem/templates/submit-todo.conf	2011-01-22 09:48:10 UTC (rev 877)
++++ puppet/modules/buildsystem/templates/submit-todo.conf	2011-01-22 14:51:40 UTC (rev 878)
+@@ -24,6 +24,7 @@
+     cauldron:
+         checks:
+             - source
++            - deps
+             - version
+             #- svn
+             - tag
+
+
+ + + \ No newline at end of file -- cgit v1.2.1