darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 15:46:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use new email validation.

Browse Source 
Use logger.exception where it makes sense, not for SqlAlchemy errors as it give too much information away.
This commit is contained in:
Rebecca Law
2016-03-08 15:47:35 +00:00
parent cbc585a1b1
commit 29a7289d1e
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/celery/tasks.py
View File

@@ -197,7 +197,7 @@ def send_sms_code(encrypted_verification):
try: try:
firetext_client.send_sms(verification_message['to'], verification_message['secret_code']) firetext_client.send_sms(verification_message['to'], verification_message['secret_code'])
except FiretextClientException as e: except FiretextClientException as e:
current_app.logger.error(e) current_app.logger.exception(e)
@notify_celery.task(name='send-email-code') @notify_celery.task(name='send-email-code')
@@ -209,7 +209,7 @@ def send_email_code(encrypted_verification_message):
"Verification code", "Verification code",
verification_message['secret_code']) verification_message['secret_code'])
except AwsSesClientException as e: except AwsSesClientException as e:
current_app.logger.error(e) current_app.logger.exception(e)
# TODO: when placeholders in templates work, this will be a real template # TODO: when placeholders in templates work, this will be a real template
@@ -251,7 +251,7 @@ def email_invited_user(encrypted_invitation):
subject_line, subject_line,
invitation_content) invitation_content)
except AwsSesClientException as e: except AwsSesClientException as e:
current_app.logger.error(e) current_app.logger.exception(e)
def password_reset_message(name, url): def password_reset_message(name, url):
@@ -274,4 +274,4 @@ def email_reset_password(encrypted_reset_password_message):
password_reset_message(name=reset_password_message['name'], password_reset_message(name=reset_password_message['name'],
url=reset_password_message['reset_password_url'])) url=reset_password_message['reset_password_url']))
except AwsSesClientException as e: except AwsSesClientException as e:
current_app.logger.error(e) current_app.logger.exception(e)

2
app/errors.py
View File

@@ -41,7 +41,7 @@ def register_errors(blueprint):
@blueprint.app_errorhandler(500) @blueprint.app_errorhandler(500)
def internal_server_error(e): def internal_server_error(e):
if isinstance(e, str): if isinstance(e, str):
current_app.logger.error(e) current_app.logger.exception(e)
elif isinstance(e, Exception): elif isinstance(e, Exception):
current_app.logger.exception(e) current_app.logger.exception(e)
return jsonify(result='error', message="Internal server error"), 500 return jsonify(result='error', message="Internal server error"), 500

9
app/schemas.py
View File

@@ -1,9 +1,8 @@
import re
from flask_marshmallow.fields import fields from flask_marshmallow.fields import fields
from . import ma from . import ma
from . import models from . import models
from app.dao.permissions_dao import permission_dao from app.dao.permissions_dao import permission_dao
from marshmallow import (post_load, ValidationError, validates, validates_schema) from marshmallow import (post_load, ValidationError, validates)
from marshmallow_sqlalchemy import field_for from marshmallow_sqlalchemy import field_for
from utils.recipients import ( from utils.recipients import (
validate_email_address, InvalidEmailError, validate_email_address, InvalidEmailError,
@@ -202,8 +201,10 @@ class EmailDataSchema(ma.Schema):
email = fields.Str(required=False) email = fields.Str(required=False)
@validates('email') @validates('email')
def validate_to(self, value): def validate_email(self, value):
if not email_regex.match(value): try:
validate_email_address(value)
except InvalidEmailError:
raise ValidationError('Invalid email') raise ValidationError('Invalid email')
user_schema = UserSchema() user_schema = UserSchema()