Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent send email when request is mirrored. #185

Merged
merged 7 commits into from
Feb 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions biblib/views/permission_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,12 +547,16 @@ def post(self, library):
payload_plain = None

if payload_plain:
current_app.logger.info('Sending email to {0} with payload: {1}'.format(permission_data['email'], payload_plain))
try:
msg = self.send_email(email_addr=permission_data['email'],
payload_plain=payload_plain,
payload_html=payload_html,
email_template=PermissionsChangedEmail)
if not request.headers.get('Host').endswith('shadow'):
current_app.logger.info('Sending email to {0} with payload: {1}'.format(permission_data['email'], payload_plain))
msg = self.send_email(email_addr=permission_data['email'],
payload_plain=payload_plain,
payload_html=payload_html,
email_template=PermissionsChangedEmail)
else:
current_app.logger.info('Skipping sending email to {0} with payload: {1} due to shadowed request.'.format(permission_data['email'], payload_plain))

except:
current_app.logger.warning('Sending email to {0} failed'.format(permission_data['email']))

Expand Down
22 changes: 13 additions & 9 deletions biblib/views/transfer_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,17 +204,21 @@ def post(self, library):
u'\n If this is a mistake, please contact ADS Help ([email protected]). ' \
u'\n - the ADS team'.format(name, library)

current_app.logger.info('Sending email to {0} with payload: {1}'.format(transfer_data['email'], payload_plain))

try:
template = env.get_template('transfer_email.html')
payload_html = template.render(email_address=transfer_data['email'],
lib_name=name,
lib_id=library)
msg = self.send_email(email_addr=transfer_data['email'],
payload_plain=payload_plain,
payload_html=payload_html,
email_template=PermissionsChangedEmail)
if not request.headers.get('Host').endswith('shadow'):
current_app.logger.info('Sending email to {0} with payload: {1}'.format(transfer_data['email'], payload_plain))
template = env.get_template('transfer_email.html')
payload_html = template.render(email_address=transfer_data['email'],
lib_name=name,
lib_id=library)
msg = self.send_email(email_addr=transfer_data['email'],
payload_plain=payload_plain,
payload_html=payload_html,
email_template=PermissionsChangedEmail)
else:
current_app.logger.info('Skipping sending email to {0} with payload: {1} due to shadowed request.'.format(transfer_data['email'], payload_plain))

except:
current_app.logger.warning('Sending email to {0} failed'.format(transfer_data['email']))

Expand Down