Release v1.6.1: code quality improvements, security enhancements, and bug fixes

- Add HTTP timeout protection (30s) to prevent indefinite hangs
- Fix relative imports across all modules (from `src.` to `.`)
- Fix credential loading to handle tuple return values
- Correct type hint `any` to `Any` in config.py
- Remove unused imports and variables throughout codebase
- Format code with Black (line-length=120) and isort (profile=black)
- Pass Bandit security audit with 0 medium/high severity issues

Author: ClaraVnk

.gitignore

@@ -63,3 +63,4 @@ config/
 Makefile
 .flake8
 .pre-commit-config.yaml
+bandit_report.json

Dockerfile

@@ -5,7 +5,7 @@ FROM python:3.11-slim
 # Métadonnées
 LABEL maintainer="loutre@ikmail.com"
 LABEL description="OpenStack Toolbox - Complete Suite with Cron"
-LABEL version="1.6.0"
+LABEL version="1.6.1"
 
 # Variables d'environnement
 ENV PYTHONUNBUFFERED=1

README.md

@@ -9,10 +9,19 @@
 
 A suite of tools to optimize and manage your OpenStack resources, with multilingual support (FR/EN).
 
-> **Version 1.6.0** - Enhanced security (encrypted SMTP passwords), improved logging with rotation, complete type hints, and better error handling!
+> **Version 1.6.1** - Code quality improvements, security enhancements, and better reliability!
 
-## ✨ What's New in v1.6.0
+## ✨ What's New in v1.6.1
 
+- 🔒 **HTTP timeout protection** - All HTTP requests now have 30s timeout to prevent indefinite hangs
+- 🧹 **Code quality** - Formatted with Black and isort, cleaned unused imports
+- 🔧 **Bug fixes** - Fixed relative imports and credential loading issues
+- ✅ **Security audit** - Passed Bandit security scan with 0 critical issues
+- 📝 **Type safety** - Corrected type hints for better IDE support
+
+## 📜 Previous Versions
+
+### v1.6.0
 - 🔒 **Encrypted SMTP passwords** - Passwords are now encrypted using Fernet (AES-128)
 - 📊 **Professional logging** - Colored console output, automatic rotation, JSON support
 - 📝 **Complete type hints** - Better IDE support and code quality
@@ -525,6 +534,26 @@ weekly-notification
 
 ## 📝 Changelog
 
+### [1.6.1] - 2024-12-19
+
+**Fixed:**
+- 🔧 Fixed relative imports in all modules (from `src.` to `.`)
+- 🔧 Fixed credential loading to properly handle tuple return values
+- 🔧 Corrected type hint `any` to `Any` in config.py
+
+**Improved:**
+- 🔒 Added 30-second timeout to all HTTP requests (prevents hanging)
+- 🧹 Removed unused imports and variables
+- 🧹 Cleaned whitespace in blank lines
+- ✨ Code formatted with Black (line-length=120)
+- ✨ Imports sorted with isort (profile=black)
+
+**Security:**
+- ✅ Passed Bandit security audit with 0 medium/high severity issues
+- 🔒 All HTTP requests now protected against indefinite hangs
+
+**No breaking changes** - Full backward compatibility maintained
+
 ### [1.6.0] - 2024-11-21
 
 **Added:**

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "openstack-toolbox"
-version = "1.7.0"
+version = "1.6.1"
 description = "A toolbox for OpenStack - Docker deployment with automated monitoring and cron tasks"
 readme = "README.md"
 requires-python = ">=3.9"

src/config.py

@@ -5,18 +5,9 @@
 import json
 import os
 from pathlib import Path
-from typing import Dict, Optional, Tuple, List
-
-from dotenv import load_dotenv
-from rich import print
-from rich.prompt import Prompt
-
-from .exceptions import (
-    ConfigurationError,
-    CredentialsError,
-    SMTPConfigError,
-    FileOperationError,
-)
+from typing import Any, Dict, List, Optional, Tuple
+
+from .exceptions import SMTPConfigError
 from .security import SecureConfig
 
 CONFIG_DIR = os.path.expanduser("~/.config/openstack-toolbox")
@@ -49,7 +40,7 @@ def get_language_preference() -> str:
             with open(CONFIG_FILE, "r", encoding="utf-8") as f:
                 config = json.load(f)
                 return config.get("language", "fr")
-    except (OSError, IOError, json.JSONDecodeError) as e:
+    except (OSError, IOError, json.JSONDecodeError):
         # Log error but return default
         pass
     return "fr"
