Merge branch 'master' into newmc

diff --git a/Makefile.PL b/Makefile.PL
index f198fa63baf33155beafdff6d78e35346da5a2b8..796f5d7ee2bf802bf58c8b5512aef5bf95448446 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -27,6 +27,8 @@ WriteMakefile(
                   warnings    0
 
                   CSS::Minifier::XS           0
+                  Email::Simple               0
+                  Email::Sender::Simple       0
                   File::Slurp                 0
                   Gruntmaster::Data           0
                   HTML::Seamstress            0

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 0cb7aabca2fa1b0dd392b33ea74b9f0b29d61900..e0f921df77625ec0f9e9a0cc81b765fdcd876afb 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -279,6 +279,8 @@ website using the following information:
 Username: $_{username}
 Password: <your new password>
 Reset token: $token
+
+The token is valid for 24 hours.
 EOF
                        my $email = Email::Simple->create(
                                header => [
@@ -302,6 +304,7 @@ EOF
                        my $user = db->user($_{username});
                        return reply 'No such user' unless $user;
                        my ($token, $exp) = split ':', $_{token};
+                       return reply 'Reset token is expired' if time >= $exp;
                        return reply 'Bad reset token' unless $user->make_reset_hmac($exp) eq $token;
                        $user->set_passphrase($_{password});
                        reply 'Password reset successfully';