Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wo secure --auth on Ubuntu 22.04

Browse Source
This commit is contained in:
VirtuBox
2022-09-16 17:19:18 +02:00
parent f89896d15d
commit ce244cfbc5
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -49,6 +49,7 @@
- **Modern** : Strong ciphers_suite, modern TLS protocols and HSTS support (Grade A+ on [ssllabs](https://www.ssllabs.com/ssltest/analyze.html?d=demo.wordops.eu&latest)) - **Modern** : Strong ciphers_suite, modern TLS protocols and HSTS support (Grade A+ on [ssllabs](https://www.ssllabs.com/ssltest/analyze.html?d=demo.wordops.eu&latest))
- **Monitoring** : Live Nginx vhost traffic with ngx_vts_module and server monitoring with Netdata - **Monitoring** : Live Nginx vhost traffic with ngx_vts_module and server monitoring with Netdata
- **User Friendly** : WordOps dashboard with server status/monitoring and tools ([demo](https://demo.wordops.eu)) - **User Friendly** : WordOps dashboard with server status/monitoring and tools ([demo](https://demo.wordops.eu))
- **Release cycle** : WordOps stable releases are published in June and December.
--- ---

4
wo/cli/plugins/secure.py
View File

@@ -83,11 +83,11 @@ class WOSecureController(CementBaseController):
if password == "": if password == "":
pargs.user_pass = passwd pargs.user_pass = passwd
Log.debug(self, "printf username:" Log.debug(self, "printf username:"
"$(openssl passwd -crypt " "$(openssl passwd --apr1 "
"password 2> /dev/null)\n\"" "password 2> /dev/null)\n\""
"> /etc/nginx/htpasswd-wo 2>/dev/null") "> /etc/nginx/htpasswd-wo 2>/dev/null")
WOShellExec.cmd_exec(self, "printf \"{username}:" WOShellExec.cmd_exec(self, "printf \"{username}:"
"$(openssl passwd -crypt " "$(openssl passwd -apr1 "
"{password} 2> /dev/null)\n\"" "{password} 2> /dev/null)\n\""
"> /etc/nginx/htpasswd-wo 2>/dev/null" "> /etc/nginx/htpasswd-wo 2>/dev/null"
.format(username=pargs.user_input, .format(username=pargs.user_input,

2
wo/cli/plugins/stack_pref.py
View File

@@ -329,7 +329,7 @@ def post_pref(self, apt_packages, packages, upgrade=False):
try: try:
WOShellExec.cmd_exec( WOShellExec.cmd_exec(
self, "printf \"WordOps:" self, "printf \"WordOps:"
"$(openssl passwd -crypt " "$(openssl passwd -apr1 "
"{password} 2> /dev/null)\n\"" "{password} 2> /dev/null)\n\""
"> /etc/nginx/htpasswd-wo " "> /etc/nginx/htpasswd-wo "
"2>/dev/null" "2>/dev/null"