|
38 | 38 |
|
39 | 39 |
|
40 | 40 | __author__ = 'noptrix' |
41 | | -__version__ = '1.3.3' |
| 41 | +__version__ = '1.3.4' |
42 | 42 | __copyright = 'santa clause' |
43 | 43 | __license__ = 'MIT' |
44 | 44 |
|
@@ -483,30 +483,22 @@ def run_threads(host, ports, val='single'): |
483 | 483 | e.submit(crack_login, host, port, opts['user'], opts['pass']) |
484 | 484 |
|
485 | 485 | with ThreadPoolExecutor(opts['lthreads']) as exe: |
486 | | - if 'userlist' in opts: |
487 | | - uf = open(opts['userlist'], 'r', encoding='latin-1') |
488 | | - if 'passlist' in opts: |
489 | | - pf = open(opts['passlist'], 'r', encoding='latin-1') |
490 | | - if 'combolist' in opts: |
491 | | - cf = open(opts['combolist'], 'r', encoding='latin-1') |
492 | | - |
493 | 486 | if 'userlist' in opts and 'passlist' in opts: |
494 | | - for u in uf: |
495 | | - pf = open(opts['passlist'], 'r', encoding='latin-1') |
496 | | - for p in pf: |
| 487 | + for u in opts['userlist']: |
| 488 | + for p in opts['passlist']: |
497 | 489 | exe.submit(crack_login, host, port, u.rstrip(), p.rstrip()) |
498 | 490 | pf.close() |
499 | 491 |
|
500 | 492 | if 'userlist' in opts and 'passlist' not in opts: |
501 | | - for u in uf: |
| 493 | + for u in opts['userlist']: |
502 | 494 | exe.submit(crack_login, host, port, u.rstrip(), opts['pass']) |
503 | 495 |
|
504 | 496 | if 'passlist' in opts and 'userlist' not in opts: |
505 | | - for p in pf: |
| 497 | + for p in opts['passlist']: |
506 | 498 | exe.submit(crack_login, host, port, opts['user'], p.rstrip()) |
507 | 499 |
|
508 | 500 | if 'combolist' in opts: |
509 | | - for line in cf: |
| 501 | + for line in opts['combolist']: |
510 | 502 | try: |
511 | 503 | l = line.split(':') |
512 | 504 | exe.submit(crack_login, host, port, l[0].rstrip(), l[1].rstrip()) |
|
0 commit comments