dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Captcha in progress (#595)

Browse Source
This commit is contained in:
Xavier Guimard 2017-01-25 11:11:48 +00:00
parent 82acb3024d
commit 5fb44d05a2
11 changed files with 66 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Captcha.pm
View File

@ -35,7 +35,7 @@ has ott => (
} }
); );
# Returns secret + a HTML <img> tag with embedded image # Returns secret + a HTML image src content
sub getCaptcha { sub getCaptcha {
my ($self) = @_; my ($self) = @_;
my $image = GD::SecurityImage->new( my $image = GD::SecurityImage->new(
@ -49,8 +49,7 @@ sub getCaptcha {
$image->random; $image->random;
$image->create( 'normal', 'default', $self->fgColor, $self->bgColor ); $image->create( 'normal', 'default', $self->fgColor, $self->bgColor );
my ( $imageData, $mimeType, $rdm ) = $image->out( force => 'png' ); my ( $imageData, $mimeType, $rdm ) = $image->out( force => 'png' );
my $img = '<img src="data:image/png;base64,' my $img = 'data:image/png;base64,' . encode_base64( $imageData, '' );
. encode_base64( $imageData, '' ) . '">';
my $token = $self->ott->createToken( { captcha => $rdm } ); my $token = $self->ott->createToken( { captcha => $rdm } );
return ( $token, $img ); return ( $token, $img );
} }
@ -63,7 +62,8 @@ sub validateCaptcha {
return 0; return 0;
} }
unless ( $s->{captcha} == $value ) { unless ( $s->{captcha} == $value ) {
$self->lmLog( 'Bad captcha response', 'notice' ) return 0; $self->lmLog( 'Bad captcha response', 'notice' );
return 0;
} }
$self->lmLog( 'Good captcha response', 'debug' ); $self->lmLog( 'Good captcha response', 'debug' );
return 1; return 1;

12
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
View File

@ -182,12 +182,16 @@ sub display {
); );
# Display captcha if it's enabled # Display captcha if it's enabled
if ( $self->{captcha_login_enabled} ) { if ( $req->captcha ) {
%templateParams = ( %templateParams = (
%templateParams, %templateParams,
CAPTCHA_IMG => $req->{captcha_img}, CAPTCHA_SRC => $req->captcha,
CAPTCHA_CODE => $req->{captcha_code}, );
CAPTCHA_SIZE => $req->{captcha_size} }
if ( $req->token ) {
%templateParams = (
%templateParams,
TOKEN => $req->token,
); );
} }

10
lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
View File

@ -25,15 +25,17 @@
<input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required /> <input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required />
</div> </div>
<TMPL_IF NAME=CAPTCHA_IMG> <TMPL_IF NAME=CAPTCHA_SRC>
<div class="form-group"> <div class="form-group">
<img src="<TMPL_VAR NAME=CAPTCHA_IMG>" class="img-thumbnail" /> <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" class="img-thumbnail" />
</div> </div>
<div class="form-group input-group"> <div class="form-group input-group">
<span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span> <span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span>
<input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required /> <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
</div> </div>
<input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /> </TMPL_IF>
<TMPL_IF NAME="TOKEN">
<input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
</TMPL_IF> </TMPL_IF>
<button type="submit" class="btn btn-success" > <button type="submit" class="btn btn-success" >

10
lemonldap-ng-portal/site/templates/bootstrap/register.tpl
View File

@ -33,15 +33,17 @@
<input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required /> <input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required />
</div> </div>
<TMPL_IF NAME=CAPTCHA_IMG> <TMPL_IF NAME=CAPTCHA_SRC>
<div class="form-group"> <div class="form-group">
<img src="<TMPL_VAR NAME=CAPTCHA_IMG>" class="img-thumbnail" /> <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" class="img-thumbnail" />
</div> </div>
<div class="form-group input-group"> <div class="form-group input-group">
<span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span> <span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span>
<input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required /> <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
</div> </div>
<input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /> </TMPL_IF>
<TMPL_IF NAME="TOKEN">
<input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
</TMPL_IF> </TMPL_IF>
<button type="submit" class="btn btn-success" > <button type="submit" class="btn btn-success" >

10
lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
View File

@ -9,15 +9,17 @@
<input name="password" type="password" class="form-control" trplaceholder="password" required /> <input name="password" type="password" class="form-control" trplaceholder="password" required />
</div> </div>
<TMPL_IF NAME=CAPTCHA_IMG> <TMPL_IF NAME=CAPTCHA_SRC>
<div class="form-group"> <div class="form-group">
<img src="<TMPL_VAR NAME=CAPTCHA_IMG>" class="img-thumbnail" /> <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" class="img-thumbnail" />
</div> </div>
<div class="form-group input-group"> <div class="form-group input-group">
<span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span> <span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span>
<input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required /> <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
</div> </div>
<input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /> </TMPL_IF>
<TMPL_IF NAME="TOKEN">
<input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
</TMPL_IF> </TMPL_IF>
<TMPL_INCLUDE NAME="checklogins.tpl"> <TMPL_INCLUDE NAME="checklogins.tpl">

10
lemonldap-ng-portal/site/templates/impact/mail.tpl
View File

@ -23,15 +23,17 @@
<th><span trspan="mail">Mail</span></th> <th><span trspan="mail">Mail</span></th>
<td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" /></td> <td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" /></td>
</tr> </tr>
<TMPL_IF NAME=CAPTCHA_IMG> <TMPL_IF NAME=CAPTCHA_SRC>
<tr><td></td><td> <tr><td></td><td>
<img src="<TMPL_VAR NAME=CAPTCHA_IMG>" /> <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" />
</td></tr> </td></tr>
<tr><th><span trspan="captcha">Captcha</span></th> <tr><th><span trspan="captcha">Captcha</span></th>
<td><input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /> <td><input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /></td>
<input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /></td>
</tr> </tr>
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="TOKEN">
<input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
</TMPL_IF>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div class="buttons"> <div class="buttons">

10
lemonldap-ng-portal/site/templates/impact/register.tpl
View File

@ -31,15 +31,17 @@
<th><span trspan="mail">Mail</span></th> <th><span trspan="mail">Mail</span></th>
<td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" /></td> <td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" /></td>
</tr> </tr>
<TMPL_IF NAME=CAPTCHA_IMG> <TMPL_IF NAME=CAPTCHA_SRC>
<tr><td></td><td> <tr><td></td><td>
<img src="<TMPL_VAR NAME=CAPTCHA_IMG>" /> <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" />
</td></tr> </td></tr>
<tr><th><span trspan="captcha">Captcha</span></th> <tr><th><span trspan="captcha">Captcha</span></th>
<td><input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /> <td><input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /></td>
<input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /></td>
</tr> </tr>
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="TOKEN">
<input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
</TMPL_IF>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<div class="buttons"> <div class="buttons">

10
lemonldap-ng-portal/site/templates/impact/standardform.tpl
View File

@ -7,16 +7,18 @@
<input name="password" type="password" tabindex="2" /><br/> <input name="password" type="password" tabindex="2" /><br/>
</p> </p>
<TMPL_IF NAME=CAPTCHA_IMG> <TMPL_IF NAME=CAPTCHA_SRC>
<p> <p>
<img src="<TMPL_VAR NAME=CAPTCHA_IMG>" /> <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" />
</p> </p>
<p> <p>
<span class="text-label"><span trspan="captcha">Captcha</span></span><br /> <span class="text-label"><span trspan="captcha">Captcha</span></span><br />
<input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" tabindex="3" /><br /> <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" tabindex="3" /><br />
<input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" />
</p> </p>
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="TOKEN">
<input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
</TMPL_IF>
<TMPL_IF NAME="CHECK_LOGINS"> <TMPL_IF NAME="CHECK_LOGINS">
<p> <p>

10
lemonldap-ng-portal/site/templates/pastel/mail.tpl
View File

@ -25,15 +25,17 @@
<td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">"/></td> <td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">"/></td>
</tr> </tr>
<TMPL_IF NAME=CAPTCHA_IMG> <TMPL_IF NAME=CAPTCHA_SRC>
<tr><td></td><td> <tr><td></td><td>
<img src="<TMPL_VAR NAME=CAPTCHA_IMG>" /> <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" />
</td></tr> </td></tr>
<tr><th><span trspan="captcha">Captcha</span></th> <tr><th><span trspan="captcha">Captcha</span></th>
<td><input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /> <td><input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /></td>
<input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /></td>
</tr> </tr>
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="TOKEN">
<input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
</TMPL_IF>
<tr><td colspan="2"> <tr><td colspan="2">
<div class="buttons"> <div class="buttons">

10
lemonldap-ng-portal/site/templates/pastel/register.tpl
View File

@ -35,15 +35,17 @@
<td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">"/></td> <td><input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">"/></td>
</tr> </tr>
<TMPL_IF NAME=CAPTCHA_IMG> <TMPL_IF NAME=CAPTCHA_SRC>
<tr><td></td><td> <tr><td></td><td>
<img src="<TMPL_VAR NAME=CAPTCHA_IMG>" /> <img src="<TMPL_VAR NAME=CAPTCHA_SRC>" />
</td></tr> </td></tr>
<tr><th><span trspan="captcha">Captcha</span></th> <tr><th><span trspan="captcha">Captcha</span></th>
<td><input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /> <td><input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" /></td>
<input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /></td>
</tr> </tr>
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="TOKEN">
<input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
</TMPL_IF>
<tr><td colspan="2"> <tr><td colspan="2">
<div class="buttons"> <div class="buttons">

10
lemonldap-ng-portal/site/templates/pastel/standardform.tpl
View File

@ -8,15 +8,17 @@
<td><input name="password" type="password" tabindex="2" /></td> <td><input name="password" type="password" tabindex="2" /></td>
</tr> </tr>
<TMPL_IF NAME=CAPTCHA_IMG> <TMPL_IF NAME="CAPTCHA_SRC">
<tr><td></td><td> <tr><td></td><td>
<img src="<TMPL_VAR NAME=CAPTCHA_IMG>" /> <img src="<TMPL_VAR NAME="CAPTCHA_SRC">" />
</td></tr> </td></tr>
<tr><th><span trspan="captcha">Captcha</span></th> <tr><th><span trspan="captcha">Captcha</span></th>
<td><input type="text" name="captcha_user_code" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" tabindex="3" /> <td><input type="text" name="captcha" size="<TMPL_VAR NAME="CAPTCHA_SIZE">" tabindex="3" /></td>
<input type="hidden" name="captcha_code" value="<TMPL_VAR NAME=CAPTCHA_CODE>" /></td>
</tr> </tr>
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="TOKEN">
<input type!"hidden" name="token" value="<TMPL_IF NAME="TOKEN">" />
</TMPL_IF>
<TMPL_IF NAME="CHECK_LOGINS"> <TMPL_IF NAME="CHECK_LOGINS">
<tr><td colspan="2"><div class="buttons"> <tr><td colspan="2"><div class="buttons">