Require CAPTCHA for password recovery
https://jira.coreos.com/browse/QS-79
This commit is contained in:
parent
927d469db0
commit
a204dc20fb
3 changed files with 47 additions and 1 deletions
|
@ -806,6 +806,10 @@ class Recovery(ApiResource):
|
||||||
'type': 'string',
|
'type': 'string',
|
||||||
'description': 'The user\'s email address',
|
'description': 'The user\'s email address',
|
||||||
},
|
},
|
||||||
|
'recaptcha_response': {
|
||||||
|
'type': 'string',
|
||||||
|
'description': 'The (may be disabled) recaptcha response code for verification',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -826,7 +830,21 @@ class Recovery(ApiResource):
|
||||||
|
|
||||||
return v
|
return v
|
||||||
|
|
||||||
email = request.get_json()['email']
|
recovery_data = request.get_json()
|
||||||
|
|
||||||
|
# If recaptcha is enabled, then verify the user is a human.
|
||||||
|
if features.RECAPTCHA:
|
||||||
|
recaptcha_response = recovery_data.get('recaptcha_response', '')
|
||||||
|
result = recaptcha2.verify(app.config['RECAPTCHA_SECRET_KEY'],
|
||||||
|
recaptcha_response,
|
||||||
|
request.remote_addr)
|
||||||
|
|
||||||
|
if not result['success']:
|
||||||
|
return {
|
||||||
|
'message': 'Are you a bot? If not, please revalidate the captcha.'
|
||||||
|
}, 400
|
||||||
|
|
||||||
|
email = recovery_data['email']
|
||||||
user = model.user.find_user_by_email(email)
|
user = model.user.find_user_by_email(email)
|
||||||
if not user:
|
if not user:
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -5,4 +5,24 @@
|
||||||
|
|
||||||
.recovery-form-element input {
|
.recovery-form-element input {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.recovery-form-element .captcha {
|
||||||
|
display: block;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.recovery-form-element .captcha div {
|
||||||
|
display: inline-block;
|
||||||
|
margin: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.recovery-form-element .captcha {
|
||||||
|
height: 0px;
|
||||||
|
transition: height ease-in-out 250ms;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.recovery-form-element .captcha.expanded {
|
||||||
|
height: 94px;
|
||||||
}
|
}
|
|
@ -18,6 +18,14 @@
|
||||||
|
|
||||||
<form class="form-signin" ng-submit="sendRecovery()" ng-show="!sent">
|
<form class="form-signin" ng-submit="sendRecovery()" ng-show="!sent">
|
||||||
<input type="text" class="form-control" placeholder="Email" ng-model="recovery.email">
|
<input type="text" class="form-control" placeholder="Email" ng-model="recovery.email">
|
||||||
|
|
||||||
|
<div quay-require="['RECAPTCHA']">
|
||||||
|
<div class="captcha"
|
||||||
|
ng-class="{'expanded': recovery.email}">
|
||||||
|
<div vc-recaptcha ng-model="recovery.recaptcha_response" key="Config.RECAPTCHA_SITE_KEY"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<button class="btn btn-primary btn-block" type="submit">Send Recovery Email</button>
|
<button class="btn btn-primary btn-block" type="submit">Send Recovery Email</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
Reference in a new issue