Merge pull request #54 from Sathvik-Rao/release-2.0.0

Release 2.0.0

Author: Sathvik-Rao

ClipCascade_Desktop/apps/ClipCascade-Apple_macOS(ARM_M-Series)-full.zip

@@ -61,12 +61,8 @@ def mainloop(self):
             server_url.strip()
         )
 
-        websocket_url = (
-            input(f"websocket url [{self.config.data['websocket_url']}]: ")
-            or self.config.data["websocket_url"]
-        )
-        self.config.data["websocket_url"] = LoginForm.remove_trailing_slash(
-            websocket_url.strip()
+        self.config.data["websocket_url"] = Config.convert_to_websocket_url(
+            self.config.data["server_url"]
         )
 
         self.config.data["cipher_enabled"] = LoginForm.str_to_bool(
@@ -89,48 +85,6 @@ def mainloop(self):
             CustomDialog("Logging in...").mainloop()
             return
 
-        subscription_destination = (
-            input(
-                f"subscription destination [{self.config.data['subscription_destination']}]: "
-            )
-            or self.config.data["subscription_destination"]
-        )
-        self.config.data["subscription_destination"] = LoginForm.remove_trailing_slash(
-            subscription_destination.strip()
-        )
-
-        send_destination = (
-            input(f"send destination [{self.config.data['send_destination']}]: ")
-            or self.config.data["send_destination"]
-        )
-        self.config.data["send_destination"] = LoginForm.remove_trailing_slash(
-            send_destination.strip()
-        )
-
-        login_url = (
-            input(f"login url [{self.config.data['login_url']}]: ")
-            or self.config.data["login_url"]
-        )
-        self.config.data["login_url"] = LoginForm.remove_trailing_slash(
-            login_url.strip()
-        )
-
-        logout_url = (
-            input(f"logout url [{self.config.data['logout_url']}]: ")
-            or self.config.data["logout_url"]
-        )
-        self.config.data["logout_url"] = LoginForm.remove_trailing_slash(
-            logout_url.strip()
-        )
-
-        maxsize_url = (
-            input(f"maxsize url [{self.config.data['maxsize_url']}]: ")
-            or self.config.data["maxsize_url"]
-        )
-        self.config.data["maxsize_url"] = LoginForm.remove_trailing_slash(
-            maxsize_url.strip()
-        )
-
         # Validate hash_rounds
         while True:
             hash_rounds = input(
@@ -210,6 +164,32 @@ def mainloop(self):
             or LoginForm.bool_to_str(self.config.data["enable_file_sharing"])
         )
 
+        # Validate default file download location
+        while True:
+            default_file_download_location = (
+                input(
+                    f"default file download location [{self.config.data['default_file_download_location']}]: "
+                )
+                or self.config.data["default_file_download_location"]
+            )
+
+            default_file_download_location = default_file_download_location.strip()
+            if default_file_download_location == "":
+                self.config.data["default_file_download_location"] = ""
+                break
+
+            if not os.path.isdir(default_file_download_location):
+                CustomDialog(
+                    "Invalid directory path.",
+                    msg_type="error",
+                ).mainloop()
+                continue
+
+            self.config.data["default_file_download_location"] = (
+                default_file_download_location
+            )
+            break
+
         CustomDialog("Logging in...").mainloop()
 
     def on_quit(self):

ClipCascade_Desktop/apps/ClipCascade-Apple_macOS(ARM_M-Series).zip

@@ -7,6 +7,7 @@
 
 from cli.echo import Echo
 from cli.info import CustomDialog
+from core.config import Config
 from core.constants import *
 from itertools import count
 
@@ -18,19 +19,21 @@
 class TaskbarPanel:
     def __init__(
         self,
-        on_connect_callback=None,
-        on_disconnect_callback=None,
-        on_logoff_callback=None,
-        new_version_available=None,
-        github_url=None,
+        on_connect_callback: callable = None,
+        on_disconnect_callback: callable = None,
+        on_logoff_callback: callable = None,
+        new_version_available: list = None,
+        github_url: str = GITHUB_URL,
         stomp_manager=None,
+        config: Config = None,
     ):
         self.on_connect_callback = on_connect_callback
         self.on_disconnect_callback = on_disconnect_callback
         self.on_logoff_callback = on_logoff_callback
         self.new_version_available = new_version_available
         self.github_url = github_url
         self.stomp_manager = stomp_manager
+        self.config = config
 
         # Initial state: Connected
         self.is_connected = True
@@ -254,7 +257,10 @@ def disable_files_download(self):
 
     def _on_download(self, files):
         try:
-            target_directory = input("Enter the location to save file(s): ").strip()
+            if self.config.data["default_file_download_location"] != "":
+                target_directory = self.config.data["default_file_download_location"]
+            else:
+                target_directory = input("Enter the location to save file(s): ").strip()
             if not target_directory:
                 CustomDialog(
                     "No input provided. Please enter a valid directory path.",

ClipCascade_Desktop/apps/ClipCascade-Apple_macOS(Intel-Series)-full.zip

@@ -67,7 +67,7 @@ def _monitor_x_wl_clipboard(
     if x_mode:
         timeout = 0.3  # xclip seconds
     else:
-        timeout = 5  # wl-clipboard seconds
+        timeout = 1  # wl-clipboard seconds
 
     while _run_poll.is_set():
         if x_mode:
@@ -226,23 +226,18 @@ def execute_command(*args) -> tuple:
 
 def is_x_clipboard_owner():
     # Check if the X clipboard is owned by the current user
-    success, msg = execute_command(
-        "xclip", "-selection", "clipboard", "-t", "TARGETS", "-o"
-    )
-    if not success:
-        if msg.lower().find("there is no owner for the clipboard selection") != -1:
-            logging.warning(
-                f"{msg}\nX clipboard is not owned by the current user switching to wl-clipboard."
-            )
-            return False
-
-    return True
+    return execute_command("xclip", "-selection", "clipboard", "-t", "TARGETS", "-o")[0]
 
 
 def _start_clipboard_polling(enable_image_monitoring, enable_file_monitoring):
     if XMODE:
+        x_clipboard_owner = is_x_clipboard_owner()
+        if not x_clipboard_owner:
+            logging.warning(
+                "x-clip is not owned by the current user. Switching to wl-clipboard."
+            )
         _monitor_x_wl_clipboard(
-            x_mode=is_x_clipboard_owner(),
+            x_mode=x_clipboard_owner,
             enable_image_monitoring=enable_image_monitoring,
             enable_file_monitoring=enable_file_monitoring,
         )

ClipCascade_Desktop/apps/ClipCascade-Apple_macOS(Intel-Series).zip

@@ -137,10 +137,11 @@ def authenticate_and_connect(self):
                 and self.config.data["save_password"]
                 and not used_saved_credentials
             ):
-                # Attempt to connect with raw password when using saved credentials
+                # Attempt to connect with password when using saved credentials
                 used_saved_credentials = True
             else:
                 display_login_success_dialog = True
+                self.config.data["password"] = ""  # Clear the password
                 login_form = LoginForm(
                     self.config,
                     on_quit_callback=(
@@ -150,11 +151,17 @@ def authenticate_and_connect(self):
                     ),
                 )
                 login_form.mainloop()  # wait until login form is closed
+                self.config.data["password"] = (
+                    CipherManager.string_to_sha3_512_lowercase_hex(
+                        self.config.data["password"]
+                    )
+                )  # Hash the password
 
             login_successful, msg_login, self.config.data["cookie"] = (
                 self.request_manager.login()
             )
             if login_successful:
+                self.config.data["csrf_token"] = self.request_manager.get_csrf_token()
                 self.config.data["maxsize"] = self.request_manager.maxsize()
                 stomp_conn_successful, msg_stomp = self.stomp_manager.connect()
                 if stomp_conn_successful:
@@ -219,6 +226,7 @@ def logoff_and_exit(self):
             self.config.data["cookie"] = None
             self.config.data["maxsize"] = None
             self.config.data["password"] = ""
+            self.config.data["csrf_token"] = ""
             self.config.save()
         except Exception as e:
             raise Exception(f"Error during logging off: {e}")
@@ -248,6 +256,7 @@ def run(self):
                 new_version_available=update_available,
                 github_url=GITHUB_URL,
                 stomp_manager=self.stomp_manager,
+                config=self.config,
             )
             self.stomp_manager.set_tray_ref(sys_tray)
             sys_tray.run()

ClipCascade_Desktop/apps/ClipCascade.exe

@@ -1,6 +1,7 @@
 import base64
 import json
 import os
+import re
 from core.constants import *
 
 
@@ -10,24 +11,21 @@ def __init__(self, file_name=DATA_FILE_NAME):
         self.data = {
             "cipher_enabled": True,
             "server_url": "http://localhost:8080",
-            "websocket_url": "ws://localhost:8080/clipsocket",
+            "websocket_url": "",
             "username": "",
             "hashed_password": None,
             "cookie": None,
             "maxsize": None,
-            "subscription_destination": "/topic/cliptext",
-            "send_destination": "/app/cliptext",
             "hash_rounds": 664937,
-            "login_url": "/login",
-            "logout_url": "/logout",
-            "maxsize_url": "/max-size",
             "salt": "",
+            "csrf_token": "",
             "notification": True,
             "save_password": False,
             "password": "",
             "max_clipboard_size_local_limit_bytes": None,
             "enable_image_sharing": True,
             "enable_file_sharing": True,
+            "default_file_download_location": "",
         }
 
     def save(self):
@@ -66,3 +64,25 @@ def load(self):
                     "Try deleting DATA file in the program directory, and re-run the program again"
                 )
         return False
+
+    @staticmethod
+    def convert_to_websocket_url(input_url):
+        if not input_url or not isinstance(input_url, str):
+            raise ValueError("Invalid URL provided")
+
+        # Trim whitespace, remove trailing slashes, and convert to lowercase
+        input_url = re.sub(r"/+$", "", input_url.strip()).lower()
+
+        # Determine protocol and convert
+        if input_url.startswith("https://"):
+            ws_url = input_url.replace("https://", "wss://", 1)
+        elif input_url.startswith("http://"):
+            ws_url = input_url.replace("http://", "ws://", 1)
+        else:
+            raise ValueError(f"Unsupported protocol in URL: {input_url}")
+
+        # Append the WebSocket endpoint and remove any trailing slash
+        ws_url += WEBSOCKET_ENDPOINT
+        ws_url = re.sub(r"/+$", "", ws_url)
+
+        return ws_url

ClipCascade_Desktop/apps/ClipCascade.msi

@@ -70,14 +70,14 @@ def detect_linux_display_server():
 
 # App version
 if PLATFORM == WINDOWS:
-    APP_VERSION = "1.3.0"
+    APP_VERSION = "2.0.0"
 elif PLATFORM == MACOS:
-    APP_VERSION = "1.3.1"
+    APP_VERSION = "2.0.0"
 elif PLATFORM.startswith(LINUX):
     if XMODE:
-        APP_VERSION = "1.3.2"  # gui version
+        APP_VERSION = "2.0.0"  # gui version
     else:
-        APP_VERSION = "1.3.2"  # non-gui(cli) version
+        APP_VERSION = "2.0.0"  # non-gui(cli) version
 
 
 # core constants
@@ -87,6 +87,14 @@ def detect_linux_display_server():
 LOG_LEVEL = logging.INFO  # Use valid levels: DEBUG, INFO, WARNING, ERROR, CRITICAL
 DATA_FILE_NAME = "DATA"
 MAX_SIZE = 1048576  # 1 MiB
+SUBSCRIPTION_DESTINATION = "/user/queue/cliptext"
+SEND_DESTINATION = "/app/cliptext"
+LOGIN_URL = "/login"
+LOGOUT_URL = "/logout"
+MAXSIZE_URL = "/max-size"
+CSRF_URL = "/csrf-token"
+WEBSOCKET_ENDPOINT = "/clipsocket"
+
 VERSION_URL = (
     "https://raw.githubusercontent.com/Sathvik-Rao/ClipCascade/main/version.json"
 )