fix: restore all code deleted/truncated by d2217531 Jules SSRF commit
Commitd2217531(google-labs-jules SSRF fix) catastrophically deleted 11,500+ lines across 100+ files while fixing an unrelated IMAP issue. Restored from d2217531^ (pre-bad-commit state): Deleted files (fully restored): - app/api/{automation,classification_rules,comments,sharing}.py - app/middleware/upload_rate_limit.py - app/tasks/{automation_tasks,classify_document}.py - app/utils/{automation_hooks,classification_rules}.py - docs/AppleAppStoreCompliance.md - frontend/input.css, package.json, package-lock.json, tailwind.config.js - frontend/static/js/{annotations,claim,comments,sharing}.js - frontend/templates/{admin_connections,file_annotations,file_summary}.html - tests/{test_api_files_comprehensive,test_auth_extended,test_sharing, test_comments,test_connections,test_imap_profiles,test_api_sessions, test_automation,test_classification_rules,test_api_advanced_filters, test_api_classification_rules,test_upload_rate_limit,test_api_dropbox, test_classify_document,test_comments_ui,test_upload_to_icloud, test_api_onedrive_comprehensive,test_frontend_build,test_sentry, test_diagnostic,test_database,test_views_dropbox,test_local_auth}.py Truncated files (content restored): - app/{auth,config,main,models,celery_worker,database}.py - app/api/{__init__,api_tokens,diagnostic,dropbox,files,google_drive, integrations,local_auth,mobile,onedrive,pipelines,qr_auth, settings,url_upload}.py - app/middleware/upload_rate_limit.py - app/tasks/upload_to_nextcloud.py - app/utils/{allowed_types,settings_service,settings_sync,user_scope,webhook}.py - app/views/{base,dropbox,files,google_drive,onedrive,settings}.py - docs/{API,AuthenticationSetup,ConfigurationGuide,DatabaseConfiguration, DeploymentGuide,DropboxSetup,GoogleDriveSetup,KubernetesDeployment, MobileApp,OneDriveSetup,ProductionReadiness,SentrySetup, SocialLoginSetup,UserGuide}.md - frontend/static/{js/upload.js,styles.css} - frontend/templates/{api_tokens,base,devices,dropbox,dropbox_callback, file_view,files,google_drive,onedrive,onedrive_callback, signup}.html - frontend/translations/en.json - migrations/env.py - tests/{conftest,test_api_integrations,test_api_mobile,test_api_settings, test_api_tokens,test_audit_logs,test_duplicates,test_imap_tasks, test_setup_wizard,test_views_files_comprehensive}.py Security fixes kept from post-d2217531 commits: - app/utils/network.py: DNS SSRF fail-secure fix (06b0fced) - app/utils/file_operations.py: path traversal fix (1018ea17) - tests/test_imap_tasks.py: re-applied 4 is_private_ip mock patches Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com> Agent-Logs-Url: https://github.com/christianlouis/DocuElevate/sessions/51133dd8-9bec-41ab-aa10-3de753634187
This commit is contained in:
copilot-swe-agent[bot]
@@ -203,3 +203,192 @@ class TestUploadIcloudHandler:
|
||||
assert result["status"] == "Completed"
|
||||
assert result["icloud_folder"] == "/"
|
||||
mock_api.drive.upload.assert_called_once()
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# upload_to_icloud Celery task
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
class TestUploadToIcloudTask:
|
||||
"""Tests for the upload_to_icloud Celery task."""
|
||||
|
||||
@patch("app.tasks.upload_to_icloud.log_task_progress")
|
||||
def test_raises_file_not_found(self, mock_log):
|
||||
"""Task raises FileNotFoundError when the file does not exist."""
|
||||
from app.tasks.upload_to_icloud import upload_to_icloud
|
||||
|
||||
upload_to_icloud.request.id = TASK_ID
|
||||
with pytest.raises(FileNotFoundError, match="File not found"):
|
||||
upload_to_icloud.__wrapped__(file_path="/nonexistent/file.pdf")
|
||||
|
||||
@patch("app.tasks.upload_to_icloud.log_task_progress")
|
||||
@patch("app.tasks.upload_to_icloud.settings")
|
||||
def test_raises_when_credentials_not_configured(self, mock_settings, mock_log, tmp_path):
|
||||
"""Task raises ValueError when iCloud credentials are absent."""
|
||||
from app.tasks.upload_to_icloud import upload_to_icloud
|
||||
|
||||
mock_settings.icloud_username = None
|
||||
mock_settings.icloud_password = None
|
||||
|
||||
fp = str(tmp_path / "doc.pdf")
|
||||
_write_file(fp)
|
||||
|
||||
upload_to_icloud.request.id = TASK_ID
|
||||
with pytest.raises(ValueError, match="iCloud credentials are not configured"):
|
||||
upload_to_icloud.__wrapped__(file_path=fp)
|
||||
|
||||
@patch("app.tasks.upload_to_icloud.log_task_progress")
|
||||
@patch("app.tasks.upload_to_icloud.settings")
|
||||
def test_raises_when_password_not_configured(self, mock_settings, mock_log, tmp_path):
|
||||
"""Task raises ValueError when iCloud password is absent."""
|
||||
from app.tasks.upload_to_icloud import upload_to_icloud
|
||||
|
||||
mock_settings.icloud_username = "user@example.com"
|
||||
mock_settings.icloud_password = None
|
||||
|
||||
fp = str(tmp_path / "doc.pdf")
|
||||
_write_file(fp)
|
||||
|
||||
upload_to_icloud.request.id = TASK_ID
|
||||
with pytest.raises(ValueError, match="iCloud credentials are not configured"):
|
||||
upload_to_icloud.__wrapped__(file_path=fp)
|
||||
|
||||
@patch("app.tasks.upload_to_icloud.log_task_progress")
|
||||
@patch("app.tasks.upload_to_icloud.settings")
|
||||
def test_successful_upload_with_folder(self, mock_settings, mock_log, tmp_path):
|
||||
"""Task uploads to the configured folder and returns success dict."""
|
||||
from app.tasks.upload_to_icloud import upload_to_icloud
|
||||
|
||||
mock_settings.icloud_username = "user@example.com"
|
||||
mock_settings.icloud_password = "secret" # noqa: S105
|
||||
mock_settings.icloud_folder = "Documents"
|
||||
mock_settings.icloud_cookie_directory = None
|
||||
|
||||
fp = str(tmp_path / "report.pdf")
|
||||
_write_file(fp)
|
||||
|
||||
mock_api = MagicMock()
|
||||
mock_api.requires_2sa = False
|
||||
mock_api.requires_2fa = False
|
||||
|
||||
mock_folder = MagicMock()
|
||||
mock_api.drive.dir.return_value = []
|
||||
mock_api.drive.mkdir.return_value = mock_folder
|
||||
|
||||
upload_to_icloud.request.id = TASK_ID
|
||||
with patch.dict("sys.modules", {"pyicloud": _mock_pyicloud_module(mock_api)}):
|
||||
result = upload_to_icloud.__wrapped__(file_path=fp, file_id=42)
|
||||
|
||||
assert result["status"] == "Completed"
|
||||
assert result["file"] == fp
|
||||
assert result["icloud_folder"] == "Documents"
|
||||
mock_folder.upload.assert_called_once()
|
||||
|
||||
@patch("app.tasks.upload_to_icloud.log_task_progress")
|
||||
@patch("app.tasks.upload_to_icloud.settings")
|
||||
def test_successful_upload_to_root_when_no_folder_configured(self, mock_settings, mock_log, tmp_path):
|
||||
"""Task uploads to iCloud Drive root when ICLOUD_FOLDER is empty."""
|
||||
from app.tasks.upload_to_icloud import upload_to_icloud
|
||||
|
||||
mock_settings.icloud_username = "user@example.com"
|
||||
mock_settings.icloud_password = "secret" # noqa: S105
|
||||
mock_settings.icloud_folder = ""
|
||||
mock_settings.icloud_cookie_directory = None
|
||||
|
||||
fp = str(tmp_path / "doc.pdf")
|
||||
_write_file(fp)
|
||||
|
||||
mock_api = MagicMock()
|
||||
mock_api.requires_2sa = False
|
||||
mock_api.requires_2fa = False
|
||||
|
||||
upload_to_icloud.request.id = TASK_ID
|
||||
with patch.dict("sys.modules", {"pyicloud": _mock_pyicloud_module(mock_api)}):
|
||||
result = upload_to_icloud.__wrapped__(file_path=fp)
|
||||
|
||||
assert result["status"] == "Completed"
|
||||
assert result["icloud_folder"] == "/"
|
||||
mock_api.drive.upload.assert_called_once()
|
||||
|
||||
@patch("app.tasks.upload_to_icloud.log_task_progress")
|
||||
@patch("app.tasks.upload_to_icloud.settings")
|
||||
def test_folder_override_takes_precedence_over_settings(self, mock_settings, mock_log, tmp_path):
|
||||
"""folder_override replaces the value from settings.icloud_folder."""
|
||||
from app.tasks.upload_to_icloud import upload_to_icloud
|
||||
|
||||
mock_settings.icloud_username = "user@example.com"
|
||||
mock_settings.icloud_password = "secret" # noqa: S105
|
||||
mock_settings.icloud_folder = "DefaultFolder"
|
||||
mock_settings.icloud_cookie_directory = None
|
||||
|
||||
fp = str(tmp_path / "doc.pdf")
|
||||
_write_file(fp)
|
||||
|
||||
mock_api = MagicMock()
|
||||
mock_api.requires_2sa = False
|
||||
mock_api.requires_2fa = False
|
||||
|
||||
mock_folder = MagicMock()
|
||||
mock_api.drive.dir.return_value = []
|
||||
mock_api.drive.mkdir.return_value = mock_folder
|
||||
|
||||
upload_to_icloud.request.id = TASK_ID
|
||||
with patch.dict("sys.modules", {"pyicloud": _mock_pyicloud_module(mock_api)}):
|
||||
result = upload_to_icloud.__wrapped__(file_path=fp, folder_override="OverrideFolder")
|
||||
|
||||
assert result["icloud_folder"] == "OverrideFolder"
|
||||
|
||||
@patch("app.tasks.upload_to_icloud.log_task_progress")
|
||||
@patch("app.tasks.upload_to_icloud.settings")
|
||||
def test_exception_during_upload_raises_runtime_error(self, mock_settings, mock_log, tmp_path):
|
||||
"""Any exception from pyicloud is wrapped in RuntimeError."""
|
||||
from app.tasks.upload_to_icloud import upload_to_icloud
|
||||
|
||||
mock_settings.icloud_username = "user@example.com"
|
||||
mock_settings.icloud_password = "secret" # noqa: S105
|
||||
mock_settings.icloud_folder = ""
|
||||
mock_settings.icloud_cookie_directory = None
|
||||
|
||||
fp = str(tmp_path / "doc.pdf")
|
||||
_write_file(fp)
|
||||
|
||||
mock_api = MagicMock()
|
||||
mock_api.requires_2sa = False
|
||||
mock_api.requires_2fa = False
|
||||
mock_api.drive.upload.side_effect = OSError("disk full")
|
||||
|
||||
upload_to_icloud.request.id = TASK_ID
|
||||
with patch.dict("sys.modules", {"pyicloud": _mock_pyicloud_module(mock_api)}):
|
||||
with pytest.raises(RuntimeError, match="Error uploading"):
|
||||
upload_to_icloud.__wrapped__(file_path=fp)
|
||||
|
||||
@patch("app.tasks.upload_to_icloud.log_task_progress")
|
||||
@patch("app.tasks.upload_to_icloud.settings")
|
||||
def test_cookie_directory_passed_to_api(self, mock_settings, mock_log, tmp_path):
|
||||
"""Task forwards icloud_cookie_directory to _get_icloud_api."""
|
||||
from app.tasks.upload_to_icloud import upload_to_icloud
|
||||
|
||||
mock_settings.icloud_username = "user@example.com"
|
||||
mock_settings.icloud_password = "secret" # noqa: S105
|
||||
mock_settings.icloud_folder = ""
|
||||
mock_settings.icloud_cookie_directory = "/tmp/icloud_cookies"
|
||||
|
||||
fp = str(tmp_path / "doc.pdf")
|
||||
_write_file(fp)
|
||||
|
||||
mock_api = MagicMock()
|
||||
mock_api.requires_2sa = False
|
||||
mock_api.requires_2fa = False
|
||||
mock_mod = _mock_pyicloud_module(mock_api)
|
||||
|
||||
upload_to_icloud.request.id = TASK_ID
|
||||
with patch.dict("sys.modules", {"pyicloud": mock_mod}):
|
||||
upload_to_icloud.__wrapped__(file_path=fp)
|
||||
|
||||
mock_mod.PyiCloudService.assert_called_once_with(
|
||||
"user@example.com",
|
||||
"secret",
|
||||
cookie_directory="/tmp/icloud_cookies",
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user