@@ -85,7 +76,7 @@ def set_language_preference(lang: str) -> bool:
         with open(CONFIG_FILE, "w", encoding="utf-8") as f:
             json.dump(config, f, indent=4)
         return True
-    except (OSError, IOError, json.JSONDecodeError) as e:
+    except (OSError, IOError, json.JSONDecodeError):
         return False
 
 
@@ -122,16 +113,16 @@ def create_smtp_config_interactive() -> bool:
         True
     """
     config = configparser.ConfigParser()
-    
+
     server = input("Serveur SMTP [smtp.gmail.com]: ").strip() or "smtp.gmail.com"
     port = input("Port SMTP [587]: ").strip() or "587"
     username = input("Utilisateur SMTP: ").strip()
     password = getpass.getpass("Mot de passe SMTP: ").strip()
-    
+
     # Encrypt password for security
     secure = SecureConfig(Path(CONFIG_DIR))
     encrypted_password = secure.encrypt(password)
-    
+
     config["SMTP"] = {
         "server": server,
         "port": port,
@@ -142,7 +133,7 @@ def create_smtp_config_interactive() -> bool:
 
     from_email = input(f"Email expéditeur [{username}]: ").strip() or username
     to_email = input("Email destinataire: ").strip()
-    
+
     config["Email"] = {
         "from": from_email,
         "to": to_email,
@@ -158,7 +149,7 @@ def create_smtp_config_interactive() -> bool:
         raise SMTPConfigError(f"Failed to save SMTP configuration: {e}") from e
 
 
-def load_smtp_config() -> Optional[Dict[str, any]]:
+def load_smtp_config() -> Optional[Dict[str, Any]]:
     """
     Charge la configuration SMTP depuis le fichier de configuration.
 
@@ -192,7 +183,7 @@ def load_smtp_config() -> Optional[Dict[str, any]]:
 
         password = config["SMTP"]["password"]
         is_encrypted = config["SMTP"].get("encrypted", "false") == "true"
-        
+
         # Decrypt password if it's encrypted
         if is_encrypted:
             secure = SecureConfig(Path(CONFIG_DIR))
@@ -207,27 +198,23 @@ def load_smtp_config() -> Optional[Dict[str, any]]:
             "to_email": config["Email"]["to"],
         }
     except (KeyError, ValueError, configparser.Error) as e:
-        raise SMTPConfigError(
-            f"Invalid SMTP configuration file: {e}"
-        ) from e
+        raise SMTPConfigError(f"Invalid SMTP configuration file: {e}") from e
     except Exception as e:
