medicafe 0.250529.2__tar.gz → 0.250610.0__tar.gz

{medicafe-0.250529.2 → medicafe-0.250610.0}/MediLink/MediLink_Gmail.py

@@ -321,13 +321,40 @@ class RequestHandler(BaseHTTPRequestHandler):
 def generate_self_signed_cert(cert_file, key_file):
     log("Checking if certificate file exists: " + cert_file)
     log("Checking if key file exists: " + key_file)
-    if not os.path.exists(cert_file) or not os.path.exists(key_file):
+    
+    # Check if certificate exists and is not expired
+    cert_needs_regeneration = True
+    if os.path.exists(cert_file):
+        try:
+            # Check certificate expiration
+            check_cmd = ['openssl', 'x509', '-in', cert_file, '-checkend', '86400', '-noout']  # Check if expires in next 24 hours
+            result = subprocess.call(check_cmd)
+            if result == 0:
+                log("Certificate is still valid")
+                cert_needs_regeneration = False
+            else:
+                log("Certificate is expired or will expire soon")
+                # Delete expired certificate and key files
+                try:
+                    if os.path.exists(cert_file):
+                        os.remove(cert_file)
+                        log("Deleted expired certificate file: {}".format(cert_file))
+                    if os.path.exists(key_file):
+                        os.remove(key_file)
+                        log("Deleted expired key file: {}".format(key_file))
+                except Exception as e:
+                    log("Error deleting expired certificate files: {}".format(e))
+        except Exception as e:
+            log("Error checking certificate expiration: {}".format(e))
+    
+    if cert_needs_regeneration:
         log("Generating self-signed SSL certificate...")
         cmd = [
             'openssl', 'req', '-config', openssl_cnf, '-nodes', '-new', '-x509',
             '-keyout', key_file,
             '-out', cert_file,
-            '-days', '365'
+            '-days', '365',
+            '-sha256'  # Use SHA-256 for better security
             #'-subj', '/C=US/ST=...' The openssl.cnf file contains default values for these fields, but they can be overridden by the -subj option.
         ]
         try:
@@ -336,7 +363,14 @@ def generate_self_signed_cert(cert_file, key_file):
             log("Command finished with result: " + str(result))
             if result != 0:
                 raise RuntimeError("Failed to generate self-signed certificate")
-            log("Self-signed SSL certificate generated.")
+            
+            # Verify the certificate was generated correctly
+            verify_cmd = ['openssl', 'x509', '-in', cert_file, '-text', '-noout']
+            verify_result = subprocess.call(verify_cmd)
+            if verify_result != 0:
+                raise RuntimeError("Generated certificate verification failed")
+                
+            log("Self-signed SSL certificate generated and verified successfully.")
         except Exception as e:
             log("Error generating self-signed certificate: {}".format(e))
             raise

{medicafe-0.250529.2/medicafe.egg-info → medicafe-0.250610.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250529.2
+Version: 0.250610.0
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250529.2 → medicafe-0.250610.0/medicafe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250529.2
+Version: 0.250610.0
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250529.2 → medicafe-0.250610.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='medicafe',
-    version="0.250529.2",
+    version="0.250610.0",
     description='MediCafe',
     long_description="""
     # Project Overview: MediCafe