|
13 | 13 |
|
14 | 14 | from email.mime.text import MIMEText |
15 | 15 |
|
16 | | -TIME = time.strftime("%H:%M:%S", time.gmtime()) |
17 | | -DATE = time.strftime("%d-%m-%Y", time.gmtime()) |
| 16 | +TIME = time.strftime("%H:%M:%S %d-%m-%Y", time.gmtime()) |
18 | 17 |
|
19 | | -SMTP_SERVER = "10.129.121.194" |
| 18 | +SMTP_SERVER = "127.0.0.1" |
20 | 19 | SMTP_PORT = 25 |
21 | 20 | SMTP_TIMEOUT = 30 |
22 | 21 | |
23 | | - |
24 | | -SUBJECT = "Regression test results - started at %s on %s" % (TIME, DATE) |
| 22 | + |
| 23 | +SUBJECT = "Regression test results on on %s" % TIME |
25 | 24 | CONTENT = "" |
| 25 | +TEST_COUNTS = [] |
26 | 26 |
|
27 | 27 | command_line = "cd ../../ ; rm -f $REGRESSION_FILE ; python sqlmap.py --live-test --run-case 'Invalid logic'" |
28 | 28 | proc = subprocess.Popen(command_line, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
29 | 29 | proc.wait() |
30 | 30 | stdout, stderr = proc.communicate() |
31 | | -failed_tests = re.findall("running live test case: (.+?) \(\d+\/\d+\)[\r]*\n.+test failed (.*?)at parsing item: (.+) \- scan folder is (\/.+)[\r]*\n", stdout, re.I | re.M) |
| 31 | +failed_tests = re.findall("running live test case: (.+?) \((\d+)\/\d+\)[\r]*\n(.+?)test failed (.*?)at parsing item: (.+) \- scan folder is (\/.+)[\r]*\n", stdout, re.I | re.M) |
32 | 32 |
|
33 | 33 | for failed_test in failed_tests: |
34 | 34 | title = failed_test[0] |
35 | | - traceback = failed_test[1] or None |
36 | | - parse = failed_test[2] |
37 | | - output_folder = failed_test[3] |
| 35 | + test_count = failed_test[1] |
| 36 | + error = True if "the test did not identify the SQL injection" in failed_test[2] else False |
| 37 | + traceback = failed_test[2] or None |
| 38 | + parse = failed_test[3] |
| 39 | + output_folder = failed_test[4] |
| 40 | + |
| 41 | + TEST_COUNTS.append(test_count) |
38 | 42 |
|
39 | 43 | console_output_fd = codecs.open(os.path.join(output_folder, "console_output"), "rb", "utf8") |
40 | 44 | console_output = console_output_fd.read() |
41 | 45 | console_output_fd.close() |
42 | 46 |
|
43 | | - log_fd = codecs.open(os.path.join(output_folder, "debiandev", "log"), "rb", "utf8") |
44 | | - log = log_fd.read() |
45 | | - log_fd.close() |
| 47 | + if error is False: |
| 48 | + log_fd = codecs.open(os.path.join(output_folder, "debiandev", "log"), "rb", "utf8") |
| 49 | + log = log_fd.read() |
| 50 | + log_fd.close() |
46 | 51 |
|
47 | 52 | if traceback: |
48 | 53 | traceback_fd = codecs.open(os.path.join(output_folder, "traceback"), "rb", "utf8") |
49 | 54 | traceback = traceback_fd.read() |
50 | 55 | traceback_fd.close() |
51 | 56 |
|
52 | 57 | CONTENT += "Failed test case '%s' at parsing: %s:\n\n" % (title, parse) |
53 | | - CONTENT += "### LOG FILE:\n\n" |
54 | | - CONTENT += "%s\n" % log |
55 | | - CONTENT += "### CONSOLE OUTPUT\n\n" |
56 | | - CONTENT += "%s\n" % str(console_output) |
| 58 | + |
| 59 | + if error is False: |
| 60 | + CONTENT += "### LOG FILE:\n\n" |
| 61 | + CONTENT += "%s\n" % log |
| 62 | + else: |
| 63 | + CONTENT += "### CONSOLE OUTPUT\n\n" |
| 64 | + CONTENT += "%s\n" % str(console_output) |
57 | 65 |
|
58 | 66 | if traceback: |
59 | 67 | CONTENT += "### TRACEBACK:\n" |
|
62 | 70 | CONTENT += "\n#######################################\n\n" |
63 | 71 |
|
64 | 72 | if CONTENT: |
| 73 | + SUBJECT += " (%s)" % ", ".join("#%d" % count for count in TEST_COUNTS) |
65 | 74 | msg = MIMEText(CONTENT) |
66 | 75 | msg["Subject"] = SUBJECT |
67 | 76 | msg["From"] = FROM |
68 | 77 | msg["To"] = TO |
69 | 78 |
|
70 | 79 | s = smtplib.SMTP(host=SMTP_SERVER, port=SMTP_PORT, timeout=SMTP_TIMEOUT) |
71 | 80 | #s.set_debuglevel(1) |
72 | | - s.sendmail(FROM, TO, msg) |
| 81 | + s.sendmail(FROM, TO, msg.as_string()) |
73 | 82 | s.quit() |
0 commit comments