kallithea Changeset - ecc566f8b69f

Changeset - ecc566f8b69f

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Marcin Kuzminski - 15 years ago 2010-11-14 19:57:14
marcin@python-works.com

fixes #59, notifications for user registrations + some changes to mailer

6 files changed with 62 insertions and 16 deletions:

production.ini

rhodecode/config/deployment.ini_tmpl

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/smtp_mailer.py

rhodecode/lib/utils.py

rhodecode/model/user.py

0 comments (0 inline, 0 general)

production.ini

➞

Show inline comments

@@ @@ -19,12 +19,13 @@ debug = true @@
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 [server:main]
 ##nr of threads to spawn
 threadpool_workers = 5
 ##max request before thread respawn

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -19,12 +19,13 @@ debug = true @@
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 [server:main]
 ##nr of threads to spawn
 threadpool_workers = 5
 ##max request before thread respawn

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -227,21 +227,37 @@ def reset_user_password(user_email): @@
         log.error('Failed to update user password')
         log.error(traceback.format_exc())
     return True
 @task
 def send_email(recipients, subject, body):
     """
     Sends an email with defined parameters from the .ini files.
     :param recipients: list of recipients, it this is empty the defined email
         address from field 'email_to' is used instead
     :param subject: subject of the mail
     :param body: body of the mail
     """
     log = send_email.get_logger()
     email_config = dict(config.items('DEFAULT'))
     if not recipients:
         recipients = [email_config.get('email_to')]
     def str2bool(v):
         return v.lower() in ["yes", "true", "t", "1"]
     mail_from = email_config.get('app_email_from')
     user = email_config.get('smtp_username')
     passwd = email_config.get('smtp_password')
     mail_server = email_config.get('smtp_server')
     mail_port = email_config.get('smtp_port')
     tls = email_config.get('smtp_use_tls')
     ssl = False
     tls = str2bool(email_config.get('smtp_use_tls'))
     ssl = str2bool(email_config.get('smtp_use_ssl'))
     try:
         m = SmtpMailer(mail_from, user, passwd, mail_server,
                        mail_port, ssl, tls)
         m.send(recipients, subject, body)
     except:

rhodecode/lib/smtp_mailer.py

➞

Show inline comments

