ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Prevent Persona users from setting a password

Browse source
This commit is contained in:
Eelco Dolstra 2013-07-09 12:57:34 +02:00
parent 5fecf8e385
commit 476203d0bb
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/lib/Hydra/Controller/User.pm
View file

@ -10,6 +10,7 @@ use Hydra::Helper::Nix;
use Hydra::Helper::CatalystUtils; use Hydra::Helper::CatalystUtils;
use LWP::UserAgent; use LWP::UserAgent;
use JSON; use JSON;
use HTML::Entities;
__PACKAGE__->config->{namespace} = ''; __PACKAGE__->config->{namespace} = '';
@ -106,7 +107,7 @@ sub persona_login :Path('/persona-login') Args(0) {
$c->set_authenticated($user); $c->set_authenticated($user);
$c->stash->{json}->{result} = "ok"; $c->stash->{json}->{result} = "ok";
$c->flash->{successMsg} = "You are now signed in as <tt>" . $email . "</tt>"; $c->flash->{successMsg} = "You are now signed in as <tt>" . encode_entities($email) . "</tt>";
} }
@ -266,6 +267,7 @@ sub edit_POST {
} }
if (($c->stash->{params}->{submit} // "") eq "reset-password") { if (($c->stash->{params}->{submit} // "") eq "reset-password") {
error($c, "This user's password cannot be reset.") if $user->password eq "!";
$c->stash->{json} = {}; $c->stash->{json} = {};
error($c, "No email address is set for this user.") error($c, "No email address is set for this user.")
unless $user->emailaddress; unless $user->emailaddress;
@ -294,7 +296,7 @@ sub edit_POST {
}); });
my $password = $c->stash->{params}->{password} // ""; my $password = $c->stash->{params}->{password} // "";
if ($password ne "") { if ($user->password ne "!" && $password ne "") {
error($c, "You must specify a password of at least 6 characters.") error($c, "You must specify a password of at least 6 characters.")
unless isValidPassword($password); unless isValidPassword($password);
error($c, "The passwords you specified did not match.") error($c, "The passwords you specified did not match.")
@ -311,6 +313,7 @@ sub edit_POST {
}); });
if ($c->request->looks_like_browser) { if ($c->request->looks_like_browser) {
$c->flash->{successMsg} = "Your preferences have been updated.";
backToReferer($c); backToReferer($c);
} else { } else {
$self->status_no_content($c); $self->status_no_content($c);

2
src/root/user.tt
View file

@ -34,6 +34,7 @@
</div> </div>
</div> </div>
[% IF !create && user.password != '!' %]
<div class="control-group"> <div class="control-group">
<label class="control-label">Password</label> <label class="control-label">Password</label>
<div class="controls"> <div class="controls">
@ -47,6 +48,7 @@
<input type="password" class="span3" name="password2" value=""></input> <input type="password" class="span3" name="password2" value=""></input>
</div> </div>
</div> </div>
[% END %]
<!-- <!--
<div class="control-group"> <div class="control-group">