-        raise SMTPConfigError(
-            f"Failed to load SMTP configuration: {e}"
-        ) from e
+        raise SMTPConfigError(f"Failed to load SMTP configuration: {e}") from e
 
 
 def load_openstack_credentials() -> Tuple[Optional[Dict[str, str]], List[str]]:
     """
     Charge les identifiants OpenStack depuis les variables d'environnement.
-    
+
     Returns:
         Tuple contenant:
             - Dict des credentials si toutes les variables sont présentes, None sinon
             - Liste des variables manquantes
-    
+
     Raises:
         CredentialsError: Si les variables critiques sont manquantes
-    
+
     Examples:
         >>> creds, missing = load_openstack_credentials()
         >>> if creds:

src/logger.py

@@ -83,15 +83,11 @@ def setup_logger(
         log_path = Path(log_file)
         log_path.parent.mkdir(parents=True, exist_ok=True)
 
-        file_handler = RotatingFileHandler(
-            log_file, maxBytes=max_bytes, backupCount=backup_count
-        )
+        file_handler = RotatingFileHandler(log_file, maxBytes=max_bytes, backupCount=backup_count)
         file_handler.setLevel(logging.DEBUG)  # Always log everything to file
 
         if json_format:
-            json_formatter = jsonlogger.JsonFormatter(
-                "%(asctime)s %(name)s %(levelname)s %(message)s"
-            )
+            json_formatter = jsonlogger.JsonFormatter("%(asctime)s %(name)s %(levelname)s %(message)s")
             file_handler.setFormatter(json_formatter)
         else:
             file_formatter = logging.Formatter(

src/openstack_admin.py

@@ -11,8 +11,8 @@
 from rich.table import Table
 from rich.tree import Tree
 
-from src.config import get_language_preference, load_openstack_credentials
-from src.utils import format_size, print_header
+from .config import get_language_preference, load_openstack_credentials
+from .utils import format_size, print_header
 
 # Dictionnaire des traductions
 TRANSLATIONS = {
@@ -128,16 +128,10 @@ def get_project_details(conn, project_id):
         print(TRANSLATIONS[lang]["project_name"].format(project.name))
         print(TRANSLATIONS[lang]["project_description"].format(project.description))
         print(TRANSLATIONS[lang]["project_domain"].format(project.domain_id))
-        is_active = (
-            TRANSLATIONS[lang]["yes"]
-            if project.is_enabled
-            else TRANSLATIONS[lang]["no"]
-        )
+        is_active = TRANSLATIONS[lang]["yes"] if project.is_enabled else TRANSLATIONS[lang]["no"]
         print(TRANSLATIONS[lang]["project_active"].format(is_active))
     else:
-        print(
-            f"[bold red]{TRANSLATIONS[lang]['no_project'].format(project_id)}[/bold red]"
-        )
+        print(f"[bold red]{TRANSLATIONS[lang]['no_project'].format(project_id)}[/bold red]")
 
 
 def list_images(conn):
@@ -236,14 +230,8 @@ def list_volumes(conn):
     table.add_column("Attaché", style="blue")
     table.add_column("Snapshot associé", style="magenta")
     for volume in volumes:
-        attached = (
-            TRANSLATIONS[lang]["yes"]
-            if volume.attachments
-            else TRANSLATIONS[lang]["no"]
-        )
-        snapshot_id = (
-            volume.snapshot_id if volume.snapshot_id else TRANSLATIONS[lang]["none"]
-        )
+        attached = TRANSLATIONS[lang]["yes"] if volume.attachments else TRANSLATIONS[lang]["no"]
+        snapshot_id = volume.snapshot_id if volume.snapshot_id else TRANSLATIONS[lang]["none"]
         table.add_row(
             volume.id,
             volume.name,
@@ -273,9 +261,7 @@ def mounted_volumes(conn):
         instance_id = instance.id
         instance_name = instance.name
         if instance_id in instance_volumes:
-            tree[instance_name] = [
-                volume.name for volume in instance_volumes[instance_id]
-            ]
+            tree[instance_name] = [volume.name for volume in instance_volumes[instance_id]]
         else:
             tree[instance_name] = []
 
@@ -373,21 +359,15 @@ def process_resource_parallel(resource_type, resource, conn):
                 "details": f"Size: {size}, Status: {resource.status}",
             }
         elif resource_type == "image":
-            size = (
-                format_size(resource.size)
-                if resource.size
-                else TRANSLATIONS[lang]["unknown"]
-            )
+            size = format_size(resource.size) if resource.size else TRANSLATIONS[lang]["unknown"]
             return {
                 "id": resource.id,
                 "name": resource.name,
                 "type": "Image",
                 "details": f"Size: {size}, Status: {resource.status}",
             }
     except Exception as e:
-        print(
-            f"[red]Erreur lors du traitement de la ressource {resource.id}: {str(e)}[/red]"
-        )
+        print(f"[red]Erreur lors du traitement de la ressource {resource.id}: {str(e)}[/red]")
         return None
 
 
@@ -445,9 +425,7 @@ def list_all_resources(conn):
                 if result:
                     processed_resources.append(result)
             except Exception as e:
-                print(
-                    f"[red]Erreur lors du traitement d'une ressource : {str(e)}[/red]"
-                )
+                print(f"[red]Erreur lors du traitement d'une ressource : {str(e)}[/red]")
 
     # Affichage des résultats
     table = Table(title="")
@@ -457,9 +435,7 @@ def list_all_resources(conn):
     table.add_column(TRANSLATIONS[lang]["details_column"], style="white")
 
     for resource in sorted(processed_resources, key=lambda x: (x["type"], x["name"])):
-        table.add_row(
-            resource["type"], resource["id"], resource["name"], resource["details"]
-        )
+        table.add_row(resource["type"], resource["id"], resource["name"], resource["details"])
 
     console = Console()
     console.print(table)
@@ -488,7 +464,7 @@ def main():
     print(header)
 
     # Test des credentials
-    creds = load_openstack_credentials()
+    creds, missing_vars = load_openstack_credentials()
     if not creds:
         print(f"[bold red]{TRANSLATIONS[lang]['connection_error']}[/bold red]")
         return