@@ @@ -19,38 +19,38 @@ class SmtpMailer(object): @@
     :param attachment_files is a dict of {filename:location}
     it tries to guess the mimetype and attach the file
     """
     def __init__(self, mail_from, user, passwd, mail_server,
                     mail_port=None, ssl=False, tls=False):
         self.mail_from = mail_from
         self.mail_server = mail_server
         self.mail_port = mail_port
         self.user = user
         self.passwd = passwd
         self.ssl = ssl
         self.tls = tls
         self.debug = False
     def send(self, recipients=[], subject='', body='', attachment_files={}):
         if isinstance(recipients, basestring):
             recipients = [recipients]
         if self.ssl:
             smtp_serv = smtplib.SMTP_SSL(self.mail_server, self.mail_port)
         else:
             smtp_serv = smtplib.SMTP(self.mail_server, self.mail_port)
         if self.tls:
             smtp_serv.starttls()
         if self.debug:
         if self.debug:
             smtp_serv.set_debuglevel(1)
         smtp_serv.ehlo("mailer")
+        smtp_serv.ehlo("rhodecode mailer")
         #if server requires authorization you must provide login and password
         smtp_serv.login(self.user, self.passwd)
         date_ = formatdate(localtime=True)
         msg = MIMEMultipart()
@@ @@ -79,33 +79,33 @@ class SmtpMailer(object): @@
                     # No guess could be made, or the file is encoded (compressed), so
                     # use a generic bag-of-bits type.
                     ctype = 'application/octet-stream'
                 maintype, subtype = ctype.split('/', 1)
                 if maintype == 'text':
                     # Note: we should handle calculating the charset
-                    file_part = MIMEText(self.get_content(msg_file),
                     file_part = MIMEText(self.get_content(msg_file),
                                          _subtype=subtype)
                 elif maintype == 'image':
-                    file_part = MIMEImage(self.get_content(msg_file),
                     file_part = MIMEImage(self.get_content(msg_file),
                                           _subtype=subtype)
                 elif maintype == 'audio':
-                    file_part = MIMEAudio(self.get_content(msg_file),
                     file_part = MIMEAudio(self.get_content(msg_file),
                                           _subtype=subtype)
                 else:
                     file_part = MIMEBase(maintype, subtype)
                     file_part.set_payload(self.get_content(msg_file))
                     # Encode the payload using Base64
                     encoders.encode_base64(msg)
                 # Set the filename parameter
-                file_part.add_header('Content-Disposition', 'attachment',
                 file_part.add_header('Content-Disposition', 'attachment',
                                      filename=f_name)
                 file_part.add_header('Content-Type', ctype, name=f_name)
                 msg.attach(file_part)
         else:
             raise Exception('Attachment files should be'
                             'a dict in format {"filename":"filepath"}')
             raise Exception('Attachment files should be'
                             'a dict in format {"filename":"filepath"}')
     def get_content(self, msg_file):
         '''
         Get content based on type, if content is a string do open first
         else just read because it's a probably open file object
         :param msg_file:

rhodecode/lib/utils.py

➞

Show inline comments

@@ @@ -65,15 +65,24 @@ def is_git(environ): @@
     """
     http_user_agent = environ.get('HTTP_USER_AGENT')
     if http_user_agent and http_user_agent.startswith('git'):
         return True
     return False
 def action_logger(user, action, repo, ipaddr, sa=None):
+def action_logger(user, action, repo, ipaddr='', sa=None):
     """
     Action logger for various action made by users
     :param user: user that made this action, can be a string unique username or
         object containing user_id attribute
     :param action: action to log, should be on of predefined unique actions for
         easy translations
     :param repo: repository that action was made on
     :param ipaddr: optional ip address from what the action was made
     :param sa: optional sqlalchemy session
     """
     if not sa:
         sa = meta.Session()
     try:
@@ @@ -81,18 +90,28 @@ def action_logger(user, action, repo, ip @@
             user_obj = user
         elif isinstance(user, basestring):
             user_obj = UserModel(sa).get_by_username(user, cache=False)
         else:
             raise Exception('You have to provide user object or username')
         repo_name = repo.lstrip('/')
         if repo:
             repo_name = repo.lstrip('/')
             repository = RepoModel(sa).get(repo_name, cache=False)
             if not repository:
                 raise Exception('You have to provide valid repository')
         else:
             raise Exception('You have to provide repository to action logger')
         user_log = UserLog()
         user_log.user_id = user_obj.user_id
         user_log.action = action
         user_log.repository_name = repo_name
-        user_log.repository = RepoModel(sa).get(repo_name, cache=False)
+        user_log.repository = repository
         user_log.action_date = datetime.datetime.now()
         user_log.user_ip = ipaddr
         sa.add(user_log)
         sa.commit()
         log.info('Adding user %s, action %s on %s',

rhodecode/model/user.py

➞

Show inline comments

@@ @@ -69,20 +69,29 @@ class UserModel(object): @@
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
     def create_registration(self, form_data):
         from rhodecode.lib.celerylib import tasks, run_task
         try:
             new_user = User()
             for k, v in form_data.items():
                 if k != 'admin':
                     setattr(new_user, k, v)
             self.sa.add(new_user)
             self.sa.commit()
             body = ('New user registration\n'
                     'username: %s\n'
                     'email: %s\n')
             body = body % (form_data['username'], form_data['email'])
             run_task(tasks.send_email, None,
                      _('[RhodeCode] New User registration'),
                      body)
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
     def update(self, user_id, form_data):

0 comments (0 inline, 0 general)