YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

App/repo function init + services

Browse source
This commit is contained in:
Kloadut 2012-10-12 19:00:41 +02:00
parent c5edde0053
commit c3253b24ac
2 changed files with 184 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

214
parse_args
View file

@ -49,21 +49,21 @@ as in this sample command line :
Above example will lead to the function 'monitor_info(args)' Above example will lead to the function 'monitor_info(args)'
in the file 'lib/yunohost_monitor.py' with 'cpu' and 'ram' in the file 'yunohost_monitor.py' with 'cpu' and 'ram'
stored in args dictionnary. stored in args dictionnary.
Usage: Usage:
You can add a category at the first level, action at the second one, You can add a category at the first level, action at the second one,
and arguments at the third one. and arguments at the third one.
If the action need LDAP connexion, don't forget to add 'ldap' : True If a connexion is needed for the action, don't forget to add it to
to the action parameters. the action parameters (ldap, repo, dns or firewall).
Documentation: Documentation:
You can see all arguments settings at the argparse documentation: You can see all arguments settings at the argparse documentation:
http://docs.python.org/dev/library/argparse.html http://docs.python.org/dev/library/argparse.html
#argparse.ArgumentParser.add_argument #argparse.ArgumentParser.add_argument
Don't forget to turn them as a dictionnary ('setting' : 'value') Don't forget to turn argument as dictionnary ('setting' : 'value')
""" """
action_dict = { action_dict = {
@ -87,10 +87,10 @@ action_dict = {
### user_list() ### user_list()
'list' : { 'list' : {
'action_help' : _("List users"), 'action_help' : _("List users"),
'ldap' : True, 'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'--fields' : { '--fields' : {
'help' : _("Fields to fetch"), 'help' : _("fields to fetch"),
'nargs' : '+', 'nargs' : '+',
}, },
'-f' : { '-f' : {
@ -99,7 +99,7 @@ action_dict = {
}, },
'-l' : { '-l' : {
'full' : '--limit', 'full' : '--limit',
'help' : _("Maximum number of users fetched"), 'help' : _("Maximum number of user fetched"),
}, },
'-o' : { '-o' : {
'full' : '--offset', 'full' : '--offset',
@ -110,7 +110,7 @@ action_dict = {
### user_create() ### user_create()
'create' : { 'create' : {
'action_help' : _("Create user"), 'action_help' : _("Create user"),
'ldap' : True, 'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'-u' : { '-u' : {
'full' : '--username', 'full' : '--username',
@ -134,7 +134,7 @@ action_dict = {
### user_delete() ### user_delete()
'delete' : { 'delete' : {
'action_help' : _("Delete user"), 'action_help' : _("Delete user"),
'ldap' : True, 'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'users' : { 'users' : {
'help' : _("Username of users to delete"), 'help' : _("Username of users to delete"),
@ -145,7 +145,7 @@ action_dict = {
### user_update() ### user_update()
'update' : { 'update' : {
'action_help' : _("Update user informations"), 'action_help' : _("Update user informations"),
'ldap' : True, 'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'user' : { 'user' : {
'help' : _("Username of user to update"), 'help' : _("Username of user to update"),
@ -189,7 +189,7 @@ action_dict = {
### user_info() ### user_info()
'info' : { 'info' : {
'action_help' : _("Get user informations"), 'action_help' : _("Get user informations"),
'ldap' : True, 'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'user' : { 'user' : {
'nargs' : '?', 'nargs' : '?',
@ -213,7 +213,7 @@ action_dict = {
### domain_list() ### domain_list()
'list' : { 'list' : {
'action_help' : _("List domains"), 'action_help' : _("List domains"),
'ldap' : True, 'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'-f' : { '-f' : {
'full' : '--filter', 'full' : '--filter',
@ -221,18 +221,18 @@ action_dict = {
}, },
'-l' : { '-l' : {
'full' : '--limit', 'full' : '--limit',
'help' : _("Maximum number of users fetched"), 'help' : _("Maximum number of domain fetched"),
}, },
'-o' : { '-o' : {
'full' : '--offset', 'full' : '--offset',
'help' : _("Starting number for user fetching"), 'help' : _("Starting number for domain fetching"),
}, },
} }
}, },
### domain_create() ### domain_create()
'create' : { 'create' : {
'action_help' : _("Create a custom domain"), 'action_help' : _("Create a custom domain"),
'ldap' : True, 'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'domain name' : { 'domain name' : {
'help' : _("Domain name to create"), 'help' : _("Domain name to create"),
@ -242,10 +242,10 @@ action_dict = {
### domain_delete() ### domain_delete()
'delete' : { 'delete' : {
'action_help' : _("Delete domains"), 'action_help' : _("Delete domains"),
'ldap' : True, 'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'domains' : { 'domain' : {
'help' : _("Domain names to delete"), 'help' : _("Domain(s) to delete"),
'nargs' : '+', 'nargs' : '+',
}, },
} }
@ -253,7 +253,7 @@ action_dict = {
### domain_info() ### domain_info()
'info' : { 'info' : {
'action_help' : _("Get domain informations"), 'action_help' : _("Get domain informations"),
'ldap' : True, 'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'domain-name' : {} 'domain-name' : {}
} }
@ -261,16 +261,153 @@ action_dict = {
### domain_renewcert() ### domain_renewcert()
'renewcert' : { 'renewcert' : {
'action_help' : _("Renew domain certificate"), 'action_help' : _("Renew domain certificate"),
'ldap' : True, 'connections' : ['ldap'],
'arguments' : { 'arguments' : {
'domain-name' : {} 'domain-name' : {}
} }
}, },
} }
}, },
#############################
# App #
#############################
'app' : { 'app' : {
'category_help' : _("Manage apps"), 'category_help' : _("Manage apps"),
'actions' : {} 'actions' : {
### app_list()
'list' : {
'action_help' : _("List apps"),
'connections' : ['ldap'],
'arguments' : {
'--fields' : {
'help' : _("fields to fetch"),
'nargs' : '+',
},
'-f' : {
'full' : '--filter',
'help' : _("LDAP filter used to search"),
},
'-l' : {
'full' : '--limit',
'help' : _("Maximum number of app fetched"),
},
'-o' : {
'full' : '--offset',
'help' : _("Starting number for app fetching"),
},
}
},
### app_install() TODO: Write help
'install' : {
'action_help' : _("Install apps"),
'connections' : ['ldap'],
'arguments' : {
'appname' : {
'nargs' : '+',
},
'-d' : {
'full' : '--domain',
},
'-p' : {
'full' : '--path',
},
'-l' : {
'full' : '--label',
},
'--public' : {
'action' : 'store_true',
},
'--protected' : {
'action' : 'store_true',
},
}
},
### app_remove() TODO: Write help
'remove' : {
'action_help' : _("Remove app"),
'connections' : ['ldap'],
'arguments' : {
'app' : {
'help' : _("App(s) to delete"),
'nargs' : '+',
},
}
},
### app_upgrade()
'upgrade' : {
'action_help' : _("Upgrade app"),
'connections' : ['ldap'],
'arguments' : {
'app' : {
'help' : _("App(s) to upgrade"),
'nargs' : '+',
},
}
},
### app_info() TODO: Write help
'info' : {
'action_help' : _("Get app informations"),
'connections' : ['ldap'],
'arguments' : {
'app' : {},
}
},
### app_addaccess() TODO: Write help
'addaccess' : {
'action_help' : _("Grant access right to users (everyone by default)"),
'connections' : ['ldap'],
'arguments' : {
'app' : {
'nargs' : '+',
},
'-u' : {
'full' : '--user',
'nargs' : '+',
},
}
},
### app_removeaccess() TODO: Write help
'removeaccess' : {
'action_help' : _("Revoke access right to users (everyone by default)"),
'connections' : ['ldap'],
'arguments' : {
'app' : {
'nargs' : '+',
},
'-u' : {
'full' : '--user',
'nargs' : '+',
},
}
},
}
},
#############################
# Repository #
#############################
'repo' : {
'category_help' : _("Manage app repositories"),
'actions' : {
### repo_list()
'list' : {
'action_help' : _("List repositories"),
'connections' : ['ldap'],
'arguments' : {
'-f' : {
'full' : '--filter',
'help' : _("LDAP filter used to search"),
},
'-l' : {
'full' : '--limit',
'help' : _("Maximum number of repository fetched"),
},
'-o' : {
'full' : '--offset',
'help' : _("Starting number for repository fetching"),
},
}
},
}
}, },
'monitor' : { 'monitor' : {
'category_help' : _("Monitoring functions"), 'category_help' : _("Monitoring functions"),
@ -293,8 +430,9 @@ def parse_dict(action_dict):
Namespace of args Namespace of args
""" """
# Connection required # Connections
ldap = False connections_available = ['ldap', 'repo', 'dns', 'firewall']
connections_enabled = []
# Intialize parsers # Intialize parsers
parsers = subparsers_category = subparsers_action = {} parsers = subparsers_category = subparsers_action = {}
@ -320,8 +458,10 @@ def parse_dict(action_dict):
# Split actions # Split actions
if 'actions' in category_params: if 'actions' in category_params:
for action, action_params in category_params['actions'].items(): for action, action_params in category_params['actions'].items():
# Service settings # Connections settings
if 'ldap' in action_params: ldap = action_params['ldap'] for connection in connections_available:
if connection in action_params['connections']:
connections_enabled.append(connection)
if 'action_help' not in action_params: action_params['action_help'] = '' if 'action_help' not in action_params: action_params['action_help'] = ''
parsers[category + '_' + action] = subparsers_action[category].add_parser(action, help=action_params['action_help']) parsers[category + '_' + action] = subparsers_action[category].add_parser(action, help=action_params['action_help'])
# Set the action s related function # Set the action s related function
@ -339,7 +479,7 @@ def parse_dict(action_dict):
parsers[category + '_' + action].add_argument(arg_name, **arg_params) parsers[category + '_' + action].add_argument(arg_name, **arg_params)
args = parsers['general'].parse_args() args = parsers['general'].parse_args()
return { 'ldap' : ldap, 'args' : args } return { 'connections' : connections_enabled, 'args' : args }
def display_error(error): def display_error(error):
""" """
@ -365,18 +505,22 @@ def main():
""" """
action = parse_dict(action_dict) action = parse_dict(action_dict)
connections = {}
try: try:
# Connect to LDAP if the action is requiring it # Connect to different services if the action is requiring it
if action['ldap']: if 'ldap' in action['connections']:
yldap = YunoHostLDAP() connections['ldap'] = YunoHostLDAP()
if 'firewall' in action['connections']:
connections['firewall'] = open('/etc/init.d/iptables', 'w')
# TODO: Add other services connections
except YunoHostError, error: except YunoHostError, error:
display_error(error) display_error(error)
return error.code return error.code
try: try:
if action['ldap']: if connections:
result = action['args'].func(vars(action['args']), yldap) result = action['args'].func(vars(action['args']), connections)
else: else:
result = action['args'].func(vars(action['args'])) result = action['args'].func(vars(action['args']))
except TypeError: except TypeError:
@ -391,9 +535,11 @@ def main():
else: else:
print(json.dumps(result)) print(json.dumps(result))
finally: finally:
if action['ldap']: if 'ldap' in action['connections']:
yldap.disconnect() connections['ldap'].disconnect()
if 'firewall' in action['connections']:
connections['firewall'].close()
# TODO: Add other services deconnections
return 0 return 0
if __name__ == '__main__': if __name__ == '__main__':

8
yunohost_user.py
View file

@ -10,12 +10,11 @@ import getpass
from yunohost import YunoHostError, win_msg, colorize, validate from yunohost import YunoHostError, win_msg, colorize, validate
def user_list(args, yldap): # TODO : fix def user_list(args, connections): # TODO : fix
result = yldap.search() print(args)
#print(result)
def user_create(args, yldap): def user_create(args, connections):
""" """
Add user to LDAP Add user to LDAP
@ -25,6 +24,7 @@ def user_create(args, yldap):
Returns: Returns:
Boolean Boolean
""" """
yldap = connections['ldap']
required_args = ['username', 'mail', 'firstname', 'lastname'] required_args = ['username', 'mail', 'firstname', 'lastname']
# Input missing values # Input missing values