refactoring

optimize imports
reformat source code
remove unused cpu and memory log functionality
This commit is contained in:
Milan
2018-08-29 00:10:15 +02:00
parent c37c71f29e
commit 05b1251c1a
81 changed files with 9242 additions and 9962 deletions

View File

@@ -1,4 +1,4 @@
#! /usr/bin/perl -w
#! /usr/bin/perl -w
use warnings "all";
use strict;
@@ -30,99 +30,101 @@ print qq{<!DOCTYPE html>
<body>
};
if ( defined $params->{user}){
sendToken($config, $params);
return;
}else{
my $result=checkToken($config, $params);
return;
if ( defined $params->{user} ) {
sendToken( $config, $params );
return;
} else {
my $result = checkToken( $config, $params );
return;
}
sub sendToken{
my $config=shift;
my $params=shift;
my $entry = password_requests::sendToken($config, { user => $params->{user} });
if (defined $entry){
print "Please check you mails\n"
}else{
print "Sorry\n";
}
sub sendToken {
my $config = shift;
my $params = shift;
my $entry = password_requests::sendToken( $config, { user => $params->{user} } );
if ( defined $entry ) {
print "Please check you mails\n";
} else {
print "Sorry\n";
}
}
sub checkToken{
my $config=shift;
my $params=shift;
sub checkToken {
my $config = shift;
my $params = shift;
my $token = $params->{token};
my $token = $params->{token};
my $entry = password_requests::get($config, { token => $token });
unless (defined $entry){
print "invalid token\n";
return undef;
}
my $entry = password_requests::get( $config, { token => $token } );
unless ( defined $entry ) {
print "invalid token\n";
return undef;
}
print STDERR Dumper($entry);
my $created_at = $entry->{created_at};
unless (defined $created_at){
print "invalid token age\n";
return undef;
}
print STDERR Dumper($entry);
my $created_at = $entry->{created_at};
unless ( defined $created_at ) {
print "invalid token age\n";
return undef;
}
my $age = time() - time::datetime_to_time($created_at);
if ($age > 600) {
print "token is too old\n";
password_requests::delete($config, { token => $token });
return undef;
}
my $age = time() - time::datetime_to_time($created_at);
if ( $age > 600 ) {
print "token is too old\n";
password_requests::delete( $config, { token => $token } );
return undef;
}
$config->{access}->{write} = 1;
$entry->{max_attempts}++;
password_requests::update($config, $entry);
$config->{access}->{write} = 0;
$config->{access}->{write} = 1;
$entry->{max_attempts}++;
password_requests::update( $config, $entry );
$config->{access}->{write} = 0;
if ($entry->{max_attempts}>10){
print "too many failed attempts, please request a new token by mail\n";
password_requests::delete($config, { token => $token });
return undef;
}
if ( $entry->{max_attempts} > 10 ) {
print "too many failed attempts, please request a new token by mail\n";
password_requests::delete( $config, { token => $token } );
return undef;
}
unless ((defined $params->{user_password}) && (defined $params->{user_password2})){
printForm($token);
return undef;
}
if ($params->{action} eq 'change'){
my $user = $entry->{user};
my $request = {
config => $config,
params => { checked => $params }
};
my $result = password_requests::changePassword($config, $request, $user);
unless ( ( defined $params->{user_password} ) && ( defined $params->{user_password2} ) ) {
printForm($token);
return undef;
}
if (defined $result->{error}){
#print "sorry\n";
print $result->{error}."\n";
printForm($token);
}
if ( $params->{action} eq 'change' ) {
my $user = $entry->{user};
my $request = {
config => $config,
params => { checked => $params }
};
my $result = password_requests::changePassword( $config, $request, $user );
if (defined $result->{success}){
#print "success\n";
print $result->{success}."\n";
password_requests::delete($config, { user => $user });
my $url=$config->{locations}->{editor_base_url};
print qq{
if ( defined $result->{error} ) {
#print "sorry\n";
print $result->{error} . "\n";
printForm($token);
}
if ( defined $result->{success} ) {
#print "success\n";
print $result->{success} . "\n";
password_requests::delete( $config, { user => $user } );
my $url = $config->{locations}->{editor_base_url};
print qq{
<script type="text/javascript">
window.location = "$url";
</script>
};
}
}
}
}
}
sub printForm{
my $token=shift;
print qq{
sub printForm {
my $token = shift;
print qq{
<form method="post">
<input type="hidden" name="token" value="$token">
<input type="password" name="user_password" placeholder="enter new password">
@@ -136,7 +138,7 @@ sub printForm{
sub check_params {
my $params = shift;
my $checked = {};
my $checked = {};
#my $template = '';
#$checked->{template} = template::check( $params->{template}, 'requestPassword' );
@@ -147,7 +149,7 @@ sub check_params {
}
$checked->{debug} = $debug;
for my $param ( 'user','token', 'user_password', 'user_password2' ) {
for my $param ( 'user', 'token', 'user_password', 'user_password2' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /\S/ ) ) {
$checked->{$param} = $params->{$param};
}