[vscweb-commit] r437 - in trunk/pyvscd: libvscmt pyssus

[<wi...@bi...>]

Author: wirges
Date: 2006-03-22 18:36:36 -0500 (Wed, 22 Mar 2006)
New Revision: 437

Modified:
   trunk/pyvscd/libvscmt/nessusmt.py
   trunk/pyvscd/pyssus/__init__.py
Log:
Fixed nessusmt library to use email.MIMEText for proper message formattin=
g

Also added imports to __init__.py so pyssus package is more sane




Modified: trunk/pyvscd/libvscmt/nessusmt.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pyvscd/libvscmt/nessusmt.py	2006-03-22 04:03:29 UTC (rev 436)
+++ trunk/pyvscd/libvscmt/nessusmt.py	2006-03-22 23:36:36 UTC (rev 437)
@@ -9,7 +9,7 @@
 import smtplib
 import socket
 import time
-from email.MIMEMultipart import MIMEMultipart
+from email.MIMEText import MIMEText
 from threading import Thread
 from pyssus import *
 from libvscmt import scan,host
@@ -42,10 +42,6 @@
          scan_user =3D linkScanToUser(db, self.scan_id)  =20
          self._dbq.put(db)
          #code to send email
-         remail =3D MIMEMultipart()
-         remail['Subject'] =3D "[Scan #%s] Vulnerability Scan Results" %=
 (self.scan_id)
-         remail['From'] =3D self.config['SYS_EMAIL'] #needs the vsc from=
 addr
-         remail['To'] =3D scan_user['email'] #needs the requester's emai=
l addr
          email_str =3D """%s,=20
      =20
 The scan you requested on %s was started on %s after a delay of %s it fi=
nished in %s.
@@ -60,12 +56,15 @@
              timeDuration(scan_stats['delay']), timeDuration(scan_stats[=
'task']),
              self.config['report_base'], self.scan_id
                )
-         remail.set_payload(email_str)
+         remail =3D MIMEText(email_str)
+         remail['Subject'] =3D "[Scan #%s] Vulnerability Scan Results" %=
 (self.scan_id)
+         remail['From'] =3D self.config['SYS_EMAIL'] #needs the vsc from=
 addr
+         remail['To'] =3D scan_user['email'] #needs the requester's emai=
l addr
      =20
          #send the message
          s =3D smtplib.SMTP()
          s.connect(self.config['smtp_server'])
-         s.sendmail(self.config['SYS_EMAIL'],scan_user['email'], remail.=
as_string())
+         s.sendmail(self.config['SYS_EMAIL'],[scan_user['email']], remai=
l.as_string())
          s.close()
       except Exception, e:
          log.warn("Exception encountered while sending notification!")

Modified: trunk/pyvscd/pyssus/__init__.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/pyvscd/pyssus/__init__.py	2006-03-22 04:03:29 UTC (rev 436)
+++ trunk/pyvscd/pyssus/__init__.py	2006-03-22 23:36:36 UTC (rev 437)
@@ -13,5 +13,9 @@
    Copyright (C) 2005 - Purdue University
=20
 """
-
+import comm
+import commands
+import data
+import handlers
+import message
 __all__ =3D ["comm", "commands", "data", "handlers", "message"]