portune 0.1.3__tar.gz → 0.1.5__tar.gz

{portune-0.1.3/portune.egg-info → portune-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portune
-Version: 0.1.3
+Version: 0.1.5
 Summary: Simple Python HTTP Exec Server
 Author: Franck Jouvanceau
 Maintainer: Franck Jouvanceau
@@ -52,13 +52,19 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
+[![Pypi version](https://img.shields.io/pypi/v/portune.svg)](https://pypi.org/project/portune/)
+![example](https://github.com/joknarf/portune/actions/workflows/python-publish.yml/badge.svg)
+[![Licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://shields.io/)
+[![](https://pepy.tech/badge/portune)](https://pepy.tech/project/portune)
+[![Python versions](https://img.shields.io/badge/python-3.9+-blue.svg)](https://shields.io/)
+
 # portune
 
 Multitreaded port scanner
 
 # features
 
-* parallel check of port availability against server/ports
+* parallel check of port availability against servers/ports
 * console output result / summary
 * html full report / dns domain summary / vlan timeout summary
 * mail with html summary / report attachment (mailhost relay)

portune-0.1.5/README.md

@@ -0,0 +1,17 @@
+[![Pypi version](https://img.shields.io/pypi/v/portune.svg)](https://pypi.org/project/portune/)
+![example](https://github.com/joknarf/portune/actions/workflows/python-publish.yml/badge.svg)
+[![Licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://shields.io/)
+[![](https://pepy.tech/badge/portune)](https://pepy.tech/project/portune)
+[![Python versions](https://img.shields.io/badge/python-3.9+-blue.svg)](https://shields.io/)
+
+# portune
+
+Multitreaded port scanner
+
+# features
+
+* parallel check of port availability against servers/ports
+* console output result / summary
+* html full report / dns domain summary / vlan timeout summary
+* mail with html summary / report attachment (mailhost relay)
+

{portune-0.1.3 → portune-0.1.5}/portune/portune.py

@@ -16,6 +16,7 @@ from __future__ import annotations
 # Standard library imports
 import os
 import sys
+import platform
 import argparse
 import socket
 import threading
@@ -32,13 +33,16 @@ from typing import List, Dict, Tuple, Any, Optional, Union
 
 # Constants and global variables
 ICON = "data:image/svg+xml,%3Csvg height='200px' width='200px' version='1.1' id='Layer_1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 508 508' xml:space='preserve' fill='%23000000'%3E%3Cg id='SVGRepo_bgCarrier' stroke-width='0'%3E%3C/g%3E%3Cg id='SVGRepo_tracerCarrier' stroke-linecap='round' stroke-linejoin='round'%3E%3C/g%3E%3Cg id='SVGRepo_iconCarrier'%3E%3Ccircle style='fill:%23ffbb06;' cx='254' cy='254' r='254'%3E%3C/circle%3E%3Cg%3E%3Ccircle style='fill:%234c4c4c;' cx='399.6' cy='252' r='55.2'%3E%3C/circle%3E%3Ccircle style='fill:%234c4c4c;' cx='150' cy='356' r='55.2'%3E%3C/circle%3E%3Ccircle style='fill:%234c4c4c;' cx='178.4' cy='127.2' r='55.2'%3E%3C/circle%3E%3C/g%3E%3Cpath style='fill:%23000000;' d='M301.2,282.4l15.6,1.2l6.4-19.2l-13.2-8c0.4-5.6,0-11.2-1.2-16.4l12-10l-9.2-18l-15.2,3.6 c-3.6-4-7.6-8-12.4-10.8l1.2-15.6l-19.2-6.4l-8,13.2c-5.6-0.4-11.2,0-16.4,1.2l-10-12l-18,8.8l3.6,15.2c-4,3.6-8,7.6-10.8,12.4 l-15.6-1.2l-6.4,19.2l13.2,8.4c-0.4,5.6,0,11.2,1.2,16.4l-12,10l9.2,18l15.2-3.6c3.6,4,7.6,8,12.4,10.8l-1.6,15.2l19.2,6.4l8.4-13.2 c5.6,0.4,11.2,0,16.4-1.2l10,12l18-8.8l-3.6-15.2C294.4,291.2,298.4,287.2,301.2,282.4z M242.4,286c-18.8-6.4-28.8-26.4-22.8-45.2 c6.4-18.8,26.8-29.2,45.6-22.8c18.8,6.4,28.8,26.4,22.8,45.2C281.6,282,261.2,292.4,242.4,286z'%3E%3C/path%3E%3Cpath style='fill:%23324A5E;' d='M380.4,304c-20.4,50-69.6,85.2-126.8,85.2c-18.8,0-36.8-4-53.6-10.8c-2.4,5.6-5.6,10.4-9.6,14.8 c19.2,8.8,40.8,13.6,63.2,13.6c65.6,0,122-41.2,144.4-99.2C392,307.2,386,306,380.4,304z M132,157.2c-20.4,26-32.8,59.2-32.8,94.8 c0,22.4,4.8,43.6,13.6,62.8c4.4-4,9.2-7.2,14.8-9.6c-6.8-16.4-10.8-34.4-10.8-53.2c0-30.4,10-58.8,27.2-81.6 C139.2,166.8,135.2,162.4,132,157.2z M253.6,97.6c-9.2,0-18.4,0.8-27.6,2.4c2.8,5.2,5.2,10.8,6.4,16.8c6.8-1.2,14-1.6,21.2-1.6 c57.2,0,106.4,35.2,126.8,85.2c5.6-2,11.2-3.2,17.2-3.2C375.6,138.8,319.6,97.6,253.6,97.6z'%3E%3C/path%3E%3Cg%3E%3Ccircle style='fill:%23FF7058;' cx='399.6' cy='252' r='28.4'%3E%3C/circle%3E%3Ccircle style='fill:%23FF7058;' cx='150' cy='356' r='28.4'%3E%3C/circle%3E%3Ccircle style='fill:%23FF7058;' cx='178.4' cy='127.2' r='28.4'%3E%3C/circle%3E%3C/g%3E%3C/g%3E%3C/svg%3E"
+XL='data:image/svg+xml,<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"><path d="M12.5535 16.5061C12.4114 16.6615 12.2106 16.75 12 16.75C11.7894 16.75 11.5886 16.6615 11.4465 16.5061L7.44648 12.1311C7.16698 11.8254 7.18822 11.351 7.49392 11.0715C7.79963 10.792 8.27402 10.8132 8.55352 11.1189L11.25 14.0682V3C11.25 2.58579 11.5858 2.25 12 2.25C12.4142 2.25 12.75 2.58579 12.75 3V14.0682L15.4465 11.1189C15.726 10.8132 16.2004 10.792 16.5061 11.0715C16.8118 11.351 16.833 11.8254 16.5535 12.1311L12.5535 16.5061Z" fill="%23eee"></path><path d="M3.75 15C3.75 14.5858 3.41422 14.25 3 14.25C2.58579 14.25 2.25 14.5858 2.25 15V15.0549C2.24998 16.4225 2.24996 17.5248 2.36652 18.3918C2.48754 19.2919 2.74643 20.0497 3.34835 20.6516C3.95027 21.2536 4.70814 21.5125 5.60825 21.6335C6.47522 21.75 7.57754 21.75 8.94513 21.75H15.0549C16.4225 21.75 17.5248 21.75 18.3918 21.6335C19.2919 21.5125 20.0497 21.2536 20.6517 20.6516C21.2536 20.0497 21.5125 19.2919 21.6335 18.3918C21.75 17.5248 21.75 16.4225 21.75 15.0549V15C21.75 14.5858 21.4142 14.25 21 14.25C20.5858 14.25 20.25 14.5858 20.25 15C20.25 16.4354 20.2484 17.4365 20.1469 18.1919C20.0482 18.9257 19.8678 19.3142 19.591 19.591C19.3142 19.8678 18.9257 20.0482 18.1919 20.1469C17.4365 20.2484 16.4354 20.25 15 20.25H9C7.56459 20.25 6.56347 20.2484 5.80812 20.1469C5.07435 20.0482 4.68577 19.8678 4.40901 19.591C4.13225 19.3142 3.9518 18.9257 3.85315 18.1919C3.75159 17.4365 3.75 16.4354 3.75 15Z" fill="%23eee"></path></g></svg>'
 CSS="""
 <style>
 body {
     font-family: Arial, sans-serif;
     overflow: auto;
 }
-
+.hidden {
+    display: none;
+}
 .icon {
     border-radius: 25px;
     background-color: #444;
@@ -80,7 +84,7 @@ div {
 }
 .desc {
     text-overflow: ellipsis;
-    max-width: 300px;
+    max-width: 200px;
     white-space: nowrap;
     overflow: hidden;
 }
@@ -134,7 +138,7 @@ th {
 }
 .sort-btn {
     color: #aaa;
-    font-size: 14px;
+    font-size: 10px;
     user-select: none;
     display: inline-block;
     width: 7px;
@@ -216,13 +220,18 @@ th {
     border-radius: 17px;
     /* min-width: 17px; */
     text-align: center;
-    padding: 0px 4px;
+    /* text-indent: 14px;*/
+    padding: 0px 18px 0px 4px;
     margin-left: auto;
     cursor: pointer;
+    background-image: url('{XL}');
+    background-repeat: no-repeat;
+    background-position: right 4px center;
+    background-size: 12px 12px;
 }
 
 </style>
-""".replace("{ICON}", ICON)
+""".replace("{ICON}", ICON).replace("{XL}", XL)
 JS="""
 <script src=https://unpkg.com/exceljs@4.1.1/dist/exceljs.min.js></script>
 <script>
@@ -236,18 +245,25 @@ function initTableFilters(table) {
             // Add sort button first
             const sortBtn = document.createElement('span');
             sortBtn.className = 'sort-btn';
-            sortBtn.innerHTML = '&#11014;'; // Unicode for sort icon
+            sortBtn.innerHTML = '▲' //'&#11014;'; // Unicode for sort icon ▼
             sortBtn.style.cursor = 'pointer';
             sortBtn.setAttribute('data-sort-order', '');
             sortBtn.onclick = () => toggleSort(table, index, sortBtn);
-            
+
+            const titleSpan = document.createElement('span');
+            titleSpan.className = 'th-title';
+            titleSpan.innerHTML = header.innerHTML;
+
             // Move existing elements into the content span
-            while (header.firstChild) {
-                contentSpan.appendChild(header.firstChild);
-            }
+            //while (header.firstChild) {
+            //    contentSpan.appendChild(header.firstChild);
+            //}
             
             // Add sort button at the beginning
-            contentSpan.insertBefore(sortBtn, contentSpan.firstChild);
+            contentSpan.appendChild(sortBtn);
+            contentSpan.appendChild(titleSpan);
+
+            //contentSpan.insertBefore(sortBtn, contentSpan.firstChild);
             
             // Add export button and row counter for last column
             if (index === headers.length - 1) {
@@ -259,6 +275,7 @@ function initTableFilters(table) {
                 contentSpan.appendChild(rowCount);
             }
             
+            header.innerHTML = '';
             header.appendChild(contentSpan);
             
             // Add filter input
@@ -277,7 +294,7 @@ function initTableFilters(table) {
 function updateRowCount(table, count) {
     const rowCount = table.querySelector('.row-count');
     if (rowCount) {
-        rowCount.innerHTML = `<span>&#9660;</span> ${count}`; // &#129095;🡇 not working macOS
+        rowCount.innerHTML = ` ${count}`; // &#129095;🡇 not working macOS
     }
 }
 
@@ -286,7 +303,7 @@ function toggleSort(table, colIndex, sortBtn) {
     table.querySelectorAll('.sort-btn').forEach(btn => {
         if (btn !== sortBtn) {
             btn.setAttribute('data-sort-order', '');
-            btn.innerHTML = '&#11014;';
+            btn.innerHTML = '▲'; //'&#11014;';
         }
     });
 
@@ -295,12 +312,12 @@ function toggleSort(table, colIndex, sortBtn) {
     let newOrder = 'asc';
     if (currentOrder === 'asc') {
         newOrder = 'desc';
-        sortBtn.innerHTML = '&#11015;';
+        sortBtn.innerHTML = '▼'; //'&#11015;';
     } else if (currentOrder === 'desc') {
         newOrder = '';
-        sortBtn.innerHTML = '&#11014;';
+        sortBtn.innerHTML = '▲'; //'&#11014;';
     } else {
-        sortBtn.innerHTML = '&#11014;';
+        sortBtn.innerHTML = '▲'; //'&#11014;';
     }
     sortBtn.setAttribute('data-sort-order', newOrder);
     sortBtn.setAttribute('data-col-index', colIndex); // Store column index on the button
@@ -308,6 +325,7 @@ function toggleSort(table, colIndex, sortBtn) {
 }
 
 function applyFilters(table) {
+    table.classList.add('hidden');
     const rows = Array.from(table.querySelectorAll('tbody tr'));
     const filters = Array.from(table.querySelectorAll('.column-filter'))
         .map(filter => ({
@@ -322,10 +340,10 @@ function applyFilters(table) {
     // First apply filters
     const filteredRows = rows.filter(row => {
         // If no filters are active, show all rows
-        if (filters.every(f => !f.value)) {
-            row.style.display = '';
-            return true;
-        }
+        //if (filters.every(f => !f.value)) {
+        //    row.classList.remove('hidden');
+        //    return true;
+        //}
         const cells = row.cells;
         const shouldShow = !filters.some(filter => {
             if (!filter.value) return false;
@@ -333,7 +351,11 @@ function applyFilters(table) {
             if (filter.regexp) return !filter.regexp.test(cellText);
             return !cellText.toLowerCase().includes(filter.value);
         });
-        row.style.display = shouldShow ? '' : 'none';
+        if (shouldShow) {
+            row.classList.remove('hidden');
+        } else {
+            row.classList.add('hidden');
+        }
         return shouldShow;
     });
 
@@ -371,6 +393,7 @@ function applyFilters(table) {
         const tbody = table.querySelector('tbody');
         filteredRows.forEach(row => tbody.appendChild(row));
     }
+    table.classList.remove('hidden');
 }
 
 function processHtmlContent(element) {
@@ -425,7 +448,7 @@ function exportToExcel(table, fileNamePrefix = 'export') {
 
     // Get headers and data
     const headers = Array.from(table.querySelectorAll('thead th'))
-        .map(th => th.querySelector('.th-content')?.textContent.replace(/[▼].*/, '').replace(/[^\\w\\s]/g, '').trim() || '');
+        .map(th => th.querySelector('.th-title')?.textContent.trim() || '');
 
     // Get data rows with type information
     const rows = Array.from(table.querySelectorAll('tbody tr'))
@@ -628,11 +651,11 @@ def parse_input_file(filename: str) -> List[Tuple[str, List[int]]]:
     host_dict = {}
     with open(filename, 'r') as f:
         for line in f:
-            line = line.strip().lower()
+            line = line.strip()
             if not line or line.startswith('#'):
                 continue
             words = line.split()
-            fqdn = words[0]
+            fqdn = words[0].lower()
             ports = words[1] if len(words) > 1 else '22'
             port_list = [int(p) for p in ports.split(',')]
             desc = ' '.join(words[2:]).strip() if len(words) > 2 else ''
@@ -662,8 +685,12 @@ def ping_host(ip: str, timeout: float = 2.0) -> bool:
     """
     try:
         # Using -c 1 for count=1, -W timeout for timeout in seconds
+        # Windows uses -n 1 for count=1, -w timeout in milliseconds
         # These are standard Linux ping parameters
-        command = ['ping', '-c', '1', '-W', str(int(timeout)), ip]
+        if platform.system().lower() == "windows":
+            command = ["ping", "-n", "1", "-w", str(int(timeout * 1000)), ip]
+        else:
+            command = ['ping', '-c', '1', '-W', str(int(timeout)), ip]
         output = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=timeout)
         return output.returncode == 0
     except Exception:
@@ -1158,7 +1185,8 @@ def generate_html_report(
     parallelism: int,
     noping: bool,
     stats: Dict[str, Any],
-    input_file: str = ''
+    input_file: str = '',
+    desc_titles: List[str] = [],
 ) -> None:
     """Generate a complete HTML report of the port scan results.
 
@@ -1203,6 +1231,9 @@ def generate_html_report(
         f.write(f'<h3 class="icon">Port Accessibility Report from {HOSTNAME} ({MY_IP}) to {os.path.basename(input_file)} - {time.strftime("%Y-%m-%d %H:%M:%S", scan_time)}</h3>\n')
         
         # Write detailed results table
+        if not desc_titles:
+            _, _, _, _, _, desc = results[0]
+            desc_titles = ["Description" for d in desc.split("|")]
         f.write(f'''
         <div class="table-container" id="result-container">
             <table id="commandTable">
@@ -1214,7 +1245,7 @@ def generate_html_report(
                         <th>Port</th>
                         <th>Status</th>
                         <th>Ping</th>
-                        <th>Description</th>
+                        {"\n".join([f"<th>{d}</th>" for d in desc_titles])}
                     </tr>
                 </thead>
                 <tbody>
@@ -1233,7 +1264,7 @@ def generate_html_report(
                     <td style="text-align: right;">{port}</td>
                     <td style="text-align: center;"><span class="{status_class} status">{escape(status)}</span></td>
                     <td style="text-align: center;"><span class="{ping_class} ping">{ping_status}</span></td>
-                    <td class="desc">{escape(str(desc))}</td>
+                    {"\n".join([f'<td class="desc">{escape(str(d))}</td>' for d in desc.split("|")])}
                 </tr>
             ''')
 
@@ -1417,7 +1448,7 @@ def main():
     parser.add_argument('-n', '--noping', action="store_true", help='No ping check')
     parser.add_argument('-s', '--summary', action="store_true", help='Print scan summary information')
     parser.add_argument('-b', '--bits', type=int, default=16, help='VLAN bits for timeout summary (default: 16)')
-
+    parser.add_argument('-d', '--desc_titles', type=str, nargs='*', help='List of custom description titles for hosts (optional)')
     # Email related arguments
     email_group = parser.add_argument_group('Email Options')
     email_group.add_argument('--email-to', help='Comma-separated list of email recipients')
@@ -1475,7 +1506,17 @@ def main():
     
     # Generate report
     results.sort(key=lambda x: (x[0], x[2]))
-    generate_html_report(results, args.output, time.localtime(start_time), args.timeout, args.parallelism, args.noping, stats, args.input_file)
+    generate_html_report(
+        results,
+        args.output,
+        time.localtime(start_time),
+        args.timeout,
+        args.parallelism,
+        args.noping,
+        stats,
+        args.input_file,
+        args.desc_titles,
+    )
     
     # Print summary
     # Display detailed results in table format

{portune-0.1.3 → portune-0.1.5}/portune/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.3'
-__version_tuple__ = version_tuple = (0, 1, 3)
+__version__ = version = '0.1.5'
+__version_tuple__ = version_tuple = (0, 1, 5)

{portune-0.1.3 → portune-0.1.5/portune.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portune
-Version: 0.1.3
+Version: 0.1.5
 Summary: Simple Python HTTP Exec Server
 Author: Franck Jouvanceau
 Maintainer: Franck Jouvanceau
@@ -52,13 +52,19 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Dynamic: license-file
 
+[![Pypi version](https://img.shields.io/pypi/v/portune.svg)](https://pypi.org/project/portune/)
+![example](https://github.com/joknarf/portune/actions/workflows/python-publish.yml/badge.svg)
+[![Licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://shields.io/)
+[![](https://pepy.tech/badge/portune)](https://pepy.tech/project/portune)
+[![Python versions](https://img.shields.io/badge/python-3.9+-blue.svg)](https://shields.io/)
+
 # portune
 
 Multitreaded port scanner
 
 # features
 
-* parallel check of port availability against server/ports
+* parallel check of port availability against servers/ports
 * console output result / summary
 * html full report / dns domain summary / vlan timeout summary
 * mail with html summary / report attachment (mailhost relay)

portune-0.1.3/README.md

@@ -1,11 +0,0 @@
-# portune
-
-Multitreaded port scanner
-
-# features
-
-* parallel check of port availability against server/ports
-* console output result / summary
-* html full report / dns domain summary / vlan timeout summary
-* mail with html summary / report attachment (mailhost relay)
-