Revision d59f5608
| b/snf-astakos-app/astakos/im/auth_backends.py | ||
|---|---|---|
| 53 | 53 |
except AstakosUser.DoesNotExist: |
| 54 | 54 |
return None |
| 55 | 55 |
else: |
| 56 |
msg = 'Invalid token during authentication for %s' % email
|
|
| 57 |
logger._log(settings.LOGGING_LEVEL, msg, [])
|
|
| 56 |
msg = 'Invalid token during authentication for %s' |
|
| 57 |
logger.log(settings.LOGGING_LEVEL, msg, email)
|
|
| 58 | 58 |
|
| 59 | 59 |
def get_user(self, user_id): |
| 60 | 60 |
try: |
| ... | ... | |
| 80 | 80 |
if user.check_password(password): |
| 81 | 81 |
return user |
| 82 | 82 |
else: |
| 83 |
msg = 'Invalid password during authentication for %s' % username
|
|
| 84 |
logger._log(settings.LOGGING_LEVEL, msg, [])
|
|
| 83 |
msg = 'Invalid password during authentication for %s' |
|
| 84 |
logger.log(settings.LOGGING_LEVEL, msg, username)
|
|
| 85 | 85 |
|
| 86 | 86 |
|
| 87 | 87 |
def get_user(self, user_id): |
| b/snf-astakos-app/astakos/im/cookie.py | ||
|---|---|---|
| 86 | 86 |
else: |
| 87 | 87 |
cookie_value = quote(user.uuid + '|' + user.auth_token) |
| 88 | 88 |
self.response.set_cookie( |
| 89 |
settings.COOKIE_NAME, value=cookie_value, expires=expire_fmt, path='/',
|
|
| 90 |
domain=settings.COOKIE_DOMAIN, secure=settings.COOKIE_SECURE
|
|
| 91 |
) |
|
| 92 |
msg = str(('Cookie [expiring %s]', 'set for %s')) \
|
|
| 93 |
% (user.auth_token_expires, user.uuid)
|
|
| 94 |
logger._log(settings.LOGGING_LEVEL, msg, [])
|
|
| 89 |
settings.COOKIE_NAME, value=cookie_value, expires=expire_fmt, |
|
| 90 |
path='/', domain=settings.COOKIE_DOMAIN,
|
|
| 91 |
secure=settings.COOKIE_SECURE)
|
|
| 92 |
msg = 'Cookie [expiring %s] set for %s'
|
|
| 93 |
logger.log(settings.LOGGING_LEVEL, msg, user.auth_token_expires,
|
|
| 94 |
user.uuid)
|
|
| 95 | 95 |
|
| 96 | 96 |
def __delete(self): |
| 97 | 97 |
if not self.response: |
| 98 | 98 |
raise ValueError(_(astakos_messages.NO_RESPONSE)) |
| 99 | 99 |
self.response.delete_cookie( |
| 100 | 100 |
settings.COOKIE_NAME, path='/', domain=settings.COOKIE_DOMAIN) |
| 101 |
msg = 'Cookie deleted for %(uuid)s' % self.__dict__
|
|
| 102 |
logger._log(settings.LOGGING_LEVEL, msg, [])
|
|
| 101 |
msg = 'Cookie deleted for %s'
|
|
| 102 |
logger.log(settings.LOGGING_LEVEL, msg, self.uuid)
|
|
| 103 | 103 |
|
| 104 | 104 |
def fix(self, response=None): |
| 105 | 105 |
self.response = response or self.response |
| b/snf-astakos-app/astakos/im/functions.py | ||
|---|---|---|
| 155 | 155 |
send_mail(_(astakos_messages.HELPDESK_NOTIFICATION_EMAIL_SUBJECT) % |
| 156 | 156 |
{'user': user.email},
|
| 157 | 157 |
message, sender, recipient_list, connection=get_connection()) |
| 158 |
msg = 'Sent helpdesk admin notification for %s' % user.email
|
|
| 159 |
logger.log(settings.LOGGING_LEVEL, msg) |
|
| 158 |
msg = 'Sent helpdesk admin notification for %s' |
|
| 159 |
logger.log(settings.LOGGING_LEVEL, msg, user.email)
|
|
| 160 | 160 |
|
| 161 | 161 |
|
| 162 | 162 |
def send_invitation(invitation, template_name='im/invitation.txt'): |
| ... | ... | |
| 175 | 175 |
sender = settings.SERVER_EMAIL |
| 176 | 176 |
send_mail(subject, message, sender, [invitation.username], |
| 177 | 177 |
connection=get_connection()) |
| 178 |
msg = 'Sent invitation %s' % invitation
|
|
| 179 |
logger.log(settings.LOGGING_LEVEL, msg) |
|
| 178 |
msg = 'Sent invitation %s' |
|
| 179 |
logger.log(settings.LOGGING_LEVEL, msg, invitation)
|
|
| 180 | 180 |
inviter_invitations = invitation.inviter.invitations |
| 181 | 181 |
invitation.inviter.invitations = max(0, inviter_invitations - 1) |
| 182 | 182 |
invitation.inviter.save() |
| ... | ... | |
| 199 | 199 |
sender = settings.SERVER_EMAIL |
| 200 | 200 |
send_mail(subject, message, sender, [user.email], |
| 201 | 201 |
connection=get_connection()) |
| 202 |
msg = 'Sent greeting %s' % user.log_display
|
|
| 203 |
logger.log(settings.LOGGING_LEVEL, msg) |
|
| 202 |
msg = 'Sent greeting %s' |
|
| 203 |
logger.log(settings.LOGGING_LEVEL, msg, user.log_display)
|
|
| 204 | 204 |
|
| 205 | 205 |
|
| 206 | 206 |
def send_feedback(msg, data, user, email_template_name='im/feedback_mail.txt'): |
| ... | ... | |
| 213 | 213 |
'user': user}) |
| 214 | 214 |
send_mail(subject, content, from_email, recipient_list, |
| 215 | 215 |
connection=get_connection()) |
| 216 |
msg = 'Sent feedback from %s' % user.log_display
|
|
| 217 |
logger.log(settings.LOGGING_LEVEL, msg) |
|
| 216 |
msg = 'Sent feedback from %s' |
|
| 217 |
logger.log(settings.LOGGING_LEVEL, msg, user.log_display)
|
|
| 218 | 218 |
|
| 219 | 219 |
|
| 220 |
def send_change_email( |
|
| 221 |
ec, request, email_template_name='registration/email_change_email.txt'): |
|
| 220 |
def send_change_email(ec, request, |
|
| 221 |
email_template_name= |
|
| 222 |
'registration/email_change_email.txt'): |
|
| 222 | 223 |
url = ec.get_url() |
| 223 | 224 |
url = request.build_absolute_uri(url) |
| 224 |
c = {'url': url, 'site_name': settings.SITENAME, 'support': settings.CONTACT_EMAIL,
|
|
| 225 |
'ec': ec} |
|
| 225 |
c = {'url': url, 'site_name': settings.SITENAME,
|
|
| 226 |
'support': settings.CONTACT_EMAIL, 'ec': ec}
|
|
| 226 | 227 |
message = render_to_string(email_template_name, c) |
| 227 | 228 |
from_email = settings.SERVER_EMAIL |
| 228 | 229 |
send_mail(_(astakos_messages.EMAIL_CHANGE_EMAIL_SUBJECT), message, |
| 229 | 230 |
from_email, |
| 230 | 231 |
[ec.new_email_address], connection=get_connection()) |
| 231 |
msg = 'Sent change email for %s' % ec.user.log_display
|
|
| 232 |
logger.log(settings.LOGGING_LEVEL, msg) |
|
| 232 |
msg = 'Sent change email for %s' |
|
| 233 |
logger.log(settings.LOGGING_LEVEL, msg, ec.user.log_display)
|
|
| 233 | 234 |
|
| 234 | 235 |
|
| 235 | 236 |
def invite(inviter, email, realname): |
| b/snf-astakos-app/astakos/im/models.py | ||
|---|---|---|
| 126 | 126 |
self.auth_token_expires = expiration_date |
| 127 | 127 |
else: |
| 128 | 128 |
self.auth_token_expires = None |
| 129 |
msg = 'Token renewed for component %s' % self.name
|
|
| 130 |
logger.log(astakos_settings.LOGGING_LEVEL, msg) |
|
| 129 |
msg = 'Token renewed for component %s' |
|
| 130 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, self.name)
|
|
| 131 | 131 |
|
| 132 | 132 |
def __str__(self): |
| 133 | 133 |
return self.name |
| ... | ... | |
| 554 | 554 |
timedelta(hours=astakos_settings.AUTH_TOKEN_DURATION) |
| 555 | 555 |
if flush_sessions: |
| 556 | 556 |
self.flush_sessions(current_key) |
| 557 |
msg = 'Token renewed for %s' % self.log_display
|
|
| 558 |
logger.log(astakos_settings.LOGGING_LEVEL, msg) |
|
| 557 |
msg = 'Token renewed for %s' |
|
| 558 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, self.log_display)
|
|
| 559 | 559 |
|
| 560 | 560 |
def token_expired(self): |
| 561 | 561 |
return self.auth_token_expires < datetime.now() |
| ... | ... | |
| 567 | 567 |
|
| 568 | 568 |
keys = q.values_list('session_key', flat=True)
|
| 569 | 569 |
if keys: |
| 570 |
msg = 'Flushing sessions: %s' % ','.join(keys)
|
|
| 571 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, [])
|
|
| 570 |
msg = 'Flushing sessions: %s' |
|
| 571 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, ','.join(keys))
|
|
| 572 | 572 |
engine = import_module(settings.SESSION_ENGINE) |
| 573 | 573 |
for k in keys: |
| 574 | 574 |
s = engine.SessionStore(k) |
| ... | ... | |
| 1116 | 1116 |
user.email = email_change.new_email_address |
| 1117 | 1117 |
user.save() |
| 1118 | 1118 |
email_change.delete() |
| 1119 |
msg = "User %s changed email from %s to %s" % (user.log_display, |
|
| 1120 |
old_email, |
|
| 1121 |
user.email) |
|
| 1122 |
logger.log(astakos_settings.LOGGING_LEVEL, msg) |
|
| 1119 |
msg = "User %s changed email from %s to %s" |
|
| 1120 |
logger.log(astakos_settings.LOGGING_LEVEL, msg, user.log_display, old_email, user.email) |
|
| 1123 | 1121 |
return user |
| 1124 | 1122 |
except EmailChange.DoesNotExist: |
| 1125 | 1123 |
raise ValueError(_('Invalid activation key.'))
|
Also available in: Unified diff