diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c02aff42..3ddd5304 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,26 +5,28 @@ jobs: test: strategy: matrix: - python-version: [3.7, '3.10'] + python-version: ['3.9', '3.11'] os: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} timeout-minutes: 30 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Cache for pip - uses: actions/cache@v1 + uses: actions/cache@v4 id: cache-pip with: path: ~/.cache/pip key: ${{ matrix.os }}-cache-pip - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies & Test run: | + pip install --upgrade pip + pip install --upgrade setuptools pip install --upgrade -r requirements.txt python setup.py install - python test.py + python test.py \ No newline at end of file diff --git a/pocsuite3/__init__.py b/pocsuite3/__init__.py index ff2d7367..ef74089b 100644 --- a/pocsuite3/__init__.py +++ b/pocsuite3/__init__.py @@ -1,5 +1,5 @@ __title__ = 'pocsuite3' -__version__ = '2.0.8' +__version__ = '2.0.9' __author__ = 'Knownsec 404 Team' __author_email__ = '404-team@knownsec.com' __license__ = 'GPLv2' diff --git a/pocsuite3/lib/controller/controller.py b/pocsuite3/lib/controller/controller.py index 80563caf..b0055950 100644 --- a/pocsuite3/lib/controller/controller.py +++ b/pocsuite3/lib/controller/controller.py @@ -136,8 +136,13 @@ def task_run(): else: logger.warn("No libpcap is detected, and the poc will continue to execute without fetching the packet") conf.pcap = False + info_msg = "running poc:'{0}' target '{1}'".format( + poc_name, + mosaic(target) + ) - info_msg = "running poc:'{0}' target '{1}'".format(poc_name, mosaic(target)) + if len(kb.targets) > 1: + info_msg += ", {0} tasks waiting to be executed.".format(kb.task_queue.qsize()) logger.info(info_msg) diff --git a/pocsuite3/plugins/html_report.py b/pocsuite3/plugins/html_report.py index cc86492c..b887ba83 100644 --- a/pocsuite3/plugins/html_report.py +++ b/pocsuite3/plugins/html_report.py @@ -86,11 +86,36 @@ def _writer_footer(self): self.html.addcontent('{0}'.format(text)) self.html.div.close() self.html.footer.close() + self.html.addcontent('') + self.html.addcontent('') + self.html.body.close() self.html.html.close() def write_results(self, results=None): if results: + self.html.addcontent('') + self.html.addcontent('') self.html.addcontent('
Target | ' @@ -99,29 +124,41 @@ def write_results(self, results=None): 'Component | ' 'Version | ' 'Status | ' + 'Extra | ' '||
---|---|---|---|---|---|---|
{1} | ' - '{2} | ' - '{4} | ' - '{5} | ' - '{6} | ' - '{7} | ' - '|
{1} | ' - '{2} | ' - '{4} | ' - '{5} | ' - '{6} | ' - '{7} | ' - '|
{1} | ' + '{2} | ' + '{4} | ' + '{5} | ' + '{6} | ' + '{7} | ' + '{8} | ' + '
{1} | ' + '{2} | ' + '{4} | ' + '{5} | ' + '{6} | ' + '{7} | ' + '{8} | ' + '