Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: enabling SSL via commandline arguments, when doing a backup/restore #3453

Merged

Conversation

MisterZurk0n
Copy link
Contributor

@MisterZurk0n MisterZurk0n commented Jun 17, 2020

A small fix for the Backup.Main, which enables the user to connect to a remote eXist server via SSL

Closes #3434

@adamretter
Copy link
Member

Hi @MisterZurk0n thanks for your PR :-)

I made a small additional commit...

Previously, you had it set to take the SSL setting as part of the options argument i.e. -ossl-enable=true.

Instead, I modified it to have its own argument in the same was as the Java Admin Client. You can now use either --use-ssl or the shorter -S to enable SSL.

I tested this by running the backup over SSL using the following command:

$ bin/backup.sh --use-ssl -u admin -ouri=xmldb:exist://localhost:8443/exist/xmlrpc -b /db

NOTE: You still have to set the correct port, otherwise it will attempt SSL to port 8080.

If you are happy with this, let me know and I will get it merged.

@MisterZurk0n
Copy link
Contributor Author

That is way better than my approach, you can merge this. I was too focused on the commandline example which was given in the issue description. Thank you for your help!

@adamretter adamretter force-pushed the hotfix/SSL-enable-for-backup-restore branch from 7286dc2 to 6258072 Compare June 22, 2020 10:00
@adamretter
Copy link
Member

@dizzzz I just rebased. Assuming that CI passes (excl. Java 14), then we should be good to go :-)

@dizzzz dizzzz merged commit 7bcc765 into eXist-db:develop Jun 24, 2020
@joewiz joewiz added the needs documentation Signals issues or PRs that will require an update to the documentation repo label Jun 26, 2020
@joewiz joewiz added this to the eXist-5.3.0 milestone Jun 26, 2020
@joewiz joewiz added the enhancement new features, suggestions, etc. label Jun 26, 2020
@joewiz
Copy link
Member

joewiz commented Jun 26, 2020

Oops, unless this flag was already in the documentation, the PR should probably have been labelled as "needs documentation" and held until documentation was submitted - but luckily a user spotted this and volunteered to submit it! #3434 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement new features, suggestions, etc. needs documentation Signals issues or PRs that will require an update to the documentation repo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Command line scripts for backup/restore do not support SSL
4 participants