s.probst/webapp-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check for version number and only complain about PYopenSSL een dotty_dict when it's needed

Browse Source 
modified:   webapp_admin/webapp_admin.py
This commit is contained in:
Robin van Genderen 2019-05-02 13:53:05 +02:00
parent 20896cbbc2
commit 30f07c076f
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webapp_admin/webapp_admin.py
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# encoding: utf-8 # encoding: utf-8
from pkg_resources import parse_version
import sys import sys
try: try:
import kopano import kopano
@ -16,8 +17,7 @@ import base64
try: try:
import OpenSSL.crypto import OpenSSL.crypto
except ImportError: except ImportError:
print('pip3 install pyOpenSSL') pass
sys.exit(1)
from datetime import datetime from datetime import datetime
from time import mktime from time import mktime
import getpass import getpass
@ -26,7 +26,8 @@ from optparse import OptionGroup
try: try:
from dotty_dict import dotty from dotty_dict import dotty
except ImportError: except ImportError:
print('dotty_dict not found on your system. Run pip3 install dotty_dict') pass
""" """
@ -332,6 +333,7 @@ Export S/MIME certificate from users store
:param public: Export public certificate part :param public: Export public certificate part
""" """
def export_smime(user, location=None, public=None): def export_smime(user, location=None, public=None):
if location: if location:
backup_location = location backup_location = location
else: else:
@ -366,6 +368,9 @@ Import S/MIME certificate into users store
:param public: Import public certificate part :param public: Import public certificate part
""" """
def import_smime(user, cert_file, passwd, ask_password=None, public=None): def import_smime(user, cert_file, passwd, ask_password=None, public=None):
if not sys.modules.get('OpenSSL'):
print('PyOpenSSl not installed \npip3 install pyOpenSSL')
sys.exit(1)
if ask_password: if ask_password:
passwd = getpass.getpass() passwd = getpass.getpass()
elif not passwd: elif not passwd:
@ -450,6 +455,9 @@ Inject webapp settings into the users store
:param data: The webapp setting :param data: The webapp setting
""" """
def advanced_inject(user, data, value_type='string'): def advanced_inject(user, data, value_type='string'):
if not sys.modules.get('dotty_dict'):
print('dotty_dict not found on your system. \nRun pip3 install dotty_dict')
sys.exit(1)
settings = read_settings(user) settings = read_settings(user)
split_data = data.split('=') split_data = data.split('=')
@ -479,8 +487,13 @@ def main():
if not options.users and not options.all_users: if not options.users and not options.all_users:
print('There are no users specified. Use "--all-users" to run for all users') print('There are no users specified. Use "--all-users" to run for all users')
sys.exit(1) sys.exit(1)
# Since kopano 8.7.0 Server is renamed to server check with one we need to use
if parse_version(kopano.__version__) > parse_version('8.7.0'):
server = kopano.server(options)
else:
server = kopano.Server(options)
for user in kopano.Server(options).users(options.users): for user in server.users(options.users):
# Backup and restore # Backup and restore
if options.backup: if options.backup:
backup(user, options.location) backup(user, options.location)