fix: remote upload prefix mismatch and restore security file #193

Merged

jmiller merged 6 commits from fix/sftp-upload-and-restore-security into main 2026-06-30 18:11:33 +00:00

Conversation 0 Commits 6 Files Changed 19

+106 -28

jmiller commented 2026-06-30 17:50:35 +00:00

Owner

Copy Link

Copy Source

Summary\n\n- SFTP/FTP/S3/GDrive upload fix: createUploaderFromParams() now adds the type-specific prefix (sftp_, ftp_, s3_, gdrive_) to param keys before passing to uploader constructors. The remotes table stores unprefixed keys (host, port) but all uploaders expect prefixed names (sftp_host, sftp_port). This caused "SFTP host is not configured" errors on every multi-remote upload.\n- Restore security file fix: Renamed .mokorestore-security.php to mokorestore-security.php (no leading dot). Dotfiles are hidden by default in file managers and blocked by most web server configs, making the security verification step impossible to complete. Also added cleanup of the security file in actionCleanup().\n\nCloses #13\n\n## Test plan\n\n- [ ] Create an SFTP remote destination on a profile, run a backup, verify upload succeeds\n- [ ] Test with FTP, S3, and Google Drive remote types if available\n- [ ] Generate a standalone restore.php, deploy to a test server, verify mokorestore-security.php is created and visible\n- [ ] Complete the security verification flow and confirm the file is deleted after verification\n- [ ] Run cleanup step and verify mokorestore-security.php is removed\n\nhttps://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

## Summary\n\n- **SFTP/FTP/S3/GDrive upload fix**: `createUploaderFromParams()` now adds the type-specific prefix (`sftp_`, `ftp_`, `s3_`, `gdrive_`) to param keys before passing to uploader constructors. The remotes table stores unprefixed keys (`host`, `port`) but all uploaders expect prefixed names (`sftp_host`, `sftp_port`). This caused \"SFTP host is not configured\" errors on every multi-remote upload.\n- **Restore security file fix**: Renamed `.mokorestore-security.php` to `mokorestore-security.php` (no leading dot). Dotfiles are hidden by default in file managers and blocked by most web server configs, making the security verification step impossible to complete. Also added cleanup of the security file in `actionCleanup()`.\n\nCloses #13\n\n## Test plan\n\n- [ ] Create an SFTP remote destination on a profile, run a backup, verify upload succeeds\n- [ ] Test with FTP, S3, and Google Drive remote types if available\n- [ ] Generate a standalone restore.php, deploy to a test server, verify `mokorestore-security.php` is created and visible\n- [ ] Complete the security verification flow and confirm the file is deleted after verification\n- [ ] Run cleanup step and verify `mokorestore-security.php` is removed\n\nhttps://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

jmiller added 2 commits 2026-06-30 17:50:35 +00:00

fix: remote upload prefix mismatch and restore security file visibility ... 3a6bb1c783

Remote uploaders (SFTP, FTP, S3, Google Drive) expect type-prefixed
property names (sftp_host, ftp_port, etc.) but createUploaderFromParams
passes unprefixed keys from the remotes table params JSON. Add prefix
mapping in createUploaderFromParams to bridge the naming gap.

Rename .mokorestore-security.php to mokorestore-security.php (no leading
dot) so the file is visible in file managers and not blocked by web
server dotfile rules. Also clean it up in actionCleanup.

Closes #13

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

chore(version): pre-release bump to 02.52.16-dev [skip ci] f2f424a565

jmiller added 1 commit 2026-06-30 17:53:43 +00:00

fix: recreate security file if missing while verification is pending ... 20ce945e73

The security file was only written inside the code-generation block
(first page load). If the file was deleted or failed to write, it
was never recreated because the session already held the code. Now
file writing is a separate check that runs whenever verification is
pending and the file is missing.

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

jmiller added 1 commit 2026-06-30 17:54:02 +00:00

chore(version): pre-release bump to 02.52.17-dev [skip ci] 236609341f

jmiller added 1 commit 2026-06-30 18:00:07 +00:00

fix: add verbose error_log throughout restore script ... 4093267984

Every action handler now logs entry, key parameters, outcomes, and
failures to PHP error_log. Security file creation logs directory
permissions, PHP user, and the specific error when file_put_contents
fails. Database import logs SQL file size, statement counts, and
individual errors. Cleanup logs each file removal success/failure.

Claude-Session: https://claude.ai/code/session_01MbEjBtsSjPuTWhqqrMS2wG

jmiller added 1 commit 2026-06-30 18:00:29 +00:00

chore(version): pre-release bump to 02.52.18-dev [skip ci] 3d9c48f40f

jmiller merged commit 2d3a697f22 into main 2026-06-30 18:11:33 +00:00

jmiller deleted branch fix/sftp-upload-and-restore-security 2026-06-30 18:11:33 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

component: admin

Admin UI and views

component: api

REST API

component: engine

Backup/restore engine

component: remote

Remote storage (FTP/GDrive)

component: scheduler

Scheduled tasks

No labels

Priority -

Type -

Milestone

No items

No Milestone

Assignees

Clear assignees

jmiller (Jonathan Miller)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MokoConsulting/MokoSuiteBackup#193